From d3a5637d924825b59673c098ce7c51fb2e5ad722 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 11 Jan 2024 15:12:40 +0100 Subject: JGit v5.13.3.202401111512-r Signed-off-by: Matthias Sohn Change-Id: Iacf106ce4013e9e12876e85ae341022a44bccb5c --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- .../org.eclipse.jgit.target/META-INF/MANIFEST.MF | 2 +- .../org.eclipse.jgit.target/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 88 files changed, 121 insertions(+), 121 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 24be093874..d6b999cbff 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index f44eaf78b7..4cf691dc34 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index aca78e02c2..0b83370eb9 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[5.13.3,5.14.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index c9d80c2495..0f075bbdce 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7be03d39dc..2cfc754cec 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 04d0570d43..b0df8396b5 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 655ca9f1f5..3d1efecc26 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index cefecc9af2..7bbb2cb55d 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 25fb7482be..da29458f79 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -14,7 +14,7 @@ 4.0.0 org.eclipse.jgit - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.benchmarks jar diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 8338f7d0f8..e536733860 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.ant - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.archive - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.http.apache - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.http.server - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.lfs - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.pgm - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.ui - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.test - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.ant.test - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.http.test - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 2e70981951..6301f5093c 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index b73c97d3c5..0f72f2c730 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index fb459663d8..186812738f 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[5.13.3,5.14.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 94f23bbecd..015c03e0d4 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 789248d238..af02d06d4a 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 1d5787ddc4..525b9c7861 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 9c42c735bf..b97c40c9bf 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 1921b46075..c8b81a17fc 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index cc13accbb1..98fce58f41 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="5.13.3", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index ae53b7beb9..280f3a203e 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index b7778ec70f..5dc9e07d1c 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 4e3af67e2e..1d24e29c39 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 032ccb31a3..723762de14 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3aff1e3f65..b381f8b4b6 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 04e4f38ee8..b8d6024979 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index d7e8510b2e..593ea4e437 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 95ecf3219f..3d80cb524d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index e7e0651a43..0f8e4647e8 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 76003c021b..aa51aa48e4 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 7fe183acb2..8958371460 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 86a897fb64..64c758c9d5 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index f8b9636bf4..82068e7ae6 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 82ba40dfd8..2af0e2ce91 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 5fcbae38b6..6b605be611 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index e09403dd72..ab328d8cb0 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="5.13.3"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index f24c4b4e72..043d2b50ec 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index cc8362b0c1..69b2adb724 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index a3a375e295..f6c9cb9762 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index d4ad3df64e..9bfaa0d418 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index dfa2e8c6bb..832b05192b 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="5.13.3", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 62670828d1..3e93d52925 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 91a337c45b..1f88b3f76d 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index a4ced3d887..28b7c0ce05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index d76971a58b..704a1b0a75 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index de654234c2..00cedc0c46 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 69979886c6..e6f78e1105 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index bb03a59518..f0a8aee32e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 09fe51103f..46ab1d03a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index d018eeaf57..2a70ede159 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 3df747d45a..d090736064 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index d79f188a77..6bc4551e0d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 84e453da7e..e6b44edfa9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 4a2417e5a2..6c0a99888f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index d2342159b9..95970bc6a5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 77486a0377..49d9929136 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 2c7e19a6c5..e23dbd8af3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 13817cc1e6..ba4b50995c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 6bcb20c03e..ecafaed762 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 5f1c76aa1b..50b8fc29b5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 6ad8d7ac8d..37bc3a74c5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 758e7f79c5..4be9a36463 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF index b7dd040319..ec9851d319 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/META-INF/MANIFEST.MF @@ -2,4 +2,4 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: JGit Target Platform Bundle Bundle-SymbolicName: org.eclipse.jgit.target -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml index e32c3928a0..5f8e557a16 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.target diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 400a40612c..47fe4f897e 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 61e7d848c4..22a04bf866 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index be8f4e328e..152c46bb47 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 947dccd70a..a4095506b6 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 3d465b1a5f..0c854df2ca 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index c21add89c1..a4093b2292 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 331b025d97..987cd97849 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 16f02c4627..ce444f0090 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 2a005b5a06..e8bb662812 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="5.13.3";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 11d8ca7ba1..c64f658c16 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 0524538a09..074998a203 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index b52b820f8b..129992f247 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index bd0436ea73..1df939a9e4 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 0927c0c917..ba32919160 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[5.13.3,5.14.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.internal.transport.jsch;version="5.13.3";x-friends:="org.eclipse.egit.core", org.eclipse.jgit.transport;version="5.13.3"; diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 9e43334126..24bd90166f 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 1e6195c041..5ca18d0e80 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index f8bcdf8202..4271fdc878 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 1032ca2c4c..53fc2852e2 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index a0fd23a762..2d59a5adc3 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.jgit.awtui;version="5.13.3" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index cc9f230eef..4c4c748513 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index a98b603f32..c0bf784fc8 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 4f275f9964..e7cbad57b4 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 5.13.3.qualifier +Bundle-Version: 5.13.3.202401111512-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Eclipse-ExtensibleAPI: true diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 8e05ad7fc3..2b30319d32 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 5.13.3.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="5.13.3.qualifier";roots="." +Bundle-Version: 5.13.3.202401111512-r +Eclipse-SourceBundle: org.eclipse.jgit;version="5.13.3.202401111512-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 5adf4304db..75670d5082 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 4af3872bb1..765bb1c077 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 5.13.3-SNAPSHOT + 5.13.3.202401111512-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From da37921221075f024b3a4107e12830c1c622e435 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 2 May 2024 09:43:12 -0700 Subject: GitDateFormatterTest: Remove printlns Left overs from https://review.gerrithub.io/c/eclipse-jgit/jgit/+/204984 Change-Id: I169ce2a008ca70267323fa4fb0f1e54981f1ec33 --- .../tst/org/eclipse/jgit/util/GitDateFormatterTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateFormatterTest.java index 6a531fe0e6..7ef386f6ee 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitDateFormatterTest.java @@ -89,7 +89,6 @@ public class GitDateFormatterTest { @Test public void LOCALE() { String date = new GitDateFormatter(Format.LOCALE).formatDate(ident); - System.out.println(date); assertTrue("Sep 20, 2011 7:09:25 PM -0400".equals(date) || "Sep 20, 2011, 7:09:25 PM -0400".equals(date) // JDK-8206961 || "Sep 20, 2011, 7:09:25\u202FPM -0400".equals(date)); // JDK-8304925 @@ -99,7 +98,6 @@ public class GitDateFormatterTest { public void LOCALELOCAL() { String date = new GitDateFormatter(Format.LOCALELOCAL) .formatDate(ident); - System.out.println(date); assertTrue("Sep 20, 2011 7:39:25 PM".equals(date) || "Sep 20, 2011, 7:39:25 PM".equals(date) // JDK-8206961 || "Sep 20, 2011, 7:39:25\u202FPM".equals(date)); // JDK-8304925 -- cgit v1.2.3 From 13212d7ec32e52d51698b5bf97f34b4ffd2e0439 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 28 Mar 2024 14:55:09 -0700 Subject: PackIndex: move checksum to the subclasses PackIndex is almost an interface, and making it so simplifies writing implementations over other storages. Checksum and its getter is the only functionality that is class specific. Make getChecksum abstract and implement it in the subclasses. Change-Id: I3746515d816abab075210505f1bb31b1936962e9 --- .../src/org/eclipse/jgit/internal/storage/file/Pack.java | 8 ++++---- .../src/org/eclipse/jgit/internal/storage/file/PackIndex.java | 7 +------ .../src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java | 8 ++++++++ .../src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java | 8 ++++++++ 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index f87329ccc2..be457644d9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -187,18 +187,18 @@ public class Pack implements Iterable { } if (packChecksum == null) { - packChecksum = idx.packChecksum; + packChecksum = idx.getChecksum(); fileSnapshot.setChecksum( ObjectId.fromRaw(packChecksum)); } else if (!Arrays.equals(packChecksum, - idx.packChecksum)) { + idx.getChecksum())) { throw new PackMismatchException(MessageFormat .format(JGitText.get().packChecksumMismatch, packFile.getPath(), PackExt.PACK.getExtension(), Hex.toHexString(packChecksum), PackExt.INDEX.getExtension(), - Hex.toHexString(idx.packChecksum))); + Hex.toHexString(idx.getChecksum()))); } loadedIdx = optionally(idx); return idx; @@ -791,7 +791,7 @@ public class Pack implements Iterable { MessageFormat.format(JGitText.get().packChecksumMismatch, getPackFile(), PackExt.PACK.getExtension(), Hex.toHexString(buf), PackExt.INDEX.getExtension(), - Hex.toHexString(idx.packChecksum))); + Hex.toHexString(idx.getChecksum()))); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index c2c3775d67..8a64c3247a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -116,9 +116,6 @@ public abstract class PackIndex return true; } - /** Footer checksum applied on the bottom of the pack file. */ - protected byte[] packChecksum; - /** * Determine if an object is contained within the pack file. * @@ -297,9 +294,7 @@ public abstract class PackIndex * @return the checksum of the pack; caller must not modify it * @since 5.5 */ - public byte[] getChecksum() { - return packChecksum; - } + public abstract byte[] getChecksum(); /** * Represent mutable entry of pack index consisting of object id and offset diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java index 5180df46bf..21f7314f33 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java @@ -36,6 +36,9 @@ class PackIndexV1 extends PackIndex { private final long[] idxHeader; + /** Footer checksum applied on the bottom of the pack file. */ + protected byte[] packChecksum; + byte[][] idxdata; private long objectCnt; @@ -238,6 +241,11 @@ class PackIndexV1 extends PackIndex { return (RECORD_SIZE * mid) + 4; } + @Override + public byte[] getChecksum() { + return packChecksum; + } + private class IndexV1Iterator extends EntriesIterator { int levelOne; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java index 751b62dc40..9a6f4a421a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java @@ -37,6 +37,9 @@ class PackIndexV2 extends PackIndex { private static final byte[] NO_BYTES = {}; + /** Footer checksum applied on the bottom of the pack file. */ + protected byte[] packChecksum; + private long objectCnt; private final long[] fanoutTable; @@ -281,6 +284,11 @@ class PackIndexV2 extends PackIndex { return -1; } + @Override + public byte[] getChecksum() { + return packChecksum; + } + private class EntriesIteratorV2 extends EntriesIterator { int levelOne; -- cgit v1.2.3 From 0647785eb22c2547d2ea2a5afe17cdb7082a2952 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 28 Mar 2024 15:07:34 -0700 Subject: PackIndex: Make iterator static (pass object count in ctor) The iterator uses an implicit reference to the external class to call #getObjectCount(). This implicit reference prevents PackIndex to become an interface. The object count is immutable and known at index (and iterator) construction time. Pass the object count in the constructor of the iterator and make it static. Change-Id: I4949ff943de2a88380fb7f4c9b65b089734854b9 --- .../src/org/eclipse/jgit/internal/storage/file/PackIndex.java | 10 ++++++++-- .../org/eclipse/jgit/internal/storage/file/PackIndexV1.java | 6 +++++- .../org/eclipse/jgit/internal/storage/file/PackIndexV2.java | 6 +++++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index 8a64c3247a..a23bc4f0a5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -353,16 +353,22 @@ public abstract class PackIndex } } - abstract class EntriesIterator implements Iterator { + static abstract class EntriesIterator implements Iterator { protected final MutableEntry entry = initEntry(); + private final long objectCount; + + protected EntriesIterator(long objectCount) { + this.objectCount = objectCount; + } + protected long returnedNumber = 0; protected abstract MutableEntry initEntry(); @Override public boolean hasNext() { - return returnedNumber < getObjectCount(); + return returnedNumber < objectCount; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java index 21f7314f33..3496a2a20c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java @@ -203,7 +203,7 @@ class PackIndexV1 extends PackIndex { @Override public Iterator iterator() { - return new IndexV1Iterator(); + return new IndexV1Iterator(objectCnt); } @Override @@ -251,6 +251,10 @@ class PackIndexV1 extends PackIndex { int levelTwo; + IndexV1Iterator(long objectCount) { + super(objectCount); + } + @Override protected MutableEntry initEntry() { return new MutableEntry() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java index 9a6f4a421a..12dfeb6695 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java @@ -224,7 +224,7 @@ class PackIndexV2 extends PackIndex { @Override public Iterator iterator() { - return new EntriesIteratorV2(); + return new EntriesIteratorV2(objectCnt); } @Override @@ -294,6 +294,10 @@ class PackIndexV2 extends PackIndex { int levelTwo; + EntriesIteratorV2(long objectCount){ + super(objectCount); + } + @Override protected MutableEntry initEntry() { return new MutableEntry() { -- cgit v1.2.3 From 9d5555d3c269a4b537e47c43e4f7ea51b5375f86 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 28 Mar 2024 15:11:05 -0700 Subject: PackIndex: Make it an interface As we work on different backends for PackIndex, it is much easier to extend an interface than an abstract class. Note that PackIndex is alredy acting as an interface, offering barely any functionality. Change-Id: Icd0db0e96a097631c2b9c3b05e5700f601f606d5 --- .../jgit/internal/storage/file/PackIndex.java | 43 ++++++++++++---------- .../jgit/internal/storage/file/PackIndexV1.java | 4 +- .../jgit/internal/storage/file/PackIndexV2.java | 2 +- 3 files changed, 26 insertions(+), 23 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index a23bc4f0a5..c0540d5a4c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -42,8 +42,8 @@ import org.eclipse.jgit.util.io.SilentFileInputStream; * by ObjectId. *

*/ -public abstract class PackIndex - implements Iterable, ObjectIdSet { +public interface PackIndex + extends Iterable, ObjectIdSet { /** * Open an existing pack .idx file for reading. *

@@ -61,7 +61,7 @@ public abstract class PackIndex * the file exists but could not be read due to security errors, * unrecognized data version, or unexpected data corruption. */ - public static PackIndex open(File idxFile) throws IOException { + static PackIndex open(File idxFile) throws IOException { try (SilentFileInputStream fd = new SilentFileInputStream( idxFile)) { return read(fd); @@ -92,7 +92,7 @@ public abstract class PackIndex * @throws org.eclipse.jgit.errors.CorruptObjectException * the stream does not contain a valid pack index. */ - public static PackIndex read(InputStream fd) throws IOException, + static PackIndex read(InputStream fd) throws IOException, CorruptObjectException { final byte[] hdr = new byte[8]; IO.readFully(fd, hdr, 0, hdr.length); @@ -123,12 +123,12 @@ public abstract class PackIndex * the object to look for. Must not be null. * @return true if the object is listed in this index; false otherwise. */ - public boolean hasObject(AnyObjectId id) { + default boolean hasObject(AnyObjectId id) { return findOffset(id) != -1; } @Override - public boolean contains(AnyObjectId id) { + default boolean contains(AnyObjectId id) { return findOffset(id) != -1; } @@ -144,7 +144,7 @@ public abstract class PackIndex *

*/ @Override - public abstract Iterator iterator(); + Iterator iterator(); /** * Obtain the total number of objects described by this index. @@ -152,7 +152,7 @@ public abstract class PackIndex * @return number of objects in this index, and likewise in the associated * pack that this index was generated from. */ - public abstract long getObjectCount(); + long getObjectCount(); /** * Obtain the total number of objects needing 64 bit offsets. @@ -160,7 +160,7 @@ public abstract class PackIndex * @return number of objects in this index using a 64 bit offset; that is an * object positioned after the 2 GB position within the file. */ - public abstract long getOffset64Count(); + long getOffset64Count(); /** * Get ObjectId for the n-th object entry returned by {@link #iterator()}. @@ -182,7 +182,7 @@ public abstract class PackIndex * is 0, the second is 1, etc. * @return the ObjectId for the corresponding entry. */ - public abstract ObjectId getObjectId(long nthPosition); + ObjectId getObjectId(long nthPosition); /** * Get ObjectId for the n-th object entry returned by {@link #iterator()}. @@ -206,7 +206,7 @@ public abstract class PackIndex * negative, but still valid. * @return the ObjectId for the corresponding entry. */ - public final ObjectId getObjectId(int nthPosition) { + default ObjectId getObjectId(int nthPosition) { if (nthPosition >= 0) return getObjectId((long) nthPosition); final int u31 = nthPosition >>> 1; @@ -225,7 +225,7 @@ public abstract class PackIndex * etc. Positions past 2**31-1 are negative, but still valid. * @return the offset in a pack for the corresponding entry. */ - protected abstract long getOffset(long nthPosition); + long getOffset(long nthPosition); /** * Locate the file offset position for the requested object. @@ -236,7 +236,7 @@ public abstract class PackIndex * object does not exist in this index and is thus not stored in the * associated pack. */ - public abstract long findOffset(AnyObjectId objId); + long findOffset(AnyObjectId objId); /** * Locate the position of this id in the list of object-ids in the index @@ -247,7 +247,7 @@ public abstract class PackIndex * of ids stored in this index; -1 if the object does not exist in * this index and is thus not stored in the associated pack. */ - public abstract int findPosition(AnyObjectId objId); + int findPosition(AnyObjectId objId); /** * Retrieve stored CRC32 checksum of the requested object raw-data @@ -261,7 +261,7 @@ public abstract class PackIndex * @throws java.lang.UnsupportedOperationException * when this index doesn't support CRC32 checksum */ - public abstract long findCRC32(AnyObjectId objId) + long findCRC32(AnyObjectId objId) throws MissingObjectException, UnsupportedOperationException; /** @@ -269,7 +269,7 @@ public abstract class PackIndex * * @return true if CRC32 is stored, false otherwise */ - public abstract boolean hasCRC32Support(); + boolean hasCRC32Support(); /** * Find objects matching the prefix abbreviation. @@ -285,7 +285,7 @@ public abstract class PackIndex * @throws java.io.IOException * the index cannot be read. */ - public abstract void resolve(Set matches, AbbreviatedObjectId id, + void resolve(Set matches, AbbreviatedObjectId id, int matchLimit) throws IOException; /** @@ -294,14 +294,14 @@ public abstract class PackIndex * @return the checksum of the pack; caller must not modify it * @since 5.5 */ - public abstract byte[] getChecksum(); + byte[] getChecksum(); /** * Represent mutable entry of pack index consisting of object id and offset * in pack (both mutable). * */ - public static class MutableEntry { + class MutableEntry { final MutableObjectId idBuffer = new MutableObjectId(); long offset; @@ -353,7 +353,10 @@ public abstract class PackIndex } } - static abstract class EntriesIterator implements Iterator { + /** + * Base implementation of the iterator over index entries. + */ + abstract class EntriesIterator implements Iterator { protected final MutableEntry entry = initEntry(); private final long objectCount; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java index 3496a2a20c..d7c83785d8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java @@ -29,7 +29,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.util.IO; import org.eclipse.jgit.util.NB; -class PackIndexV1 extends PackIndex { +class PackIndexV1 implements PackIndex { private static final int IDX_HDR_LEN = 256 * 4; private static final int RECORD_SIZE = 4 + Constants.OBJECT_ID_LENGTH; @@ -121,7 +121,7 @@ class PackIndexV1 extends PackIndex { } @Override - protected long getOffset(long nthPosition) { + public long getOffset(long nthPosition) { final int levelOne = findLevelOne(nthPosition); final int levelTwo = getLevelTwo(nthPosition, levelOne); final int p = (4 + Constants.OBJECT_ID_LENGTH) * levelTwo; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java index 12dfeb6695..caf8b71180 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java @@ -28,7 +28,7 @@ import org.eclipse.jgit.util.IO; import org.eclipse.jgit.util.NB; /** Support for the pack index v2 format. */ -class PackIndexV2 extends PackIndex { +class PackIndexV2 implements PackIndex { private static final long IS_O64 = 1L << 31; private static final int FANOUT = 256; -- cgit v1.2.3 From 5c0c18f5665fe8d3c3fae0176e231deb6c2480a7 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 11 May 2024 14:11:17 +0200 Subject: [releng] Bump Bouncy Castle to 1.78.1 Update version in pom.xml; update target platforms; update bazel workspace. BC 1.78 had broken OSGi metadata in MANIFEST.MF; this was fixed in 1.78.1. Change-Id: Iac5751910b283b04983abe399264e0dabfe6162c Signed-off-by: Thomas Wolf --- WORKSPACE | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.17.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.18.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.19.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.20.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.21.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.22.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.23.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.24.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.25.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.26.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.27.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.28.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.29.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.30.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.31.target | 10 +++++----- .../org.eclipse.jgit.target/maven/dependencies.tpd | 8 ++++---- pom.xml | 2 +- 18 files changed, 89 insertions(+), 89 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 07d4d5cd03..c627b4e586 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -293,32 +293,32 @@ maven_jar( src_sha1 = "b012c053d25d902cc64a5c4432a8eedab3241d94", ) -BOUNCYCASTLE_VER = "1.77" +BOUNCYCASTLE_VER = "1.78.1" maven_jar( name = "bcpg", artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "bb0be51e8b378baae6e0d86f5282cd3887066539", - src_sha1 = "33ff3269cede7165dac44033a3b150cc9f9f11cf", + sha1 = "6c8dbcec20355278ec54840e735f63db2479150e", + src_sha1 = "2ddef60d84dd8c14ebce4c13100f0bc55fed6922", ) maven_jar( name = "bcprov", artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "2cc971b6c20949c1ff98d1a4bc741ee848a09523", - src_sha1 = "14ea9a3d759261358c6a1f59490ded125b5273a6", + sha1 = "39e9e45359e20998eb79c1828751f94a818d25f8", + src_sha1 = "70f58ec93da543dda6a21614b768cb2e386fd512", ) maven_jar( name = "bcutil", artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "de3eaef351545fe8562cf29ddff4a403a45b49b7", - src_sha1 = "6f8f56ab009e7a3204817a0d45ed9638f5e30116", + sha1 = "5353ca39fe2f148dab9ca1d637a43d0750456254", + src_sha1 = "8d2e0747f5d806f39a602f7f91610444d88c4e2c", ) maven_jar( name = "bcpkix", artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "ed953791ba0229747dd0fd9911e3d76a462acfd3", - src_sha1 = "fdff397d5de0306db014f0a17e91717150db2768", + sha1 = "17b3541f736df97465f87d9f5b5dfa4991b37bb3", + src_sha1 = "3aeaf221772ad0c9c04593688cb86c6eb74d48b9", ) 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 cf278d8d41..7d6987959b 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 c7fdb830dd..369677eb5d 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 b3f4165412..ec3f1c1662 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 55b6281408..06e893d8e8 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 45136a7aaa..210583c0c8 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 7fe3b68085..c3ece6c100 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 e0786fd4eb..799f9b7bfc 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 4656b56676..cfd4c21ee5 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 efa79b3246..21ca0f8583 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 a432bbbe12..91efe696b8 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 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 4b912382d9..5abb2d1a18 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 7dc8dd82fd..f5c3d8dd42 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index d86ea2826d..7e3312c21c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index afd4d320bc..7e2f55a263 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index d95197a43e..438cbf4359 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -203,25 +203,25 @@ org.bouncycastle bcpg-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcprov-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcpkix-jdk18on - 1.77 + 1.78.1 jar org.bouncycastle bcutil-jdk18on - 1.77 + 1.78.1 jar 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 8347389018..06866da39f 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 @@ -64,22 +64,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.77" + version = "1.78.1" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.77" + version = "1.78.1" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.77" + version = "1.78.1" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.77" + version = "1.78.1" } } diff --git a/pom.xml b/pom.xml index 0d035f8067..f5b6361695 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 1.7.36 3.6.3 2.10.1 - 1.77 + 1.78.1 4.8.3.1 3.5.1 3.3.2 -- cgit v1.2.3 From c1f95130c554580afc1d6090d30b3946b578714e Mon Sep 17 00:00:00 2001 From: Yury Molchan Date: Wed, 6 Dec 2023 04:29:39 +0200 Subject: Check an execution bit by reading it from the file system Files.isExecutable() checks possibility to execute a file from the JVM, not POSIX attributes. So it fails when Java Security Manager does not allow to execute a file, but file has X-bit. Change-Id: I85b96fb6cedbaff1b3c063728c25b6ce4d04e9b9 --- org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java index ee907f2ee6..e73095f5a8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010, Robin Rosenberg and others + * Copyright (C) 2010, 2024, Robin Rosenberg and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -203,7 +203,16 @@ public class FS_POSIX extends FS { /** {@inheritDoc} */ @Override public boolean canExecute(File f) { - return FileUtils.canExecute(f); + if (!isFile(f)) { + return false; + } + try { + Path path = FileUtils.toPath(f); + Set pset = Files.getPosixFilePermissions(path); + return pset.contains(PosixFilePermission.OWNER_EXECUTE); + } catch (IOException ex) { + return false; + } } /** {@inheritDoc} */ -- cgit v1.2.3 From 31a76e4068de9f6f7110901f8089f0cc0648eb54 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 13 May 2024 00:56:20 +0200 Subject: Update args4j to 2.37 Change-Id: I6f8c1cce050017aad5b0d36886f85c42c1a3aed9 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c627b4e586..c04076ec78 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -188,8 +188,8 @@ maven_jar( maven_jar( name = "args4j", - artifact = "args4j:args4j:2.33", - sha1 = "bd87a75374a6d6523de82fef51fc3cfe9baf9fc9", + artifact = "args4j:args4j:2.37", + sha1 = "244f60c057d72a785227c0562d3560f42a7ea54b", ) maven_jar( 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 7d6987959b..d53e48b281 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 369677eb5d..5e4a94e80e 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 ec3f1c1662..7f1b692196 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 06e893d8e8..409507053e 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 210583c0c8..ad1efbbf99 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 c3ece6c100..eda4d518f2 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 799f9b7bfc..5cc63993a8 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 cfd4c21ee5..3e6c6de168 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 21ca0f8583..8cc5fd8bc9 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 91efe696b8..44fc57b789 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 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 5abb2d1a18..3795eaf38d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index f5c3d8dd42..dc92eee643 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 7e3312c21c..e052c609d9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 7e2f55a263..f2ab28dac9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 438cbf4359..9da66e5141 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -241,7 +241,7 @@ args4j args4j - 2.33 + 2.37 jar 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 06866da39f..414dfdbed3 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 @@ -38,7 +38,7 @@ maven args4j dependency { groupId = "args4j" artifactId = "args4j" - version = "2.33" + version = "2.37" } } diff --git a/pom.xml b/pom.xml index f5b6361695..c5bab119e6 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ 1.2.3 4.13.2 1C - 2.33 + 2.37 1.26.0 6.0.0 4.0.4 -- cgit v1.2.3 From 30b14761877a226d71f9c1b77b585fdba2c75b4c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 13 May 2024 00:58:15 +0200 Subject: Update groovy to 4.0.21 Change-Id: I7eb29ba080f6c2e3f4097977adf48b246c4a7822 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index c5bab119e6..5d9b78b7b0 100644 --- a/pom.xml +++ b/pom.xml @@ -647,13 +647,13 @@ org.apache.groovy groovy - 4.0.15 + 4.0.21 runtime org.apache.groovy groovy-ant - 4.0.15 + 4.0.21 runtime -- cgit v1.2.3 From a8cd1740f9188fd7290fa4976df04f87bc925efa Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 13 May 2024 01:10:33 +0200 Subject: Update org.eclipse.jdt:ecj to 3.37.0 Change-Id: Iedc5cd96f85367546f0b15df05ac242a38af3b16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5d9b78b7b0..4bb8a588f5 100644 --- a/pom.xml +++ b/pom.xml @@ -1092,7 +1092,7 @@ org.eclipse.jdt ecj - 3.36.0 + 3.37.0 -- cgit v1.2.3 From 003ddfb767fd69d9d78bf18a9fb45a6ea228bfab Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 13 May 2024 01:31:12 +0200 Subject: Update mockito to 5.12.0 Change-Id: Ia346c37673369ee497ab4797aa96d82fe51f84c0 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c04076ec78..8dc3adf456 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -206,8 +206,8 @@ maven_jar( maven_jar( name = "mockito", - artifact = "org.mockito:mockito-core:5.10.0", - sha1 = "b3812fa2ee069f1d0b41c1c0155da79d0e1dcde0", + artifact = "org.mockito:mockito-core:5.12.0", + sha1 = "22f8bbaf478e6789164787fa411a3b5ed986e110", ) maven_jar( 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 d53e48b281..560b9b835e 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 5e4a94e80e..0ebb0a0218 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 7f1b692196..b914e6daef 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 409507053e..7d78813f05 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 ad1efbbf99..af3e42f844 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 eda4d518f2..8573d029dd 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 5cc63993a8..60218a38a1 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 3e6c6de168..8d0e46843a 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 8cc5fd8bc9..663e0183bd 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 44fc57b789..a5c4188c69 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 3795eaf38d..e425460ea5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index dc92eee643..cb9cf881b6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index e052c609d9..8f67334790 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index f2ab28dac9..f7f72879db 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 9da66e5141..f25ed944bd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 jar 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 414dfdbed3..14009e03e2 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 @@ -215,7 +215,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.10.0" + version = "5.12.0" } } diff --git a/pom.xml b/pom.xml index 4bb8a588f5..ec7ee5ddef 100644 --- a/pom.xml +++ b/pom.xml @@ -983,7 +983,7 @@ org.mockito mockito-core - 5.10.0 + 5.12.0 -- cgit v1.2.3 From 127762ba8b25d811fa1bb915b80eccb32e82aebc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 13 May 2024 01:40:59 +0200 Subject: Update org.apache.commons:commons-compress to 1.26.1 Change-Id: I53a0308145d1caa62a09b2262b721d155b62a4b8 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8dc3adf456..9302712e67 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -170,8 +170,8 @@ maven_jar( maven_jar( name = "commons-compress", - artifact = "org.apache.commons:commons-compress:1.26.0", - sha1 = "659feffdd12280201c8aacb8f7be94f9a883c824", + artifact = "org.apache.commons:commons-compress:1.26.1", + sha1 = "44331c1130c370e726a2e1a3e6fba6d2558ef04a", ) maven_jar( 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 560b9b835e..49b1d1fe2f 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 0ebb0a0218..9ffa2625b3 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 b914e6daef..c0970d6177 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 7d78813f05..dcf5146ce1 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 af3e42f844..75fe5410e5 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 8573d029dd..ca66b9462a 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 60218a38a1..3e0bd36ebb 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 8d0e46843a..836dd58ccc 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 663e0183bd..746fec4ddf 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 a5c4188c69..fb0256d26a 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 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index e425460ea5..d3b10eea14 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index cb9cf881b6..9fd52696c4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 8f67334790..056b5a13f8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index f7f72879db..006db58212 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index f25ed944bd..745f073648 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ org.apache.commons commons-compress - 1.26.0 + 1.26.1 jar 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 14009e03e2..f3b97b2211 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 @@ -15,7 +15,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-compress" - version = "1.26.0" + version = "1.26.1" } dependency { groupId = "commons-io" diff --git a/pom.xml b/pom.xml index ec7ee5ddef..8cf58da977 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 4.13.2 1C 2.37 - 1.26.0 + 1.26.1 6.0.0 4.0.4 10.0.20 -- cgit v1.2.3 From dbf45058cb45c55c80bd754e7de51c3585f3d4c9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 13 May 2024 01:52:12 +0200 Subject: Update byte-buddy to 1.14.15 Change-Id: Ie5192a7c02c60e26c7c76f618b05f24307afcc63 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 18 files changed, 51 insertions(+), 51 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 9302712e67..61f7111cb9 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -216,18 +216,18 @@ maven_jar( sha1 = "792b270e73aa1cfc28fa135be0b95e69ea451432", ) -BYTE_BUDDY_VERSION = "1.14.12" +BYTE_BUDDY_VERSION = "1.14.15" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "6e37f743dc15a8d7a4feb3eb0025cbc612d5b9e1", + sha1 = "11c9440bc7f9468761e5a82778a05205169d49a9", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "be4984cb6fd1ef1d11f218a648889dfda44b8a15", + sha1 = "0b4cc9d88d5de562bf75b3a54ab436ad01b3f72d", ) maven_jar( 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 49b1d1fe2f..4ac42c6687 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 9ffa2625b3..879e6fc53f 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 c0970d6177..c1de8f35d6 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 dcf5146ce1..0eb4a58753 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 75fe5410e5..2454e20f73 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 ca66b9462a..1d8e31d7c3 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 3e0bd36ebb..b42fd2f8d8 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 836dd58ccc..303a053214 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 746fec4ddf..800bd2e771 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 fb0256d26a..c63a1ef1d7 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 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index d3b10eea14..e314fd4daf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 9fd52696c4..6a1c94f0f5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 056b5a13f8..b3fe75f4f7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 006db58212..fb6812e3af 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 745f073648..df2cc15ffc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -187,13 +187,13 @@ net.bytebuddy byte-buddy - 1.14.12 + 1.14.15 jar net.bytebuddy byte-buddy-agent - 1.14.12 + 1.14.15 jar 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 f3b97b2211..aadea4a7e2 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 @@ -92,12 +92,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.14.12" + version = "1.14.15" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.14.12" + version = "1.14.15" } } diff --git a/pom.xml b/pom.xml index 8cf58da977..6e4cc33b04 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.25.3 5.14.0 - 1.14.12 + 1.14.15 jacoco -- cgit v1.2.3 From a7d0cf38d6d6b6bea5a700d02b4854d687b865ad Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 13 May 2024 02:06:38 +0200 Subject: Update mina-sshd to 2.12.1 Change-Id: I3f7b76243af0add3ee66a7f808a73f10d01a7627 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 18 files changed, 51 insertions(+), 51 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 61f7111cb9..82b713d44b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -110,18 +110,18 @@ maven_jar( sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", ) -SSHD_VERS = "2.12.0" +SSHD_VERS = "2.12.1" maven_jar( name = "sshd-osgi", artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, - sha1 = "32b8de1cbb722ba75bdf9898e0c41d42af00ce57", + sha1 = "45b0501857603881ab472c927852ffa406932aef", ) maven_jar( name = "sshd-sftp", artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, - sha1 = "0f96f00a07b186ea62838a6a4122e8f4cad44df6", + sha1 = "3ef6ded49799618c9438aa1044c6bf01124133bb", ) JNA_VERS = "5.14.0" 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 4ac42c6687..a678a012c8 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 879e6fc53f..eb74dadfbd 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 c1de8f35d6..14a34d9307 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 0eb4a58753..9552fece0b 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 2454e20f73..9c2b3fabda 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 1d8e31d7c3..03132da42d 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 b42fd2f8d8..5fadc074a9 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 303a053214..550dfc4231 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 800bd2e771..f5c2841e3d 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 c63a1ef1d7..a3fd04ca9c 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index e314fd4daf..3137261e69 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 6a1c94f0f5..60258a656e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index b3fe75f4f7..5651cd7b04 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index fb6812e3af..71fdd95d34 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index df2cc15ffc..da72924ef0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.0 + 2.12.1 jar org.apache.sshd sshd-sftp - 2.12.0 + 2.12.1 jar 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 aadea4a7e2..b713065d1f 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 @@ -228,12 +228,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.12.0" + version = "2.12.1" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.12.0" + version = "2.12.1" } } diff --git a/pom.xml b/pom.xml index 6e4cc33b04..ac6daf5e25 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 6.9.0.202403050737-r 1.10.14 - 2.12.0 + 2.12.1 0.1.55 1.1.3 1.2.3 -- cgit v1.2.3 From 28c3ae1728866bcdb2fb88b61683e3132c7f8ff5 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 6 May 2024 19:32:12 +0200 Subject: sshd: fix IdentiesOnly if SSH agent is enabled and has keys Commit a44b9e8bf changed the logic so that we try to read a public key from the file given first, and only then try the file with the ".pub" extension. Unfortunately the exception handling was not sufficient to correctly deal with the given file containing a private key. Apache MINA SSHD may throw a StreamCorruptedException when one tries to read a public key from a file containing a private key. Handle this exception in addition to GeneralSecurityException, and change the order of exception handlers because StreamCorruptedException is an IOException. Bug: jgit-53 Change-Id: I7dddc2c11aa75d7663f7fe41652df612bf8c88cd Signed-off-by: Thomas Wolf --- .../transport/sshd/JGitPublicKeyAuthentication.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java index b0b1028daa..6aace4753a 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/JGitPublicKeyAuthentication.java @@ -17,6 +17,7 @@ import static org.eclipse.jgit.transport.SshConstants.PUBKEY_ACCEPTED_ALGORITHMS import java.io.File; import java.io.IOException; +import java.io.StreamCorruptedException; import java.net.URISyntaxException; import java.nio.file.Files; import java.nio.file.InvalidPathException; @@ -355,20 +356,20 @@ public class JGitPublicKeyAuthentication extends UserAuthPublicKey { // only warn about non-existing files in case the key file is // not derived if (!isDerived) { - log.warn("{}", //$NON-NLS-1$ + log.warn(LOG_FORMAT, format(SshdText.get().cannotReadPublicKey, keyFile)); } - } catch (InvalidPathException | IOException e) { - log.warn("{}", //$NON-NLS-1$ - format(SshdText.get().cannotReadPublicKey, keyFile), e); - } catch (GeneralSecurityException e) { + } catch (GeneralSecurityException | StreamCorruptedException e) { // ignore in case this is not a derived key path, as in most // cases this specifies a private key if (isDerived) { - log.warn("{}", //$NON-NLS-1$ + log.warn(LOG_FORMAT, format(SshdText.get().cannotReadPublicKey, keyFile), e); } + } catch (InvalidPathException | IOException e) { + log.warn(LOG_FORMAT, + format(SshdText.get().cannotReadPublicKey, keyFile), e); } return null; } -- cgit v1.2.3 From 67860f6f01ac211c5da85b911ec285a644f7b377 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 14 May 2024 16:18:24 +0200 Subject: Add 4.32 target platform and - add orbit-4.32 - update objenesis to 3.4 Change-Id: Ia9df427eb3c97f867caaffbc92674fb750433aad --- WORKSPACE | 4 +- .../org.eclipse.jgit.target/jgit-4.31.tpd | 2 +- .../org.eclipse.jgit.target/jgit-4.32.target | 278 +++++++++++++++++++++ .../org.eclipse.jgit.target/jgit-4.32.tpd | 8 + .../org.eclipse.jgit.target/orbit/orbit-4.32.tpd | 27 ++ 5 files changed, 316 insertions(+), 3 deletions(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd diff --git a/WORKSPACE b/WORKSPACE index 82b713d44b..45ac27f45b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -232,8 +232,8 @@ maven_jar( maven_jar( name = "objenesis", - artifact = "org.objenesis:objenesis:3.3", - sha1 = "1049c09f1de4331e8193e579448d0916d75b7631", + artifact = "org.objenesis:objenesis:3.4", + sha1 = "675cbe121a68019235d27f6c34b4f0ac30e07418", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd index 58491c85d5..8174709b7c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd @@ -3,6 +3,6 @@ target "jgit-4.31" with source configurePhase include "orbit/orbit-4.31.tpd" include "maven/dependencies.tpd" -location "https://download.eclipse.org/staging/2024-03/" { +location "https://download.eclipse.org/releases/2024-03/" { org.eclipse.osgi lazy } diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target new file mode 100644 index 0000000000..fb175f7d55 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.tukaani + xz + 1.9 + jar + + + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + + + + + + org.mockito + mockito-core + 5.12.0 + jar + + + + + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + + + + + + org.eclipse.jetty + jetty-http + 10.0.20 + jar + + + org.eclipse.jetty + jetty-io + 10.0.20 + jar + + + org.eclipse.jetty + jetty-security + 10.0.20 + jar + + + org.eclipse.jetty + jetty-server + 10.0.20 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.20 + jar + + + org.eclipse.jetty + jetty-util + 10.0.20 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.20 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + org.hamcrest + hamcrest + 2.2 + jar + + + + + + + com.google.code.gson + gson + 2.10.1 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + + + + + + org.assertj + assertj-core + 3.25.3 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.16.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.15.1 + jar + + + commons-logging + commons-logging + 1.2 + jar + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.tpd new file mode 100644 index 0000000000..b8574c73b9 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.tpd @@ -0,0 +1,8 @@ +target "jgit-4.32" with source configurePhase + +include "orbit/orbit-4.32.tpd" +include "maven/dependencies.tpd" + +location "https://download.eclipse.org/staging/2024-06/" { + org.eclipse.osgi lazy +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd new file mode 100644 index 0000000000..480e96e2e8 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd @@ -0,0 +1,27 @@ +target "orbit-4.32" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + net.i2p.crypto.eddsa [0.3.0,0.3.0] + net.i2p.crypto.eddsa.source [0.3.0,0.3.0] + org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] + org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} -- cgit v1.2.3 From bca1f4d6582ceb1f50171de315536b318eeb0fae Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 14 May 2024 16:25:43 +0200 Subject: Fix warning "Redundant specification of type arguments " Use a lambda to fix this and make the code easier to read. Change-Id: I082ffb2073f86d21deb4b51a24e53de9371b765e --- .../tst/org/eclipse/jgit/transport/AtomicPushTest.java | 16 ++-------------- .../jgit/transport/UploadPackReachabilityTest.java | 16 ++++------------ 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java index c47e591445..0ba8926a7f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/AtomicPushTest.java @@ -25,10 +25,6 @@ import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.transport.resolver.ReceivePackFactory; -import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; -import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -46,16 +42,8 @@ public class AtomicPushTest { public void setUp() throws Exception { server = newRepo("server"); client = newRepo("client"); - testProtocol = new TestProtocol<>( - null, - new ReceivePackFactory() { - @Override - public ReceivePack create(Object req, Repository db) - throws ServiceNotEnabledException, - ServiceNotAuthorizedException { - return new ReceivePack(db); - } - }); + testProtocol = new TestProtocol<>(null, + (req, db) -> new ReceivePack(db)); uri = testProtocol.register(ctx, server); try (TestRepository clientRepo = new TestRepository<>(client)) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java index 2711762640..a5507c8f81 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackReachabilityTest.java @@ -27,9 +27,6 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevBlob; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.transport.UploadPack.RequestPolicy; -import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException; -import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException; -import org.eclipse.jgit.transport.resolver.UploadPackFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -264,15 +261,10 @@ public class UploadPackReachabilityTest { } private static TestProtocol generateReachableCommitUploadPackProtocol() { - return new TestProtocol<>(new UploadPackFactory() { - @Override - public UploadPack create(Object req, Repository db) - throws ServiceNotEnabledException, - ServiceNotAuthorizedException { - UploadPack up = new UploadPack(db); - up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT); - return up; - } + return new TestProtocol<>((req, db) -> { + UploadPack up = new UploadPack(db); + up.setRequestPolicy(RequestPolicy.REACHABLE_COMMIT); + return up; }, null); } } -- cgit v1.2.3 From bee9796abb947007550e3be106861fdf12f0af6e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 14 May 2024 16:33:04 +0200 Subject: Remove unused API problem filters Change-Id: I12e4d0fd48b5b7420d421874c8d63caed9628266 --- org.eclipse.jgit/.settings/.api_filters | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 org.eclipse.jgit/.settings/.api_filters diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters deleted file mode 100644 index dda62f22a3..0000000000 --- a/org.eclipse.jgit/.settings/.api_filters +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 6e9a170364efc727f4368cf5304115c7b278a649 Mon Sep 17 00:00:00 2001 From: Patrick Hiesel Date: Fri, 10 Mar 2023 16:50:37 +0100 Subject: Allow applying a patch with conflicts In some settings, we want to let users apply a patch that does not cleanly apply and add conflict markers. In Gerrit, this is useful when cherry picking (via Git patches) from one host to another. This commit takes a simple approach: If a hunk doesn't apply, go to the pre-image line, treat all lines in pre-image length as left side of the conflict and all context and newly added lines as right side of the conflict. Change-Id: I01411d7a32b3f3207097b26231909aae6b835650 --- .../eclipse/jgit/diff/ConflictOutOfBounds.patch | 10 ++ .../jgit/diff/ConflictOutOfBounds_PostImage | 15 +++ .../eclipse/jgit/diff/ConflictOutOfBounds_PreImage | 8 ++ .../org/eclipse/jgit/diff/allowconflict.patch | 10 ++ .../org/eclipse/jgit/diff/allowconflict_PostImage | 15 +++ .../org/eclipse/jgit/diff/allowconflict_PreImage | 8 ++ .../org/eclipse/jgit/patch/PatchApplierTest.java | 55 ++++++++- .../src/org/eclipse/jgit/patch/PatchApplier.java | 134 ++++++++++++++++++--- 8 files changed, 234 insertions(+), 21 deletions(-) create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds.patch create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PostImage create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PreImage create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict.patch create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PostImage create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PreImage diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds.patch new file mode 100644 index 0000000000..6e7448b95c --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds.patch @@ -0,0 +1,10 @@ +diff --git a/ConflictOutOfBounds b/ConflictOutOfBounds +index 0000000..de98044 +--- a/ConflictOutOfBounds ++++ b/ConflictOutOfBounds +@@ -25,4 +25,4 @@ + line3 +-lineA ++lineB + line5 + line6 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PostImage new file mode 100644 index 0000000000..4e5d5b2d88 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PostImage @@ -0,0 +1,15 @@ +line1 +line2 +line3 +line4 +line5 +line6 +line7 +line8 +<<<<<<< HEAD +======= +line3 +lineB +line5 +line6 +>>>>>>> PATCH diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PreImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PreImage new file mode 100644 index 0000000000..f62562a216 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/ConflictOutOfBounds_PreImage @@ -0,0 +1,8 @@ +line1 +line2 +line3 +line4 +line5 +line6 +line7 +line8 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict.patch new file mode 100644 index 0000000000..a99e636382 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict.patch @@ -0,0 +1,10 @@ +diff --git a/allowconflict b/allowconflict +index 0000000..de98044 +--- a/allowconflict ++++ b/allowconflict +@@ -3,4 +3,4 @@ + line3 +-lineA ++lineB + line5 + line6 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PostImage new file mode 100644 index 0000000000..a963b40dfe --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PostImage @@ -0,0 +1,15 @@ +line1 +line2 +<<<<<<< HEAD +line3 +line4 +line5 +line6 +======= +line3 +lineB +line5 +line6 +>>>>>>> PATCH +line7 +line8 diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PreImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PreImage new file mode 100644 index 0000000000..f62562a216 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_PreImage @@ -0,0 +1,8 @@ +line1 +line2 +line3 +line4 +line5 +line6 +line7 +line8 diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java index 2aac15bbb6..e4b0ffbc21 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java @@ -27,6 +27,7 @@ import java.nio.file.Files; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.errors.PatchFormatException; import org.eclipse.jgit.attributes.FilterCommand; import org.eclipse.jgit.attributes.FilterCommandFactory; import org.eclipse.jgit.attributes.FilterCommandRegistry; @@ -48,8 +49,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Suite; @RunWith(Suite.class) -@Suite.SuiteClasses({ - PatchApplierTest.WithWorktree. class, // +@Suite.SuiteClasses({ PatchApplierTest.WithWorktree.class, // PatchApplierTest.InCore.class, // }) public class PatchApplierTest { @@ -128,6 +128,20 @@ public class PatchApplierTest { } } + protected Result applyPatchAllowConflicts() throws IOException { + InputStream patchStream = getTestResource(name + ".patch"); + Patch patch = new Patch(); + patch.parse(patchStream); + if (inCore) { + try (ObjectInserter oi = db.newObjectInserter()) { + return new PatchApplier(db, baseTip, oi).allowConflicts() + .applyPatch(patch); + } + } + return new PatchApplier(db).allowConflicts() + .applyPatch(patch); + } + protected static InputStream getTestResource(String patchFile) { return PatchApplierTest.class.getClassLoader() .getResourceAsStream("org/eclipse/jgit/diff/" + patchFile); @@ -169,6 +183,13 @@ public class PatchApplierTest { verifyContent(result, aName, exists); } + void verifyChange(Result result, String aName, boolean exists, + int numConflicts) throws Exception { + assertEquals(numConflicts, result.getErrors().size()); + assertEquals(1, result.getPaths().size()); + verifyContent(result, aName, exists); + } + protected byte[] readBlob(ObjectId treeish, String path) throws Exception { try (TestRepository tr = new TestRepository<>(db); @@ -345,6 +366,36 @@ public class PatchApplierTest { verifyChange(result, "CopyResult", true); } + @Test + public void testConflictMarkers() throws Exception { + init("allowconflict", true, true); + + Result result = applyPatchAllowConflicts(); + + assertEquals(result.getErrors().size(), 1); + PatchApplier.Result.Error error = result.getErrors().get(0); + error.hh = null; // We don't assert the hunk header as it is a + // complex object with lots of internal state. + assertEquals(error, new PatchApplier.Result.Error( + "cannot apply hunk", "allowconflict", null)); + verifyChange(result, "allowconflict", true, 1); + } + + @Test + public void testConflictMarkersOutOfBounds() throws Exception { + init("ConflictOutOfBounds", true, true); + + Result result = applyPatchAllowConflicts(); + + assertEquals(result.getErrors().size(), 1); + PatchApplier.Result.Error error = result.getErrors().get(0); + error.hh = null; // We don't assert the hunk header as it is a + // complex object with lots of internal state. + assertEquals(error, new PatchApplier.Result.Error( + "cannot apply hunk", "ConflictOutOfBounds", null)); + verifyChange(result, "ConflictOutOfBounds", true, 1); + } + @Test public void testShiftUp() throws Exception { init("ShiftUp"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java index a327095c81..84c2ec43dc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.nio.ByteBuffer; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.StandardCopyOption; @@ -33,9 +34,11 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; import java.util.zip.InflaterInputStream; + import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.errors.FilterFailedException; import org.eclipse.jgit.api.errors.PatchFormatException; @@ -101,11 +104,12 @@ import org.eclipse.jgit.util.sha1.SHA1; * @since 6.4 */ public class PatchApplier { - private static final byte[] NO_EOL = "\\ No newline at end of file" //$NON-NLS-1$ .getBytes(StandardCharsets.US_ASCII); - /** The tree before applying the patch. Only non-null for inCore operation. */ + /** + * The tree before applying the patch. Only non-null for inCore operation. + */ @Nullable private final RevTree beforeTree; @@ -115,10 +119,14 @@ public class PatchApplier { private final ObjectReader reader; + private final Charset charset; + private WorkingTreeOptions workingTreeOptions; private int inCoreSizeLimit; + private boolean allowConflicts; + /** * @param repo * repository to apply the patch in @@ -128,7 +136,8 @@ public class PatchApplier { inserter = repo.newObjectInserter(); reader = inserter.newReader(); beforeTree = null; - + allowConflicts = false; + charset = StandardCharsets.UTF_8; Config config = repo.getConfig(); workingTreeOptions = config.get(WorkingTreeOptions.KEY); inCoreSizeLimit = config.getInt(ConfigConstants.CONFIG_MERGE_SECTION, @@ -143,11 +152,14 @@ public class PatchApplier { * @param oi * to be used for modifying objects */ - public PatchApplier(Repository repo, RevTree beforeTree, ObjectInserter oi) { + public PatchApplier(Repository repo, RevTree beforeTree, + ObjectInserter oi) { this.repo = repo; this.beforeTree = beforeTree; inserter = oi; reader = oi.newReader(); + allowConflicts = false; + charset = StandardCharsets.UTF_8; } /** @@ -157,7 +169,6 @@ public class PatchApplier { * @since 6.3 */ public static class Result { - /** * A wrapper for a patch applying error that affects a given file. * @@ -166,13 +177,14 @@ public class PatchApplier { // TODO(ms): rename this class in next major release @SuppressWarnings("JavaLangClash") public static class Error { + String msg; + + String oldFileName; - private String msg; - private String oldFileName; - private @Nullable HunkHeader hh; + @Nullable + HunkHeader hh; - private Error(String msg, String oldFileName, - @Nullable HunkHeader hh) { + Error(String msg, String oldFileName, @Nullable HunkHeader hh) { this.msg = msg; this.oldFileName = oldFileName; this.hh = hh; @@ -181,13 +193,33 @@ public class PatchApplier { @Override public String toString() { if (hh != null) { - return MessageFormat.format(JGitText.get().patchApplyErrorWithHunk, - oldFileName, hh, msg); + return MessageFormat.format( + JGitText.get().patchApplyErrorWithHunk, oldFileName, + hh, msg); } - return MessageFormat.format(JGitText.get().patchApplyErrorWithoutHunk, - oldFileName, msg); + return MessageFormat.format( + JGitText.get().patchApplyErrorWithoutHunk, oldFileName, + msg); } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || !(o instanceof Error)) { + return false; + } + Error error = (Error) o; + return Objects.equals(msg, error.msg) + && Objects.equals(oldFileName, error.oldFileName) + && Objects.equals(hh, error.hh); + } + + @Override + public int hashCode() { + return Objects.hash(msg, oldFileName, hh); + } } private ObjectId treeId; @@ -357,6 +389,17 @@ public class PatchApplier { return result; } + /** + * Sets up the {@link PatchApplier} to apply patches even if they conflict. + * + * @return the {@link PatchApplier} to apply any patches + * @since 6.10 + */ + public PatchApplier allowConflicts() { + allowConflicts = true; + return this; + } + private File getFile(String path) { return inCore() ? null : new File(repo.getWorkTree(), path); } @@ -439,6 +482,7 @@ public class PatchApplier { return false; } } + private static final int FILE_TREE_INDEX = 1; /** @@ -539,7 +583,9 @@ public class PatchApplier { convertCrLf); resultStreamLoader = applyText(raw, fh, result); } - if (resultStreamLoader == null || !result.getErrors().isEmpty()) { + if (resultStreamLoader == null + || (!result.getErrors().isEmpty() && result.getErrors().stream() + .anyMatch(e -> !e.msg.equals("cannot apply hunk")))) { //$NON-NLS-1$ return; } @@ -961,9 +1007,51 @@ public class PatchApplier { } } if (!applies) { - result.addError(JGitText.get().applyTextPatchCannotApplyHunk, - fh.getOldPath(), hh); - return null; + if (!allowConflicts) { + result.addError( + JGitText.get().applyTextPatchCannotApplyHunk, + fh.getOldPath(), hh); + return null; + } + // Insert conflict markers. This is best-guess because the + // file might have changed completely. But at least we give + // the user a graceful state that they can resolve manually. + // An alternative to this is using the 3-way merger. This + // only works if the pre-image SHA is contained in the repo. + // If that was the case, cherry-picking the original commit + // should be preferred to apply a patch. + result.addError("cannot apply hunk", fh.getOldPath(), hh); //$NON-NLS-1$ + newLines.add(Math.min(applyAt++, newLines.size()), + asBytes("<<<<<<< HEAD")); //$NON-NLS-1$ + applyAt += hh.getOldImage().lineCount; + newLines.add(Math.min(applyAt++, newLines.size()), + asBytes("=======")); //$NON-NLS-1$ + + int sz = hunkLines.size(); + for (int j = 1; j < sz; j++) { + ByteBuffer hunkLine = hunkLines.get(j); + if (!hunkLine.hasRemaining()) { + // Completely empty line; accept as empty context + // line + applyAt++; + lastWasRemoval = false; + continue; + } + switch (hunkLine.array()[hunkLine.position()]) { + case ' ': + case '+': + newLines.add(Math.min(applyAt++, newLines.size()), + slice(hunkLine, 1)); + break; + case '-': + case '\\': + default: + break; + } + } + newLines.add(Math.min(applyAt++, newLines.size()), + asBytes(">>>>>>> PATCH")); //$NON-NLS-1$ + continue; } // Hunk applies at applyAt. Apply it, and update afterLastHunk and // lineNumberShift @@ -1010,7 +1098,11 @@ public class PatchApplier { } else if (!rt.isMissingNewlineAtEnd()) { newLines.add(null); } + return toContentStreamLoader(newLines); + } + private static ContentStreamLoader toContentStreamLoader( + List newLines) throws IOException { // We could check if old == new, but the short-circuiting complicates // logic for inCore patching, so just write the new thing regardless. TemporaryBuffer buffer = new TemporaryBuffer.LocalFile(null); @@ -1034,6 +1126,10 @@ public class PatchApplier { } } + private ByteBuffer asBytes(String str) { + return ByteBuffer.wrap(str.getBytes(charset)); + } + @SuppressWarnings("ByteBufferBackingArray") private boolean canApplyAt(List hunkLines, List newLines, int line) { @@ -1123,4 +1219,4 @@ public class PatchApplier { in.close(); } } -} +} \ No newline at end of file -- cgit v1.2.3 From 50ca16cb8623400e0ee199ef0f2198e3c1c171b1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 15 May 2024 22:55:30 +0200 Subject: PatchApplierTest: remove unused import Change-Id: Ie3ac82a8160c605e27ee3167e3640cd76b1b2a76 --- org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java index e4b0ffbc21..2e529b5e93 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java @@ -27,7 +27,6 @@ import java.nio.file.Files; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.api.errors.PatchFormatException; import org.eclipse.jgit.attributes.FilterCommand; import org.eclipse.jgit.attributes.FilterCommandFactory; import org.eclipse.jgit.attributes.FilterCommandRegistry; -- cgit v1.2.3 From e6217e2fe60c3c36bd14feeb2aae14e9019170c6 Mon Sep 17 00:00:00 2001 From: "jackdt@google.com" Date: Wed, 15 May 2024 14:41:57 -0700 Subject: Do not use ArrayList when there will be deletions In https://gerrithub.io/c/eclipse-jgit/jgit/+/1194015, LinkedList was replaced with ArrayList in DfsReader and WalkFetchConnection. In this case, the Iterator.remove() method of List is called, which is an O(n) operation for ArrayList. This results in an O(n^2) algorithm. Instead of reverting to LinkedList, use a HashSet and LinkedHashmap instead. This maintains O(1) removal, and is less likely to be treated as an antipattern than LinkedList. A likely innocuous usage of Iterator.remove() in UnionInputStream was also fixed. Change-Id: I57d884440c726b2fc80c1b8b2bec9bd7e2e6e3fe --- .../jgit/internal/storage/dfs/DfsReader.java | 14 ++++----- .../jgit/transport/WalkFetchConnection.java | 36 ++++++++++++---------- .../org/eclipse/jgit/util/io/UnionInputStream.java | 7 ++--- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java index c939114f5f..9cfcbaa5f7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java @@ -307,7 +307,7 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs { private Iterable> findAll( Iterable objectIds) throws IOException { - Collection pending = new ArrayList<>(); + HashSet pending = new HashSet<>(); for (T id : objectIds) { pending.add(id); } @@ -327,22 +327,21 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs { } private void findAllImpl(PackList packList, - Collection pending, List> r) { + HashSet pending, List> r) { DfsPackFile[] packs = packList.packs; if (packs.length == 0) { return; } int lastIdx = 0; DfsPackFile lastPack = packs[lastIdx]; - - OBJECT_SCAN: for (Iterator it = pending.iterator(); it.hasNext();) { - T t = it.next(); + HashSet toRemove = new HashSet<>(); + OBJECT_SCAN: for (T t : pending) { if (!skipGarbagePack(lastPack)) { try { long p = lastPack.findOffset(this, t); if (0 < p) { r.add(new FoundObject<>(t, lastIdx, lastPack, p)); - it.remove(); + toRemove.add(t); continue; } } catch (IOException e) { @@ -360,7 +359,7 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs { long p = pack.findOffset(this, t); if (0 < p) { r.add(new FoundObject<>(t, i, pack, p)); - it.remove(); + toRemove.add(t); lastIdx = i; lastPack = pack; continue OBJECT_SCAN; @@ -370,6 +369,7 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs { } } } + pending.removeAll(toRemove); last = lastPack; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java index 3da76f38fa..ea789b1c09 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java @@ -22,8 +22,10 @@ import java.util.Collection; import java.util.Deque; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.eclipse.jgit.errors.CompoundException; @@ -122,7 +124,7 @@ class WalkFetchConnection extends BaseFetchConnection { private final Deque noAlternatesYet; /** Packs we have discovered, but have not yet fetched locally. */ - private final Deque unfetchedPacks; + private final Map unfetchedPacks; /** * Packs whose indexes we have looked at in {@link #unfetchedPacks}. @@ -164,7 +166,7 @@ class WalkFetchConnection extends BaseFetchConnection { remotes = new ArrayList<>(); remotes.add(w); - unfetchedPacks = new ArrayDeque<>(); + unfetchedPacks = new LinkedHashMap<>(); packsConsidered = new HashSet<>(); noPacksYet = new ArrayDeque<>(); @@ -227,7 +229,7 @@ class WalkFetchConnection extends BaseFetchConnection { public void close() { inserter.close(); reader.close(); - for (RemotePack p : unfetchedPacks) { + for (RemotePack p : unfetchedPacks.values()) { if (p.tmpIdx != null) p.tmpIdx.delete(); } @@ -423,7 +425,7 @@ class WalkFetchConnection extends BaseFetchConnection { continue; for (String packName : packNameList) { if (packsConsidered.add(packName)) - unfetchedPacks.add(new RemotePack(wrr, packName)); + unfetchedPacks.put(packName, new RemotePack(wrr, packName)); } if (downloadPackedObject(pm, id)) return; @@ -472,9 +474,12 @@ class WalkFetchConnection extends BaseFetchConnection { // Search for the object in a remote pack whose index we have, // but whose pack we do not yet have. // - final Iterator packItr = unfetchedPacks.iterator(); - while (packItr.hasNext() && !monitor.isCancelled()) { - final RemotePack pack = packItr.next(); + Set toRemove = new HashSet<>(); + for (Entry entry : unfetchedPacks.entrySet()) { + if (monitor.isCancelled()) { + break; + } + final RemotePack pack = entry.getValue(); try { pack.openIndex(monitor); } catch (IOException err) { @@ -484,7 +489,7 @@ class WalkFetchConnection extends BaseFetchConnection { // another source, so don't consider it a failure. // recordError(id, err); - packItr.remove(); + toRemove.add(entry.getKey()); continue; } @@ -535,7 +540,7 @@ class WalkFetchConnection extends BaseFetchConnection { } throw new TransportException(e.getMessage(), e); } - packItr.remove(); + toRemove.add(entry.getKey()); } if (!alreadyHave(id)) { @@ -550,11 +555,9 @@ class WalkFetchConnection extends BaseFetchConnection { // Complete any other objects that we can. // - final Iterator pending = swapFetchQueue(); - while (pending.hasNext()) { - final ObjectId p = pending.next(); + final Deque pending = swapFetchQueue(); + for (ObjectId p : pending) { if (pack.index.hasObject(p)) { - pending.remove(); process(p); } else { workQueue.add(p); @@ -563,11 +566,12 @@ class WalkFetchConnection extends BaseFetchConnection { return true; } + toRemove.forEach(unfetchedPacks::remove); return false; } - private Iterator swapFetchQueue() { - final Iterator r = workQueue.iterator(); + private Deque swapFetchQueue() { + final Deque r = workQueue; workQueue = new ArrayDeque<>(); return r; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/UnionInputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/UnionInputStream.java index c3a1c4e3bb..7e950f6529 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/UnionInputStream.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/UnionInputStream.java @@ -14,7 +14,6 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayDeque; import java.util.Deque; -import java.util.Iterator; /** * An InputStream which reads from one or more InputStreams. @@ -164,14 +163,14 @@ public class UnionInputStream extends InputStream { public void close() throws IOException { IOException err = null; - for (Iterator i = streams.iterator(); i.hasNext();) { + for (InputStream stream : streams) { try { - i.next().close(); + stream.close(); } catch (IOException closeError) { err = closeError; } - i.remove(); } + streams.clear(); if (err != null) throw err; -- cgit v1.2.3 From cac835835d2e7789f2a01c03da83b44185668269 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 16 May 2024 12:28:53 -0700 Subject: WalkFetchConnection: Remove marked packs on all function exits [1] replaces Iterator.remove() with a list of "toRemove" that gets processed when returning at the end. There are two others returns in the function where the list is not processed. Let the method report the broken packages and wrap it so the caller can clean them up in any case. [1] https://review.gerrithub.io/c/eclipse-jgit/jgit/+/1194812 Change-Id: I1ffb7829039f644df03b0b3ea1e5d10408ce19b7 --- .../eclipse/jgit/transport/WalkFetchConnection.java | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java index ea789b1c09..b7bb0cbce3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java @@ -424,8 +424,9 @@ class WalkFetchConnection extends BaseFetchConnection { if (packNameList == null || packNameList.isEmpty()) continue; for (String packName : packNameList) { - if (packsConsidered.add(packName)) + if (packsConsidered.add(packName)) { unfetchedPacks.put(packName, new RemotePack(wrr, packName)); + } } if (downloadPackedObject(pm, id)) return; @@ -468,13 +469,22 @@ class WalkFetchConnection extends BaseFetchConnection { } } + private boolean downloadPackedObject(ProgressMonitor monitor, + AnyObjectId id) throws TransportException { + Set brokenPacks = new HashSet<>(); + try { + return downloadPackedObject(monitor, id, brokenPacks); + } finally { + brokenPacks.forEach(unfetchedPacks::remove); + } + } + @SuppressWarnings("Finally") private boolean downloadPackedObject(final ProgressMonitor monitor, - final AnyObjectId id) throws TransportException { + final AnyObjectId id, Set brokenPacks) throws TransportException { // Search for the object in a remote pack whose index we have, // but whose pack we do not yet have. // - Set toRemove = new HashSet<>(); for (Entry entry : unfetchedPacks.entrySet()) { if (monitor.isCancelled()) { break; @@ -489,7 +499,7 @@ class WalkFetchConnection extends BaseFetchConnection { // another source, so don't consider it a failure. // recordError(id, err); - toRemove.add(entry.getKey()); + brokenPacks.add(entry.getKey()); continue; } @@ -540,7 +550,7 @@ class WalkFetchConnection extends BaseFetchConnection { } throw new TransportException(e.getMessage(), e); } - toRemove.add(entry.getKey()); + brokenPacks.add(entry.getKey()); } if (!alreadyHave(id)) { @@ -566,7 +576,6 @@ class WalkFetchConnection extends BaseFetchConnection { return true; } - toRemove.forEach(unfetchedPacks::remove); return false; } -- cgit v1.2.3 From 8164155bf7532e57617c1c487bf25480220b2095 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 20 May 2024 22:55:39 +0200 Subject: Update Apache commons-codec to 1.17.0 Change-Id: Ife807c38cd163a75a70e91610127b01807be2f68 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 6 ++++++ 19 files changed, 42 insertions(+), 36 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 45ac27f45b..323785e035 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -140,8 +140,8 @@ maven_jar( maven_jar( name = "commons-codec", - artifact = "commons-codec:commons-codec:1.16.0", - sha1 = "4e3eb3d79888d76b54e28b350915b5dc3919c9de", + artifact = "commons-codec:commons-codec:1.17.0", + sha1 = "0dbe8eef6e14460e73da07f7b11bf994d6626355", ) maven_jar( 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 a678a012c8..8f32e20b6d 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 eb74dadfbd..6544471933 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 14a34d9307..04df3c6643 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 9552fece0b..8856c91b12 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 9c2b3fabda..827e133d5f 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 03132da42d..c2c3c0bc45 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 5fadc074a9..73179d5763 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 550dfc4231..34171d7cc6 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 f5c2841e3d..8391b0818e 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 a3fd04ca9c..0941379a2a 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 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 3137261e69..97df28e571 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 60258a656e..9491223e84 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 5651cd7b04..33246a04ba 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 71fdd95d34..5d714f1a72 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index da72924ef0..4ec397bc9a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index fb175f7d55..9b1228b45d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -251,7 +251,7 @@ commons-codec commons-codec - 1.16.0 + 1.17.0 jar 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 b713065d1f..36f995d809 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 @@ -10,7 +10,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.16.0" + version = "1.17.0" } dependency { groupId = "org.apache.commons" diff --git a/pom.xml b/pom.xml index ac6daf5e25..a54dff38f1 100644 --- a/pom.xml +++ b/pom.xml @@ -883,6 +883,12 @@ ${ant-version} + + commons-codec + commons-codec + 1.17.0 + + org.apache.commons commons-compress -- cgit v1.2.3 From 1f8f86e28bacb08e8ba5415d6dd09d06947a38f3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 20 May 2024 23:06:06 +0200 Subject: Update Apache commons-io to 2.16.1 Change-Id: Ia8dec10b4d487611a9cad2268764fa53fcd35c47 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 6 ++++++ 19 files changed, 41 insertions(+), 35 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 323785e035..9b2507db6f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -176,8 +176,8 @@ maven_jar( maven_jar( name = "commons-io", - artifact = "commons-io:commons-io:2.15.1", - sha1 = "f11560da189ab563a5c8e351941415430e9304ea", + artifact = "commons-io:commons-io:2.16.1", + sha1 = "377d592e740dc77124e0901291dbfaa6810a200e", ) maven_jar( 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 8f32e20b6d..8ba2d54904 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 6544471933..ecdcf7321a 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 04df3c6643..58d67ab7a9 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 8856c91b12..8461cae636 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 827e133d5f..22dd0de4a2 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 c2c3c0bc45..daf3286a38 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 73179d5763..023931acf1 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 34171d7cc6..781327dd76 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 8391b0818e..6fb550b550 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 0941379a2a..1d57dc40f9 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 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 97df28e571..f38cabd6fd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 9491223e84..b2c4b799c6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 33246a04ba..a8cedd043a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 5d714f1a72..b8fc44392c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 4ec397bc9a..25ffa418d4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 9b1228b45d..ebfea6bd0f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ commons-io commons-io - 2.15.1 + 2.16.1 jar 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 36f995d809..a1e497f55e 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 @@ -20,7 +20,7 @@ maven apache dependency { groupId = "commons-io" artifactId = "commons-io" - version = "2.15.1" + version = "2.16.1" } dependency { groupId = "commons-logging" diff --git a/pom.xml b/pom.xml index a54dff38f1..230906e9fe 100644 --- a/pom.xml +++ b/pom.xml @@ -895,6 +895,12 @@ ${commons-compress-version} + + org.apache.commons + commons-io + 2.16.1 + + org.tukaani xz -- cgit v1.2.3 From 7b8aab9897315483f1b388672b1d065d61e084d2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 20 May 2024 23:15:36 +0200 Subject: Update jetty to 10.0.21 Change-Id: I1d7bf0fb66d329aad24b512bed082e3f74a5b2a8 --- WORKSPACE | 30 +++++++++++----------- .../org.eclipse.jgit.target/jgit-4.17.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.18.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.19.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.20.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.21.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.22.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.23.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.24.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.25.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.26.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.27.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.28.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.29.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.30.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.31.target | 16 ++++++------ .../org.eclipse.jgit.target/jgit-4.32.target | 16 ++++++------ .../org.eclipse.jgit.target/maven/dependencies.tpd | 14 +++++----- pom.xml | 2 +- 19 files changed, 151 insertions(+), 151 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 9b2507db6f..18d0adc0a8 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -242,55 +242,55 @@ maven_jar( sha1 = "b3add478d4382b78ea20b1671390a858002feb6c", ) -JETTY_VER = "10.0.20" +JETTY_VER = "10.0.21" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER, - sha1 = "e3661d28d5f2e2185fb085ce5560b2969e8f7c1e", - src_sha1 = "23b97219833769e3e69a071abab3811f49077e2e", + sha1 = "6de2f73e1edbd368b14c485597d555d1190e6221", + src_sha1 = "6a82804a625a730a13dfcb9fbd3c9d09016bae92", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "f082f9198038e4781ff4cdf4d32db9f90fa8f38a", - src_sha1 = "a1acb8cb40bd495ba67562cb342f371425dba47b", + sha1 = "fec31c853de43a15a5a75f2e1492e930366d4595", + src_sha1 = "ef7660113cae5cfbf4fb24c6c8d832a74d4fd800", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "66deea078236e21ae9dd7443716b7642766526aa", - src_sha1 = "e2ddea07b6c85dbc7cf078e408f68d69e504b33c", + sha1 = "1e49b8b6d0ce2f8e484e4eec3d8b0a55c4cc599c", + src_sha1 = "a6b18935ddbe227a717bea6343603a8cf2629e0c", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "d76bf933db81e9f530f1e59f1858bceddb7c4a43", - src_sha1 = "5fd939e4e5000ac76eb686e68e978747802c8a5f", + sha1 = "26c21d1d16f2929c8f58f177a246687444217cbe", + src_sha1 = "fa315f1a44b11759c14373c5bafe4014c837d3a6", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "269cea7949f739e41707f3d574782c9f227fe188", - src_sha1 = "1d30687503a0256da23706e1ebf597658d8c0011", + sha1 = "21bb67ceae5fa145ee86ce88a5609c908b880bf8", + src_sha1 = "44afc9e83169cc40b6b13ab49789693da1298860", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "c628108266e75f17dffee34191b74a696fe21746", - src_sha1 = "63c17b20a8ca5c3bc1740bd807ad446f842749b4", + sha1 = "141f604e6ae732bf2c5e7488ddf82697eb7d8b86", + src_sha1 = "91da8bf1f086a98dbb11c8ef63f79dd9f0f66c33", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "049dcc0ad4190786e17389b257195fe936ed3d27", - src_sha1 = "b012c053d25d902cc64a5c4432a8eedab3241d94", + sha1 = "8bc368c8619dee1e30de0ca57189569ba17bd86e", + src_sha1 = "17c7eb1571d944cee942d43d160cb6547afa6e07", ) BOUNCYCASTLE_VER = "1.78.1" 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 8ba2d54904..4c762ac08c 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 ecdcf7321a..343fd51d6d 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 58d67ab7a9..ab8b1f3155 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 8461cae636..0843d2abc1 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 22dd0de4a2..2b14abbdbb 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 daf3286a38..37c0cb00fe 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 023931acf1..c22556562a 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 781327dd76..d9a925943b 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 6fb550b550..3653905d92 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 1d57dc40f9..8e1d5c6992 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 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index f38cabd6fd..578b687d7c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index b2c4b799c6..e0a0f4f58f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index a8cedd043a..155bab4ae7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index b8fc44392c..6b1553bd5b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 25ffa418d4..3a9f51337f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index ebfea6bd0f..29a9c6af27 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -105,43 +105,43 @@ org.eclipse.jetty jetty-http - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-io - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-security - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-server - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-servlet - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util - 10.0.20 + 10.0.21 jar org.eclipse.jetty jetty-util-ajax - 10.0.20 + 10.0.21 jar 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 a1e497f55e..e79e220b66 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 @@ -149,37 +149,37 @@ maven jetty dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "10.0.20" + version = "10.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "10.0.20" + version = "10.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "10.0.20" + version = "10.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "10.0.20" + version = "10.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-servlet" - version = "10.0.20" + version = "10.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "10.0.20" + version = "10.0.21" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "10.0.20" + version = "10.0.21" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 230906e9fe..2097d8513c 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.26.1 6.0.0 4.0.4 - 10.0.20 + 10.0.21 0.18.5 4.5.14 4.4.16 -- cgit v1.2.3 From 7a74abd6be8db8e72dd96d6908d29cc1b6dd3072 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 20 May 2024 23:25:23 +0200 Subject: Update Apache commons-logging to 1.3.2 Stop bundling the source bundle since the upstream artifact doesn't have a valid OSGi manifest. Change-Id: I819685f7f6d6ebcf8f179dd3133e7fc809bba392 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml | 3 --- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 6 ++++++ 20 files changed, 41 insertions(+), 38 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 18d0adc0a8..bd9630104f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -146,8 +146,8 @@ maven_jar( maven_jar( name = "commons-logging", - artifact = "commons-logging:commons-logging:1.2", - sha1 = "4bfc12adfe4842bf07b657f0369c4cb522955686", + artifact = "commons-logging:commons-logging:1.3.2", + sha1 = "3dc966156ef19d23c839715165435e582fafa753", ) maven_jar( 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 e0c790ad90..2c8baf8fb7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -150,9 +150,6 @@ - - - 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 4c762ac08c..019b848550 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 343fd51d6d..67962a6558 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 ab8b1f3155..5ecd12587b 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 0843d2abc1..91575abd21 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 2b14abbdbb..80c04ce187 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 37c0cb00fe..c2ef243a53 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 c22556562a..d444f0500c 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 d9a925943b..c85fa3dbee 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 3653905d92..c47627ef68 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 8e1d5c6992..ba52d1931d 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 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 578b687d7c..2b5790de7e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index e0a0f4f58f..7f6a4bb545 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 155bab4ae7..4641128f53 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 6b1553bd5b..700b102b56 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 3a9f51337f..a4c513ec70 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 29a9c6af27..1295ea4aca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ commons-logging commons-logging - 1.2 + 1.3.2 jar 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 e79e220b66..842b402efb 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 @@ -25,7 +25,7 @@ maven apache dependency { groupId = "commons-logging" artifactId = "commons-logging" - version = "1.2" + version = "1.3.2" } } diff --git a/pom.xml b/pom.xml index 2097d8513c..d5b65df4e9 100644 --- a/pom.xml +++ b/pom.xml @@ -901,6 +901,12 @@ 2.16.1 + + commons-logging + commons-logging + 1.3.2 + + org.tukaani xz -- cgit v1.2.3 From 71613519e9f9fb2c93bcd43c85fb1aae2cbf34e1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 22 May 2024 00:37:41 +0200 Subject: JGit v6.10.0.202405212237-m3 Signed-off-by: Matthias Sohn Change-Id: I4efb1066ee4146d0455c39cc07879533b8933e43 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0764c3a359..cc6d2acda5 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c54674f6e4..66f0fee493 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 652eccba22..604625ec25 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index c3696a18a7..8d2825e4f7 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index c14399f745..f4283bb21c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 29ab7c55c8..f3e33521e5 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index d36377cac5..feb20f85de 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index ee63876fff..aa2e6565f2 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 9bbca2d77a..9deb661f61 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 79239895db..f4c12fb25d 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.ant - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.archive - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.ui - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.test - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 062e5f627d..fe4c26535d 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 5742531918..3dafa621d1 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 046f048915..4d9bda2a3d 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index cbcedbc82d..e546c458c8 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index ab949bb495..4926eb7362 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index ff54a69f51..04a88a3a2a 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 3281442764..8dc7b2b58e 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index cfd37159e3..a485fe6193 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index f499589dde..78edbd0ded 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="6.10.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 4678ba611b..ce1ee3ce86 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f975d2291d..ca3c40fe7b 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 869636a705..fb791fbf16 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 60ab313b1c..e3fe35ea42 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3ddb4a2832..3eb0413121 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 1382dc9e19..8a14332f18 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index a4d12b4e7f..ab36b36da7 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 3e06edfbc2..775c7e3d7e 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 873a1e5105..09f624696e 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index e35c0aff70..fb2d6b0227 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 7a769a953d..10deb7761c 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 41ac89179a..ba01cb9628 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index e4e18bf825..a7dc7f4aba 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index dfe6cefa01..56a29738fd 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 437c408e6c..25db8c858b 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index f42f57e396..1059d8f4a4 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="6.10.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 71a4093e5d..b7f8c70ff8 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 5f7078596a..0460934675 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 8b12a66259..d671594cfa 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 120d585157..dde5f3b157 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 783f67f691..0b34458c94 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="6.10.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index c234b0864e..96e5b55404 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index f8f163aea8..9e00da9bed 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index edec6b1483..d83bb4b348 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 2e3e022529..15536cdfbd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index cbc0383058..536e1fe39f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 82db456698..ffb30fbbaa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 4549184e99..957264fda4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 13df92806a..53bc809b07 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 7ef53cdaef..5efcb7ff93 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index b2455d05da..1306bc639b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2e84dabc70..35aceb4267 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 201b929cc5..974324b06f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 95e80275fd..18a01866ab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 611d9e4181..b4dde5a7c8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 4420c81766..da63811a0d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index ee422f611c..1aefbaabe5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 892f296e73..c41a4ccaf9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 4bd107b3d1..a12bde63cd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 308c1a0bc8..d7ec095586 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index d530e320b0..501e9e8eb5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 45367f4a0b..37bd0d3311 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index f0b3ed7111..006e3277f6 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index eda89863c0..cfda5ad6bb 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index df1468014d..e09adebdc2 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index fccebb5ef7..d7b53cdd01 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 36af740f71..f57198fa63 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 11d1110124..cd417e6e89 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index f3c02e7268..808ecf169a 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 348faaacbd..704376b97a 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 49e0c106fa..d33058b961 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 67c530b2fe..fbe2e5fa0a 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index eb471d121c..3e69edb3cd 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 50a77bdbce..bcd0f7a7c4 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 32945af87e..18065ce2ff 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e8c2b90a7e..9f64fc82c2 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 21ad14a6d9..916b1b9eee 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 5f4ced811b..7175281ff7 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 78b3f9bd29..7e222a1f3e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 421ae5d50e..58d218b1d5 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index ebc2b32312..f0c23574b6 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index d399b6db86..e7be9b87e0 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b418f9e949..16087c21a7 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 5f8ba7fc43..3f89a3ae2b 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.awtui;version="6.10.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 7b35c74b0c..8cbe95f52a 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 4331e6de91..6f3a77833d 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index e897b24d0f..9446125e76 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405212237-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index d8a9a84cd0..560ed4adef 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405212237-m3 +Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202405212237-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index fef9b57b32..66046083d9 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index d5b65df4e9..cb53cd1144 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.0-SNAPSHOT + 6.10.0.202405212237-m3 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 2c38c2a0eff97926632e5f6e37f6da4f846318a0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 22 May 2024 01:41:44 +0200 Subject: Prepare 6.10.0-SNAPSHOT builds Change-Id: I5b6d5c23d504fac386ae04c42b735152fbbcd7ae --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index cc6d2acda5..0764c3a359 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 66f0fee493..c54674f6e4 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 604625ec25..652eccba22 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 8d2825e4f7..c3696a18a7 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index f4283bb21c..c14399f745 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index f3e33521e5..29ab7c55c8 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index feb20f85de..d36377cac5 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index aa2e6565f2..ee63876fff 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 9deb661f61..9bbca2d77a 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index f4c12fb25d..79239895db 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index fe4c26535d..062e5f627d 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 3dafa621d1..5742531918 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 4d9bda2a3d..046f048915 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index e546c458c8..cbcedbc82d 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 4926eb7362..ab949bb495 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 04a88a3a2a..ff54a69f51 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 8dc7b2b58e..3281442764 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index a485fe6193..cfd37159e3 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 78edbd0ded..f499589dde 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="6.10.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index ce1ee3ce86..4678ba611b 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index ca3c40fe7b..f975d2291d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index fb791fbf16..869636a705 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index e3fe35ea42..60ab313b1c 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3eb0413121..3ddb4a2832 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 8a14332f18..1382dc9e19 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ab36b36da7..a4d12b4e7f 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 775c7e3d7e..3e06edfbc2 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 09f624696e..873a1e5105 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index fb2d6b0227..e35c0aff70 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 10deb7761c..7a769a953d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index ba01cb9628..41ac89179a 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index a7dc7f4aba..e4e18bf825 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 56a29738fd..dfe6cefa01 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 25db8c858b..437c408e6c 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 1059d8f4a4..f42f57e396 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="6.10.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index b7f8c70ff8..71a4093e5d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 0460934675..5f7078596a 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index d671594cfa..8b12a66259 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index dde5f3b157..120d585157 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 0b34458c94..783f67f691 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="6.10.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 96e5b55404..c234b0864e 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 9e00da9bed..f8f163aea8 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index d83bb4b348..edec6b1483 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 15536cdfbd..2e3e022529 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 536e1fe39f..cbc0383058 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index ffb30fbbaa..82db456698 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 957264fda4..4549184e99 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 53bc809b07..13df92806a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 5efcb7ff93..7ef53cdaef 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 1306bc639b..b2455d05da 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 35aceb4267..2e84dabc70 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 974324b06f..201b929cc5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 18a01866ab..95e80275fd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index b4dde5a7c8..611d9e4181 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index da63811a0d..4420c81766 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 1aefbaabe5..ee422f611c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index c41a4ccaf9..892f296e73 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index a12bde63cd..4bd107b3d1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index d7ec095586..308c1a0bc8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 501e9e8eb5..d530e320b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 37bd0d3311..45367f4a0b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 006e3277f6..f0b3ed7111 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index cfda5ad6bb..eda89863c0 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index e09adebdc2..df1468014d 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index d7b53cdd01..fccebb5ef7 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index f57198fa63..36af740f71 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index cd417e6e89..11d1110124 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 808ecf169a..f3c02e7268 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 704376b97a..348faaacbd 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index d33058b961..49e0c106fa 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index fbe2e5fa0a..67c530b2fe 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 3e69edb3cd..eb471d121c 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index bcd0f7a7c4..50a77bdbce 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 18065ce2ff..32945af87e 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 9f64fc82c2..e8c2b90a7e 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 916b1b9eee..21ad14a6d9 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 7175281ff7..5f4ced811b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 7e222a1f3e..78b3f9bd29 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 58d218b1d5..421ae5d50e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index f0c23574b6..ebc2b32312 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index e7be9b87e0..d399b6db86 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 16087c21a7..b418f9e949 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 3f89a3ae2b..5f8ba7fc43 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.awtui;version="6.10.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 8cbe95f52a..7b35c74b0c 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 6f3a77833d..4331e6de91 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 9446125e76..e897b24d0f 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.0.202405212237-m3 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 560ed4adef..d8a9a84cd0 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405212237-m3 -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202405212237-m3";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 66046083d9..fef9b57b32 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index cb53cd1144..d5b65df4e9 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.0.202405212237-m3 + 6.10.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 6123c81a33270d71e7258f874e3fbd0913f4623e Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Wed, 22 May 2024 08:46:31 +0200 Subject: Update com.google.code.gson:gson to 2.11.0 Change-Id: Ibbd8e1675e3b8c67af0e13de16c470db108d3a0f --- WORKSPACE | 4 +- .../org.eclipse.jgit.target/jgit-4.17.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.18.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.19.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.20.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.21.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.22.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.23.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.24.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.25.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.26.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.27.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.28.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.29.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.30.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.31.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.32.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 19 files changed, 3444 insertions(+), 3444 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index bd9630104f..ff63273b93 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -238,8 +238,8 @@ maven_jar( maven_jar( name = "gson", - artifact = "com.google.code.gson:gson:2.10.1", - sha1 = "b3add478d4382b78ea20b1671390a858002feb6c", + artifact = "com.google.code.gson:gson:2.11.0", + sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", ) JETTY_VER = "10.0.21" 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 019b848550..4a8d529fdf 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 67962a6558..27e62e6dd9 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 5ecd12587b..27293691e3 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 91575abd21..c424a50913 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 80c04ce187..f92e238e1e 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 c2ef243a53..8548052438 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 d444f0500c..acefe4c014 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 c85fa3dbee..0119c03088 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 c47627ef68..4ad154a0b7 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 ba52d1931d..3bde6a76b0 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 2b5790de7e..96583e020c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 7f6a4bb545..97c1fc1fc7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 4641128f53..bbc473bb2a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 700b102b56..38c222cb6d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index a4c513ec70..75f768aa91 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 1295ea4aca..df8b6b4bde 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.10.1 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.15 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.15 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 842b402efb..0d4db32986 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 @@ -110,7 +110,7 @@ maven gson dependency { groupId = "com.google.code.gson" artifactId = "gson" - version = "2.10.1" + version = "2.11.0" } } diff --git a/pom.xml b/pom.xml index d5b65df4e9..d0d02d5154 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ 4.4.16 1.7.36 3.6.3 - 2.10.1 + 2.11.0 1.78.1 4.8.3.1 3.5.1 -- cgit v1.2.3 From 168cbaa253b8d41e0b07aad52b0f76e2d16fd960 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 22 May 2024 19:13:28 +0200 Subject: Update bytebuddy to 1.14.16 Change-Id: Iaf958d05f31cd03d1f4d7ba64610abdee85bf63d --- WORKSPACE | 6 +- .../org.eclipse.jgit.target/jgit-4.17.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.18.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.19.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.20.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.21.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.22.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.23.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.24.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.25.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.26.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.27.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.28.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.29.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.30.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.31.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.32.target | 430 ++++++++++----------- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 +- pom.xml | 2 +- 19 files changed, 3446 insertions(+), 3446 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index ff63273b93..6df783f541 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -216,18 +216,18 @@ maven_jar( sha1 = "792b270e73aa1cfc28fa135be0b95e69ea451432", ) -BYTE_BUDDY_VERSION = "1.14.15" +BYTE_BUDDY_VERSION = "1.14.16" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "11c9440bc7f9468761e5a82778a05205169d49a9", + sha1 = "e1b9a06e131b7d5b183c8ccc7c29b9e5a8dba077", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "0b4cc9d88d5de562bf75b3a54ab436ad01b3f72d", + sha1 = "4a451ee6484abac3a498df0f3b33ed00a6fced4d", ) maven_jar( 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 4a8d529fdf..c920901795 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 27e62e6dd9..3eb36d3af9 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 27293691e3..b191811aeb 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 c424a50913..e3756f871a 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 f92e238e1e..b4648f84ff 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 8548052438..da452b8c8c 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 acefe4c014..cdf85df280 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 0119c03088..de50268cca 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 4ad154a0b7..1a84179031 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 3bde6a76b0..d14d92b892 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 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 96583e020c..7135a1b557 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 97c1fc1fc7..349f4b9e73 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index bbc473bb2a..d0d0404f21 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 38c222cb6d..b8faec8f2e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 75f768aa91..787d3cc0c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index df8b6b4bde..1a04be9913 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -33,246 +33,246 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.15 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.15 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.25.3 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.1 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.1 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 0d4db32986..38593a49d8 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 @@ -92,12 +92,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.14.15" + version = "1.14.16" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.14.15" + version = "1.14.16" } } diff --git a/pom.xml b/pom.xml index d0d02d5154..c711bde32c 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.25.3 5.14.0 - 1.14.15 + 1.14.16 jacoco -- cgit v1.2.3 From 63c4332b7b2a58297766ffe251dee41946c20fec Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 22 May 2024 23:32:48 +0200 Subject: Update maven-compiler-plugin to 3.13.0 Change-Id: I282498fee64bcfb542a063413b55821efc77302b --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c711bde32c..a9cdc8fe6c 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ 3.3.2 3.2.5 ${maven-surefire-plugin-version} - 3.12.1 + 3.13.0 2.13.0 2.2 3.25.3 -- cgit v1.2.3 From b3cba11513753c66497dc8f267554f587398ec0a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 22 May 2024 23:35:24 +0200 Subject: Update japicmp-maven-plugin to 0.21.2 Change-Id: Ifcab62d1ed7837258c257cac3a862668fe9db923 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a9cdc8fe6c..a360673638 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ 6.0.0 4.0.4 10.0.21 - 0.18.5 + 0.21.2 4.5.14 4.4.16 1.7.36 -- cgit v1.2.3 From cb7d1e0badeffface96c6dab712ef3bf949e7b70 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 22 May 2024 23:37:17 +0200 Subject: Update spotbugs-maven-plugin to 4.8.5.0 Change-Id: Icc7d5840536dd9f4ef4137c8e5ec35f687c3de4a --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a360673638..422bd2d28b 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ 3.6.3 2.11.0 1.78.1 - 4.8.3.1 + 4.8.5.0 3.5.1 3.3.2 3.2.5 -- cgit v1.2.3 From b59e90a1b6f8739fc20650fdc7d89f42a61a350d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:09:04 +0200 Subject: Update git-commit-id-maven-plugin to 8.0.2 Change-Id: I280b649a9d4bcaf829c7949a99c129d107eec822 --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index f0b3ed7111..c44fcc9ccb 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -233,7 +233,7 @@ io.github.git-commit-id git-commit-id-maven-plugin - 7.0.0 + 8.0.2 get-the-git-infos diff --git a/pom.xml b/pom.xml index 422bd2d28b..5eaed5e261 100644 --- a/pom.xml +++ b/pom.xml @@ -623,7 +623,7 @@ io.github.git-commit-id git-commit-id-maven-plugin - 7.0.0 + 8.0.2 get-the-git-infos -- cgit v1.2.3 From 59c9f93c403ec196a231599f805e33aa33f62652 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:11:47 +0200 Subject: Update tycho to 4.0.7 and set minimum maven version to 3.9.0 which is required by tycho 4.0.7. Change-Id: I7ed1bda89c8712a0a1bb47bdf77e4b7f9f66c039 --- org.eclipse.jgit.packaging/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index c44fcc9ccb..e72a039b9a 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -30,7 +30,7 @@ 11 - 4.0.6 + 4.0.7 jgit-4.17 ${git.commit.time} @@ -184,7 +184,7 @@ - 3.6.3 + 3.9.0 -- cgit v1.2.3 From e182a45dfd0fff0c0170ac47962e0014fa73ea57 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:16:26 +0200 Subject: Update maven-artifact-plugin to 3.5.1 Change-Id: I845e101876543a6b5fb197eefa7e73029b9e4809 --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index e72a039b9a..21db8ad1eb 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -410,7 +410,7 @@ org.apache.maven.plugins maven-artifact-plugin - 3.5.0 + 3.5.1 **/*cyclonedx.json true diff --git a/pom.xml b/pom.xml index 5eaed5e261..c1f628e18e 100644 --- a/pom.xml +++ b/pom.xml @@ -372,7 +372,7 @@ org.apache.maven.plugins maven-artifact-plugin - 3.5.0 + 3.5.1 **/*cyclonedx.json true -- cgit v1.2.3 From 20f0ee06d64942aa46af744c6abc3c8d08865a41 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:18:04 +0200 Subject: Update maven-deploy-plugin to 3.1.2 Change-Id: I60d5aae001583671a01a8c38e98e36a7293b34eb --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 21db8ad1eb..3690f6d367 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -395,7 +395,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index c1f628e18e..deee41566f 100644 --- a/pom.xml +++ b/pom.xml @@ -337,7 +337,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins -- cgit v1.2.3 From ff0017b2c8b1b1f8b6dd3e4e2ab6ddf556b7a5e5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:18:46 +0200 Subject: Update maven-install-plugin to 3.1.2 Change-Id: Id322cef408ce9ddac3febc8963794f5958c06d3e --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 3690f6d367..37ced39558 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -400,7 +400,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index deee41566f..900aa0c6a8 100644 --- a/pom.xml +++ b/pom.xml @@ -342,7 +342,7 @@ org.apache.maven.plugins maven-install-plugin - 3.1.1 + 3.1.2 org.apache.maven.plugins -- cgit v1.2.3 From 378efdea65dff99f3aabe08ff9bdd55b41e78aae Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:19:37 +0200 Subject: Update maven-jar-plugin to 3.4.1 Change-Id: I695e424a44cac2119656ceacfbe1a7abb5f4d7b5 --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 37ced39558..123c29914a 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -273,7 +273,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.1 diff --git a/pom.xml b/pom.xml index 900aa0c6a8..29ba794530 100644 --- a/pom.xml +++ b/pom.xml @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.1 -- cgit v1.2.3 From 6fe890bf7fabcd617c75a423aa412f97dbe15ed7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:20:26 +0200 Subject: Update maven-site-plugin to 4.0.0-M14 Change-Id: I0487adb0d3c7fef0841e3fb200d9df78ee27e9e4 --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 123c29914a..a8606e5ea3 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -405,7 +405,7 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M13 + 4.0.0-M14 org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 29ba794530..ea7e30cf87 100644 --- a/pom.xml +++ b/pom.xml @@ -310,7 +310,7 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M13 + 4.0.0-M14 org.apache.maven.wagon -- cgit v1.2.3 From 0499f8f60fd5e54bb039295b65175d001c064ee3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:21:27 +0200 Subject: Update build-helper-maven-plugin to 3.6.0 Change-Id: I3bb8f751c8c7ab630eb8b4eab3e24f354d1a10e7 --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index a8606e5ea3..0056257847 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -386,7 +386,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 maven-clean-plugin diff --git a/pom.xml b/pom.xml index ea7e30cf87..d72f9bf385 100644 --- a/pom.xml +++ b/pom.xml @@ -255,7 +255,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 -- cgit v1.2.3 From 7724b0a70228abd0fb9fefd6d9979b1296f3e371 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:22:20 +0200 Subject: Update cyclonedx-maven-plugin to 2.8.0 Change-Id: If26a3d7f26d3e46bf22a23f590cd289baaaa167f --- org.eclipse.jgit.packaging/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 0056257847..f7631ff7df 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -204,7 +204,7 @@ org.cyclonedx cyclonedx-maven-plugin - 2.7.11 + 2.8.0 library 1.4 diff --git a/pom.xml b/pom.xml index d72f9bf385..8044c1010e 100644 --- a/pom.xml +++ b/pom.xml @@ -367,7 +367,7 @@ org.cyclonedx cyclonedx-maven-plugin - 2.7.10 + 2.8.0 org.apache.maven.plugins -- cgit v1.2.3 From 6cc9e6116889a7949a6cb0cfd4b47d42982164df Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:24:11 +0200 Subject: Update maven-pmd-plugin to 3.22.0 Change-Id: I9013309b218fafec7d1e70c98fb32a683ecc7a0b --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8044c1010e..a7922b586e 100644 --- a/pom.xml +++ b/pom.xml @@ -277,7 +277,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.21.2 + 3.22.0 ${project.build.sourceEncoding} 100 -- cgit v1.2.3 From b7e87c1e5ea9ff0461e34225d14aa1f2ece8e5fe Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:25:12 +0200 Subject: Update maven-shade-plugin to 3.5.3 Change-Id: I71d1fb6c6e7ce8ab121e77ffbc05b14fd47879f1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7922b586e..c3a39b244b 100644 --- a/pom.xml +++ b/pom.xml @@ -214,7 +214,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.5.1 + 3.5.3 -- cgit v1.2.3 From 83a79d39cd50ea58a9629a496d24265c6841ead6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:25:55 +0200 Subject: Update maven-source-plugin to 3.3.1 Change-Id: I420f24086948b28328f7120c1b22f4de33da0e78 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3a39b244b..0dd6ff29cd 100644 --- a/pom.xml +++ b/pom.xml @@ -232,7 +232,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 -- cgit v1.2.3 From 4a6d21cdc7f9acee31bd1e898fda2226a7b326a4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:27:11 +0200 Subject: Update jacoco-maven-plugin to 0.8.12 Change-Id: I5fb1228199159c82d426dcb22aabd39411f381c7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0dd6ff29cd..14118e4bca 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 org.apache.maven.plugins -- cgit v1.2.3 From 376f662454a7b2e7bdda4ec38d94355337ee6b76 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 24 May 2024 00:30:02 +0200 Subject: Update spring-boot-maven-plugin to 2.7.18 Change-Id: I075ae7fa40e6c883897c8a7ec5ce422b4e808ef6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 14118e4bca..42b2a79ff0 100644 --- a/pom.xml +++ b/pom.xml @@ -357,7 +357,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.7.13 + 2.7.18 org.eclipse.dash -- cgit v1.2.3 From ab6efc8831bf98aae5656034e29ecc3ef5e6842d Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 25 May 2024 17:03:34 +0200 Subject: Remove version override of commons-codec Since commit 8164155b the commons-codec version is pinned in the parent POM's dependency management. Remove the version specification in org.eclipse.jgit/pom.xml. Also give the package-import in the MANIFEST.MF an upper bound. Change-Id: I2785a87cf77d6df110f57a0cb939dbc9772b8ee6 Signed-off-by: Thomas Wolf --- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/pom.xml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index e897b24d0f..7dcf81e68f 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -240,7 +240,7 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, javax.management, javax.net.ssl, - org.apache.commons.codec.digest;version="1.15.0", + org.apache.commons.codec.digest;version="[1.15.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)", org.xml.sax, org.xml.sax.helpers diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index fef9b57b32..8b8dc333e7 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -49,7 +49,6 @@ commons-codec commons-codec - 1.16.0 -- cgit v1.2.3 From 4a6d04b25b211faf6498ce8ae9ee034be3566dc7 Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Fri, 24 May 2024 17:41:55 +0200 Subject: Update org.apache.commons:commons-compress to 1.26.2 commons-compress 1.26.0 added commons-lang3 as a transitive dependency. Hence add it to the target platform, p2 repository and bazel build. Change-Id: Iac5ca095d3e93176e21364a66a29c5e533168e16 --- WORKSPACE | 10 ++++++++-- lib/BUILD | 10 ++++++++++ org.eclipse.jgit.archive/BUILD | 1 + .../org.eclipse.jgit.repository/category.xml | 6 ++++++ .../org.eclipse.jgit.target/jgit-4.17.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.18.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.19.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.20.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.21.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.22.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.23.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.24.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.25.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.26.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.27.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.28.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.29.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.30.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.31.target | 10 ++++++++-- .../org.eclipse.jgit.target/jgit-4.32.target | 10 ++++++++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 7 ++++++- pom.xml | 2 +- 22 files changed, 160 insertions(+), 36 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6df783f541..dcd71bb875 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -170,8 +170,14 @@ maven_jar( maven_jar( name = "commons-compress", - artifact = "org.apache.commons:commons-compress:1.26.1", - sha1 = "44331c1130c370e726a2e1a3e6fba6d2558ef04a", + artifact = "org.apache.commons:commons-compress:1.26.2", + sha1 = "eb1f823447af685208e684fce84783b43517960c", +) + +maven_jar( + name = "commons-lang3", + artifact = "org.apache.commons:commons-lang3:3.14.0", + sha1 = "1ed471194b02f2c6cb734a0cd6f6f107c673afae", ) maven_jar( diff --git a/lib/BUILD b/lib/BUILD index 8806217577..8918df8e2b 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -19,6 +19,16 @@ java_library( exports = ["@commons-compress//jar"], ) +java_library( + name = "commons-lang3", + visibility = [ + "//org.eclipse.jgit.archive:__pkg__", + "//org.eclipse.jgit.pgm.test:__pkg__", + "//org.eclipse.jgit.test:__pkg__", + ], + exports = ["@commons-lang3//jar"], +) + java_library( name = "commons-io", visibility = [ diff --git a/org.eclipse.jgit.archive/BUILD b/org.eclipse.jgit.archive/BUILD index 3d7dbd21f1..d4f53405d7 100644 --- a/org.eclipse.jgit.archive/BUILD +++ b/org.eclipse.jgit.archive/BUILD @@ -12,6 +12,7 @@ java_library( resources = glob(["resources/**"]), deps = [ "//lib:commons-compress", + "//lib:commons-lang3", # We want these deps to be provided_deps "//org.eclipse.jgit:jgit", ], 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 2c8baf8fb7..bf24cb8f2b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -147,6 +147,12 @@ + + + + + + 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 c920901795..1944e79bd9 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 3eb36d3af9..f1cc73b4ca 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 b191811aeb..f5a5ab797f 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 e3756f871a..2015ee470f 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 b4648f84ff..95eb0571c5 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 da452b8c8c..299a84e8f5 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 cdf85df280..1c98f1466e 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 de50268cca..b36ccdc703 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 1a84179031..89c71dccf2 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 d14d92b892..c2583c90b4 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 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 7135a1b557..c211f30cb7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 349f4b9e73..1293b768e8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index d0d0404f21..19c9768371 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index b8faec8f2e..6f4f7b1203 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 787d3cc0c9..1eb0d69141 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 1a04be9913..00a5b2afb8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,13 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 jar 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 38593a49d8..3735c6122c 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 @@ -15,7 +15,12 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-compress" - version = "1.26.1" + version = "1.26.2" + } + dependency { + groupId = "org.apache.commons" + artifactId = "commons-lang3" + version = "3.14.0" } dependency { groupId = "commons-io" diff --git a/pom.xml b/pom.xml index 42b2a79ff0..e95ee66072 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 4.13.2 1C 2.37 - 1.26.1 + 1.26.2 6.0.0 4.0.4 10.0.21 -- cgit v1.2.3 From f5f33be8ca9b49c506d6f0ea296b65c5d649aaa4 Mon Sep 17 00:00:00 2001 From: Patrick Hiesel Date: Mon, 27 May 2024 10:16:34 +0200 Subject: PatchApplier: Add test for conflict markers on a deleted file For deleted files, we want to keep erroring out even if conflicts are allowed for the apply patch logic. The resulting file would otherwise only consist of the patch. Change-Id: I18defa627ad2223a3a917d2b0ee4189396732533 --- .../org/eclipse/jgit/diff/allowconflict_file_deleted.patch | 10 ++++++++++ .../tst/org/eclipse/jgit/patch/PatchApplierTest.java | 10 ++++++++++ 2 files changed, 20 insertions(+) create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_file_deleted.patch diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_file_deleted.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_file_deleted.patch new file mode 100644 index 0000000000..c9655a5e6b --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/allowconflict_file_deleted.patch @@ -0,0 +1,10 @@ +diff --git a/allowconflict_file_deleted b/allowconflict_file_deleted +index 0000000..de98044 +--- a/allowconflict_file_deleted ++++ b/allowconflict_file_deleted +@@ -3,4 +3,4 @@ + line3 +-lineA ++lineB + line5 + line6 diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java index 2e529b5e93..8f3478db18 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java @@ -395,6 +395,16 @@ public class PatchApplierTest { verifyChange(result, "ConflictOutOfBounds", true, 1); } + @Test + public void testConflictMarkersFileDeleted() throws Exception { + init("allowconflict_file_deleted", false, false); + + Result result = applyPatchAllowConflicts(); + + assertEquals(1, result.getErrors().size()); + assertEquals(0, result.getPaths().size()); + } + @Test public void testShiftUp() throws Exception { init("ShiftUp"); -- cgit v1.2.3 From c0c59ccf2d320c1d50f3ad949e5369ae167b8fb5 Mon Sep 17 00:00:00 2001 From: Patrick Hiesel Date: Mon, 27 May 2024 16:11:40 +0200 Subject: PatchApplier: Set a boolean on the result if conflict markers were added This will let callers show a different error message or mark the state as conflicting. Change-Id: Id8eea614b6b8d54c62b49ffbac90599e6f4c5efa --- .../org/eclipse/jgit/patch/PatchApplierTest.java | 4 +-- .../src/org/eclipse/jgit/patch/PatchApplier.java | 37 ++++++++++++++++++---- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java index 8f3478db18..eec403a976 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java @@ -376,7 +376,7 @@ public class PatchApplierTest { error.hh = null; // We don't assert the hunk header as it is a // complex object with lots of internal state. assertEquals(error, new PatchApplier.Result.Error( - "cannot apply hunk", "allowconflict", null)); + "cannot apply hunk", "allowconflict", null, true)); verifyChange(result, "allowconflict", true, 1); } @@ -391,7 +391,7 @@ public class PatchApplierTest { error.hh = null; // We don't assert the hunk header as it is a // complex object with lots of internal state. assertEquals(error, new PatchApplier.Result.Error( - "cannot apply hunk", "ConflictOutOfBounds", null)); + "cannot apply hunk", "ConflictOutOfBounds", null, true)); verifyChange(result, "ConflictOutOfBounds", true, 1); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java index 84c2ec43dc..1a98d79f99 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java @@ -184,10 +184,27 @@ public class PatchApplier { @Nullable HunkHeader hh; - Error(String msg, String oldFileName, @Nullable HunkHeader hh) { + final boolean isGitConflict; + + Error(String msg, String oldFileName, @Nullable HunkHeader hh, + boolean isGitConflict) { this.msg = msg; this.oldFileName = oldFileName; this.hh = hh; + this.isGitConflict = isGitConflict; + } + + /** + * Signals if as part of encountering this error, conflict markers + * were added to the file. + * + * @return {@code true} if conflict markers were added for this + * error. + * + * @since 6.10 + */ + public boolean isGitConflict() { + return isGitConflict; } @Override @@ -213,12 +230,14 @@ public class PatchApplier { Error error = (Error) o; return Objects.equals(msg, error.msg) && Objects.equals(oldFileName, error.oldFileName) - && Objects.equals(hh, error.hh); + && Objects.equals(hh, error.hh) + && isGitConflict == error.isGitConflict; } @Override public int hashCode() { - return Objects.hash(msg, oldFileName, hh); + return Objects.hash(msg, oldFileName, hh, + Boolean.valueOf(isGitConflict)); } } @@ -257,8 +276,14 @@ public class PatchApplier { return errors; } - private void addError(String msg,String oldFileName, @Nullable HunkHeader hh) { - errors.add(new Error(msg, oldFileName, hh)); + private void addError(String msg, String oldFileName, + @Nullable HunkHeader hh) { + errors.add(new Error(msg, oldFileName, hh, false)); + } + + private void addErrorWithGitConflict(String msg, String oldFileName, + @Nullable HunkHeader hh) { + errors.add(new Error(msg, oldFileName, hh, true)); } } @@ -1020,7 +1045,7 @@ public class PatchApplier { // only works if the pre-image SHA is contained in the repo. // If that was the case, cherry-picking the original commit // should be preferred to apply a patch. - result.addError("cannot apply hunk", fh.getOldPath(), hh); //$NON-NLS-1$ + result.addErrorWithGitConflict("cannot apply hunk", fh.getOldPath(), hh); //$NON-NLS-1$ newLines.add(Math.min(applyAt++, newLines.size()), asBytes("<<<<<<< HEAD")); //$NON-NLS-1$ applyAt += hh.getOldImage().lineCount; -- cgit v1.2.3 From a7cf56796dddceb0b35fe471ff96453aba58080e Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Mon, 27 May 2024 17:49:07 +0200 Subject: Update to org.assertj:assertj-core:3.26.0 Change-Id: I3f0131cd168ba9c814341416198f955a6d5b340f --- WORKSPACE | 4 +- .../org.eclipse.jgit.target/jgit-4.17.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.18.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.19.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.20.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.21.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.22.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.23.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.24.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.25.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.26.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.27.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.28.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.29.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.30.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.31.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.32.target | 442 ++++++++++----------- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 19 files changed, 3540 insertions(+), 3540 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index dcd71bb875..bceb668576 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -218,8 +218,8 @@ maven_jar( maven_jar( name = "assertj-core", - artifact = "org.assertj:assertj-core:3.25.3", - sha1 = "792b270e73aa1cfc28fa135be0b95e69ea451432", + artifact = "org.assertj:assertj-core:3.26.0", + sha1 = "fc4a3d051da838946f9dffe725efbd06cd7d1eec", ) BYTE_BUDDY_VERSION = "1.14.16" 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 1944e79bd9..357a5158f6 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 f1cc73b4ca..4164742e6d 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 f5a5ab797f..c3f24679a9 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 2015ee470f..7412a7d5ff 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 95eb0571c5..c4144d65cb 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 299a84e8f5..b3625fa0d8 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 1c98f1466e..6f1e2ede1c 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 b36ccdc703..db79a5abe9 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 89c71dccf2..3d164c0ed8 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 c2583c90b4..63fe49222d 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 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index c211f30cb7..ee8b3d7bdd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 1293b768e8..ee4845d006 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 19c9768371..5cb731e771 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 6f4f7b1203..488373d3e2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 1eb0d69141..5bbcd3ce97 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 00a5b2afb8..b0bd4d3f2e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -33,252 +33,252 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.12.1 - jar - - - org.apache.sshd - sshd-sftp - 2.12.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.12.1 + jar + + + org.apache.sshd + sshd-sftp + 2.12.1 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - + + + org.eclipse.jetty + jetty-http + 10.0.21 + jar + + + org.eclipse.jetty + jetty-io + 10.0.21 + jar + + + org.eclipse.jetty + jetty-security + 10.0.21 + jar + + + org.eclipse.jetty + jetty-server + 10.0.21 + jar + + + org.eclipse.jetty + jetty-servlet + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util + 10.0.21 + jar + + + org.eclipse.jetty + jetty-util-ajax + 10.0.21 + jar + + + jakarta.servlet + jakarta.servlet-api + 4.0.4 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.16 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.16 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.25.3 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 3735c6122c..3d47632ffd 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 @@ -56,7 +56,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.25.3" + version = "3.26.0" } } diff --git a/pom.xml b/pom.xml index e95ee66072..3ad1de9c45 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 3.13.0 2.13.0 2.2 - 3.25.3 + 3.26.0 5.14.0 1.14.16 -- cgit v1.2.3 From 76ce6d91a2e07fdfcbfc8df6970c9e98a98e36a0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 27 May 2024 23:02:28 +0200 Subject: Update tycho to 4.0.8 Change-Id: Idc4c95e643ea46c2b2e33f9a60b0477185429588 --- org.eclipse.jgit.packaging/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index f7631ff7df..cffd22285c 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -30,7 +30,7 @@ 11 - 4.0.7 + 4.0.8 jgit-4.17 ${git.commit.time} -- cgit v1.2.3 From 9b2fe85c0279f4d5ac69f07ddcd48566c3555405 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 27 May 2024 18:22:29 +0200 Subject: PatchApplier.Result.Error: mark fields final Fields of an Error instance shouldn't be modifiable after its creation. Adapt tests which were setting hh to null to skip asserting it. Change-Id: I0f55c1d5cd529aa510029054e6f05bd2637d1bca --- .../tst/org/eclipse/jgit/patch/PatchApplierTest.java | 14 ++++++-------- .../src/org/eclipse/jgit/patch/PatchApplier.java | 6 +++--- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java index eec403a976..5507f8572d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/patch/PatchApplierTest.java @@ -373,10 +373,9 @@ public class PatchApplierTest { assertEquals(result.getErrors().size(), 1); PatchApplier.Result.Error error = result.getErrors().get(0); - error.hh = null; // We don't assert the hunk header as it is a - // complex object with lots of internal state. - assertEquals(error, new PatchApplier.Result.Error( - "cannot apply hunk", "allowconflict", null, true)); + assertEquals("cannot apply hunk", error.msg); + assertEquals("allowconflict", error.oldFileName); + assertTrue(error.isGitConflict()); verifyChange(result, "allowconflict", true, 1); } @@ -388,10 +387,9 @@ public class PatchApplierTest { assertEquals(result.getErrors().size(), 1); PatchApplier.Result.Error error = result.getErrors().get(0); - error.hh = null; // We don't assert the hunk header as it is a - // complex object with lots of internal state. - assertEquals(error, new PatchApplier.Result.Error( - "cannot apply hunk", "ConflictOutOfBounds", null, true)); + assertEquals("cannot apply hunk", error.msg); + assertEquals("ConflictOutOfBounds", error.oldFileName); + assertTrue(error.isGitConflict()); verifyChange(result, "ConflictOutOfBounds", true, 1); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java index 1a98d79f99..cb6cc6efa7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java @@ -177,12 +177,12 @@ public class PatchApplier { // TODO(ms): rename this class in next major release @SuppressWarnings("JavaLangClash") public static class Error { - String msg; + final String msg; - String oldFileName; + final String oldFileName; @Nullable - HunkHeader hh; + final HunkHeader hh; final boolean isGitConflict; -- cgit v1.2.3 From a7d3ac9675d34a247b2d2b4440dd68ce23508d8a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 May 2024 00:44:17 +0200 Subject: JGit v6.10.0.202405282244-rc1 Signed-off-by: Matthias Sohn Change-Id: Ia525790e0b4c9011b29768d2b9727cb48b21ba84 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0764c3a359..3b5b685868 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c54674f6e4..b68583287b 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 652eccba22..db7ee8b3ee 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index c3696a18a7..5ae6cab3f6 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index c14399f745..5cfd4a4c93 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 29ab7c55c8..cfb2c1a53b 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index d36377cac5..79c22c21ba 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index ee63876fff..0bc7e4788a 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 9bbca2d77a..8224f0c97b 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 79239895db..2955ade5d6 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.ant - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.archive - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.ui - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.test - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 062e5f627d..b89eb781e8 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 5742531918..2aff5e9cd7 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 046f048915..a063c84384 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index cbcedbc82d..7b5f6dcb13 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index ab949bb495..0b96f87ae9 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index ff54a69f51..27973708e9 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 3281442764..e6e2663de9 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index cfd37159e3..36b83aab31 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index f499589dde..e2c7c02f52 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="6.10.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 4678ba611b..d0ab9b8638 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f975d2291d..2790dcced0 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 869636a705..2b372f4f41 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 60ab313b1c..bef3aa0652 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3ddb4a2832..e9a48a9c22 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 1382dc9e19..c3bbc005a4 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index a4d12b4e7f..46a8605133 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 3e06edfbc2..8f1367576b 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 873a1e5105..90e6715f79 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index e35c0aff70..aa4b76a994 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 7a769a953d..246410ab97 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 41ac89179a..b7d24f9995 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index e4e18bf825..ca7a6669ed 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index dfe6cefa01..3b59254c50 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 437c408e6c..e66d15ddcb 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index f42f57e396..4e08b56a2c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="6.10.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 71a4093e5d..74a704ba4c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 5f7078596a..ae21aaec8c 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 8b12a66259..07be0cec1a 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 120d585157..26bf4bbe11 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 783f67f691..c8de5268b1 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="6.10.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index c234b0864e..8c727420c0 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index f8f163aea8..0b384ae8fb 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index edec6b1483..9990aeae8e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 2e3e022529..d717f28285 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index cbc0383058..67556f784d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 82db456698..4b621e5052 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 4549184e99..a90bf677f2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 13df92806a..de7c97d955 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 7ef53cdaef..530dd0f660 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index b2455d05da..ea89003fdd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2e84dabc70..cf6b0a4dc4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 201b929cc5..bbe08ccabc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 95e80275fd..30aad26a8d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 611d9e4181..9536d1d674 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 4420c81766..e2630fb293 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index ee422f611c..6c33353f0f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 892f296e73..fa54f69305 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 4bd107b3d1..ac7b58a69d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 308c1a0bc8..fec2046c13 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index d530e320b0..9e20c178e7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 45367f4a0b..8c5a80c859 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index cffd22285c..c8fa1e8d22 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index eda89863c0..261a1c8fee 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index df1468014d..808987af58 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index fccebb5ef7..ecb9904794 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 36af740f71..5f605c21ec 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 11d1110124..fc57b79c32 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index f3c02e7268..6dfaf138c9 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 348faaacbd..3e0779bfa1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 49e0c106fa..cdcf1fa78b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 67c530b2fe..87937a4178 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index eb471d121c..54ba3f269d 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 50a77bdbce..529eeebd81 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 32945af87e..83dbbb2c0a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e8c2b90a7e..75de349ce0 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 21ad14a6d9..7d3cd74a5f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 5f4ced811b..90cca9ba54 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 78b3f9bd29..40b92dd295 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 421ae5d50e..9a4f5717ca 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index ebc2b32312..acfb9d4670 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index d399b6db86..366457e092 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b418f9e949..6594a394f7 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 5f8ba7fc43..bf365c553b 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.awtui;version="6.10.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 7b35c74b0c..8aa7a8f769 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 4331e6de91..69e407b3f2 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 7dcf81e68f..222a069202 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202405282244-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index d8a9a84cd0..be8fad838f 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202405282244-rc1 +Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202405282244-rc1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 8b8dc333e7..e17cb36a25 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 3ad1de9c45..9f6690be5a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.0-SNAPSHOT + 6.10.0.202405282244-rc1 JGit - Parent ${jgit-url} -- cgit v1.2.3 From c9232e555791e1d52fc96776d3ab477ce9a8e306 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 May 2024 03:00:53 +0200 Subject: Revert "Update tycho to 4.0.8" This reverts commit 76ce6d91a2e07fdfcbfc8df6970c9e98a98e36a0. Change-Id: I1f8df6562304c64b192da11538c02230f0084a43 --- org.eclipse.jgit.packaging/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index c8fa1e8d22..9571108cc8 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -30,7 +30,7 @@ 11 - 4.0.8 + 4.0.7 jgit-4.17 ${git.commit.time} -- cgit v1.2.3 From cbe5788a287960189c3ea66c986887a49287c739 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 May 2024 03:01:38 +0200 Subject: JGit v6.10.0.202405290101-rc1 Signed-off-by: Matthias Sohn Change-Id: Ie3d08213e00fcfe1fc34a39021dd99f27e0abc1f --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 3b5b685868..248d3035e3 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index b68583287b..c325db641c 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index db7ee8b3ee..a3bf3688ae 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 5ae6cab3f6..f7adb62641 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 5cfd4a4c93..d3400be3f1 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index cfb2c1a53b..a67fc35f4f 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 79c22c21ba..e81b0bc7ef 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 0bc7e4788a..e62f4dae60 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 8224f0c97b..ae719e492e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 2955ade5d6..4980ca028c 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.ant - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.archive - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.ui - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.test - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index b89eb781e8..aa31b954f7 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 2aff5e9cd7..945ab6bd07 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index a063c84384..f45926617a 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 7b5f6dcb13..03e68b1139 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 0b96f87ae9..574de0f288 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 27973708e9..61ca1413e3 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index e6e2663de9..d9546fbbd0 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 36b83aab31..24d307a5a0 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index e2c7c02f52..9388277161 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="6.10.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index d0ab9b8638..ea19ced2b1 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 2790dcced0..6564013e50 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 2b372f4f41..7aa6d487b5 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index bef3aa0652..d837aa08b5 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index e9a48a9c22..2ad478591a 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index c3bbc005a4..09e4a56a12 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 46a8605133..7bc62b193b 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 8f1367576b..a996db0cae 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 90e6715f79..35acb9e591 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index aa4b76a994..ef0f14bb72 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 246410ab97..70dd0f80d0 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index b7d24f9995..b09b9f2d14 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index ca7a6669ed..d02a359ccf 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 3b59254c50..763042aa8f 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index e66d15ddcb..2527c6bb34 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 4e08b56a2c..f9f6c4c4f3 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="6.10.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 74a704ba4c..5baa22d0f1 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index ae21aaec8c..7ec57e0d6f 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 07be0cec1a..59cea4ab7b 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 26bf4bbe11..288558f852 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index c8de5268b1..0eae10243f 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="6.10.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 8c727420c0..d3897daf03 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 0b384ae8fb..c68d608584 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 9990aeae8e..93ada41c24 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index d717f28285..36cc474648 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 67556f784d..5234f71fe0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 4b621e5052..74e45f0118 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index a90bf677f2..74574666d4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index de7c97d955..659383d9e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 530dd0f660..24a35037d8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index ea89003fdd..80ee3c3779 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index cf6b0a4dc4..ad8d39675a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index bbe08ccabc..0b8021a97c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 30aad26a8d..e83e8cd39d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 9536d1d674..5eaacd6724 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index e2630fb293..3bf8bc8b05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 6c33353f0f..504760d24c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index fa54f69305..6062904bc7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index ac7b58a69d..f28fce39de 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index fec2046c13..2cb3417e42 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 9e20c178e7..933ead3198 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 8c5a80c859..7c6f9257b1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 9571108cc8..7092d1c6a1 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 261a1c8fee..6cbc282cc3 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 808987af58..fb503f6dc7 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index ecb9904794..b76fea27d1 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 5f605c21ec..c3daf15531 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index fc57b79c32..6ee91d43e5 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 6dfaf138c9..55fc28f61f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 3e0779bfa1..3516962498 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index cdcf1fa78b..ed649f0125 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 87937a4178..26b5f2cc38 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 54ba3f269d..79b53aba97 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 529eeebd81..aa8968c40f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 83dbbb2c0a..6b5ae5a3b9 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 75de349ce0..16da6383d0 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 7d3cd74a5f..4a9b80cdad 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 90cca9ba54..dd68e055a2 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 40b92dd295..50acfa2dea 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 9a4f5717ca..78695e22d6 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index acfb9d4670..2252937527 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 366457e092..afcdfd563c 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 6594a394f7..4ba32c41df 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index bf365c553b..7afc4ffcca 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.awtui;version="6.10.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 8aa7a8f769..862e32d3ef 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 69e407b3f2..21ee00f753 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 222a069202..c39061928b 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.0.202405282244-rc1 +Bundle-Version: 6.10.0.202405290101-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index be8fad838f..ce116f3c6e 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405282244-rc1 -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202405282244-rc1";roots="." +Bundle-Version: 6.10.0.202405290101-rc1 +Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202405290101-rc1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e17cb36a25..3b3128e00a 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 9f6690be5a..44d487f7d7 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.0.202405282244-rc1 + 6.10.0.202405290101-rc1 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 1dd6324d4b4d9596813b18a44e315295f559ea12 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 30 May 2024 10:56:20 -0700 Subject: RepoProject: read the "upstream" attribute of a project The manifest spec [1] defines the "upstream" attribute: "name of the git ref in which a sha1 can be found", when the revision is a sha1. The parser is ignoring it, but RepoCommand could use it to populate the "ref=" field of pinned submodules. Parse the value and store it in the RepoProject. RepoProject is public API and the current constructors are not telescopic, so we cannot just add a new constructor with an extra argument. Use plain getter/setters.j [1] https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.md#Element-project Change-Id: Ia50b85b95bfd3710f9fbda2050be5950dd686941 --- .../eclipse/jgit/gitrepo/ManifestParserTest.java | 39 ++++++++++++++++++++++ .../org/eclipse/jgit/gitrepo/ManifestParser.java | 2 ++ .../src/org/eclipse/jgit/gitrepo/RepoProject.java | 26 +++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java index 20958a812c..76176fe347 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java @@ -11,6 +11,7 @@ package org.eclipse.jgit.gitrepo; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -18,7 +19,9 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URI; import java.util.HashSet; +import java.util.Map; import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -138,6 +141,42 @@ public class ManifestParserTest { .collect(Collectors.toSet())); } + @Test + public void testPinProjectWithUpstream() throws Exception { + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + + ManifestParser parser = new ManifestParser(null, null, "master", + "https://git.google.com/", null, null); + parser.read(new ByteArrayInputStream( + xmlContent.toString().getBytes(UTF_8))); + + Map repos = parser.getProjects().stream().collect( + Collectors.toMap(RepoProject::getName, Function.identity())); + assertEquals(2, repos.size()); + + RepoProject foo = repos.get("pin-with-upstream"); + assertEquals("pin-with-upstream", foo.getName()); + assertEquals("9b2fe85c0279f4d5ac69f07ddcd48566c3555405", + foo.getRevision()); + assertEquals("branchX", foo.getUpstream()); + + RepoProject bar = repos.get("pin-without-upstream"); + assertEquals("pin-without-upstream", bar.getName()); + assertEquals("76ce6d91a2e07fdfcbfc8df6970c9e98a98e36a0", + bar.getRevision()); + assertNull(bar.getUpstream()); + } + void testNormalize(String in, String want) { URI got = ManifestParser.normalizeEmptyPath(URI.create(in)); if (!got.toString().equals(want)) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java index 957b3869f2..7402c760c3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java @@ -176,6 +176,8 @@ public class ManifestParser extends DefaultHandler { attributes.getValue("groups")); currentProject .setRecommendShallow(attributes.getValue("clone-depth")); + currentProject + .setUpstream(attributes.getValue("upstream")); break; case "remote": String alias = attributes.getValue("alias"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index 8deb7386a6..aa1af21d23 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -38,6 +38,7 @@ public class RepoProject implements Comparable { private final Set groups; private final List copyfiles; private final List linkfiles; + private String upstream; private String recommendShallow; private String url; private String defaultRevision; @@ -389,6 +390,31 @@ public class RepoProject implements Comparable { this.linkfiles.clear(); } + /** + * Return the upstream attribute of the project + * + * @return the upstream value if present, null otherwise. + * + * @since 6.10 + */ + public String getUpstream() { + return this.upstream; + } + + /** + * Set the upstream attribute of the project + * + * Name of the git ref in which a sha1 can be found, when the revision is a + * sha1. + * + * @param upstream value of the attribute in the manifest + * + * @since 6.10 + */ + void setUpstream(String upstream) { + this.upstream = upstream; + } + private String getPathWithSlash() { if (path.endsWith("/")) { //$NON-NLS-1$ return path; -- cgit v1.2.3 From 48465f84014904edddcdd48258c67bc19555d4c3 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 30 May 2024 14:04:56 -0700 Subject: RepoCommand: Copy manifest upstream into .gitmodules ref field Project entries in the manifest with a specific sha1 as revision can use the "upstream" field to report the ref pointing to that sha1. This information is very valuable for downstream tools, as they can limit their search for a blob to the relevant ref, but it gets lost in the translation to .gitmodules. Save the value of the upstream field when available/relevant in the ref field of the .gitmodules entry. Change-Id: I14a2395925618d5e6b34be85466e32f5ef8fbf6e --- .../jgit/gitrepo/BareSuperprojectWriterTest.java | 45 +++++++++++ .../org/eclipse/jgit/gitrepo/RepoCommandTest.java | 88 ++++++++++++++++++++++ .../jgit/gitrepo/BareSuperprojectWriter.java | 3 + .../src/org/eclipse/jgit/gitrepo/RepoCommand.java | 1 + 4 files changed, 137 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/BareSuperprojectWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/BareSuperprojectWriterTest.java index c3b93879b2..5065b57840 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/BareSuperprojectWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/BareSuperprojectWriterTest.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.gitrepo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -22,6 +23,7 @@ import java.util.List; import org.eclipse.jgit.gitrepo.BareSuperprojectWriter.BareWriterConfig; import org.eclipse.jgit.gitrepo.RepoCommand.RemoteReader; import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; @@ -67,6 +69,49 @@ public class BareSuperprojectWriterTest extends RepositoryTestCase { } } + @Test + public void write_setGitModulesContents_pinned() throws Exception { + try (Repository bareRepo = createBareRepository()) { + RepoProject pinWithUpstream = new RepoProject("pinWithUpstream", + "path/x", "cbc0fae7e1911d27e1de37d364698dba4411c78b", + "remote", ""); + pinWithUpstream.setUrl("http://example.com/a"); + pinWithUpstream.setUpstream("branchX"); + + RepoProject pinWithoutUpstream = new RepoProject( + "pinWithoutUpstream", "path/y", + "cbc0fae7e1911d27e1de37d364698dba4411c78b", "remote", ""); + pinWithoutUpstream.setUrl("http://example.com/b"); + + RemoteReader mockRemoteReader = mock(RemoteReader.class); + + BareSuperprojectWriter w = new BareSuperprojectWriter(bareRepo, + null, "refs/heads/master", author, mockRemoteReader, + BareWriterConfig.getDefault(), List.of()); + + RevCommit commit = w + .write(Arrays.asList(pinWithUpstream, pinWithoutUpstream)); + + String contents = readContents(bareRepo, commit, ".gitmodules"); + Config cfg = new Config(); + cfg.fromText(contents); + + assertThat(cfg.getString("submodule", "pinWithUpstream", "path"), + is("path/x")); + assertThat(cfg.getString("submodule", "pinWithUpstream", "url"), + is("http://example.com/a")); + assertThat(cfg.getString("submodule", "pinWithUpstream", "ref"), + is("branchX")); + + assertThat(cfg.getString("submodule", "pinWithoutUpstream", "path"), + is("path/y")); + assertThat(cfg.getString("submodule", "pinWithoutUpstream", "url"), + is("http://example.com/b")); + assertThat(cfg.getString("submodule", "pinWithoutUpstream", "ref"), + nullValue()); + } + } + @Test public void write_setExtraContents() throws Exception { try (Repository bareRepo = createBareRepository()) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java index ca6f2e1053..3162e7910b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java @@ -1171,6 +1171,94 @@ public class RepoCommandTest extends RepositoryTestCase { } } + @Test + public void testRecordRemoteBranch_pinned() throws Exception { + Repository remoteDb = createBareRepository(); + Repository tempDb = createWorkRepository(); + + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", + xmlContent.toString()); + + RepoCommand command = new RepoCommand(remoteDb); + command.setPath( + tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") + .setURI(rootUri).setRecordRemoteBranch(true).call(); + // Clone it + File directory = createTempDirectory("testBareRepo"); + try (Repository localDb = Git.cloneRepository().setDirectory(directory) + .setURI(remoteDb.getDirectory().toURI().toString()).call() + .getRepository();) { + // The .gitmodules file should exist + File gitmodules = new File(localDb.getWorkTree(), ".gitmodules"); + assertTrue("The .gitmodules file should exist", + gitmodules.exists()); + FileBasedConfig c = new FileBasedConfig(gitmodules, FS.DETECTED); + c.load(); + assertEquals("Pinned submodule with upstream records the ref", + "branchX", c.getString("submodule", "pin-upstream", "ref")); + assertNull("Pinned submodule without upstream don't have ref", + c.getString("submodule", "pin-noupstream", "ref")); + } + } + + @Test + public void testRecordRemoteBranch_pinned_nameConflict() throws Exception { + Repository remoteDb = createBareRepository(); + Repository tempDb = createWorkRepository(); + + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", + xmlContent.toString()); + + RepoCommand command = new RepoCommand(remoteDb); + command.setPath( + tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") + .setURI(rootUri).setRecordRemoteBranch(true).call(); + // Clone it + File directory = createTempDirectory("testBareRepo"); + try (Repository localDb = Git.cloneRepository().setDirectory(directory) + .setURI(remoteDb.getDirectory().toURI().toString()).call() + .getRepository();) { + // The .gitmodules file should exist + File gitmodules = new File(localDb.getWorkTree(), ".gitmodules"); + assertTrue("The .gitmodules file should exist", + gitmodules.exists()); + FileBasedConfig c = new FileBasedConfig(gitmodules, FS.DETECTED); + c.load(); + assertEquals("Upstream is preserved in name conflict", "branchX", + c.getString("submodule", "pin-upstream/pin-upstream", + "ref")); + assertEquals("Upstream is preserved in name conflict (other side)", + "branchX", c.getString("submodule", + "pin-upstream/pin-upstream-name-conflict", "ref")); + } + } @Test public void testRecordSubmoduleLabels() throws Exception { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java index 3ce97a4ff7..d191e23399 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java @@ -156,6 +156,9 @@ class BareSuperprojectWriter { ObjectId objectId; if (ObjectId.isId(proj.getRevision())) { objectId = ObjectId.fromString(proj.getRevision()); + if (config.recordRemoteBranch && proj.getUpstream() != null) { + cfg.setString("submodule", name, "ref", proj.getUpstream()); + } } else { objectId = callback.sha1(url, proj.getRevision()); if (objectId == null && !config.ignoreRemoteFailures) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index 95c1c8b22e..3aaef387f9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -615,6 +615,7 @@ public class RepoCommand extends GitCommand { p.setUrl(proj.getUrl()); p.addCopyFiles(proj.getCopyFiles()); p.addLinkFiles(proj.getLinkFiles()); + p.setUpstream(proj.getUpstream()); ret.add(p); } } -- cgit v1.2.3 From 37a36201a1999690500e5af7f16fa881a484a0ca Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 31 May 2024 12:12:57 -0700 Subject: CommitGraphWriter: Move path diff calculation to its own class To verify that we have the right paths between commits we are writing the bloom filters, reading them and querying. The path diff calculation is tricky enough for correctness and performance that should be tested on its own. Move the path diff calculation to its own class, so we can test it on its own. This is a noop refactor so we can verify later the steps taken in the walk. Change-Id: Ifbdcb752891c4adb08553802f87287de1155bb7c --- .../storage/commitgraph/CommitGraphWriterTest.java | 24 ++++++++ .../storage/commitgraph/CommitGraphWriter.java | 72 ++++++++++++---------- 2 files changed, 63 insertions(+), 33 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java index 9f65ee2074..7130d59b95 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java @@ -10,6 +10,7 @@ package org.eclipse.jgit.internal.storage.commitgraph; +import static java.util.stream.Collectors.toList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.junit.Assert.assertArrayEquals; @@ -19,8 +20,12 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.HashSet; +import java.util.List; +import java.util.Optional; import java.util.Set; import org.eclipse.jgit.dircache.DirCacheEntry; @@ -413,6 +418,25 @@ public class CommitGraphWriterTest extends RepositoryTestCase { "119,69,63,-8,0,")); } + @Test + public void testPathDiffCalculator_skipUnchangedTree() throws Exception { + RevCommit root = tr.commit(tr.tree( + tr.file("d/sd1/f1", tr.blob("f1")), + tr.file("d/sd2/f2", tr.blob("f2")))); + RevCommit tip = tr.commit(tr.tree( + tr.file("d/sd1/f1", tr.blob("f1")), + tr.file("d/sd2/f2", tr.blob("f2B"))), root); + CommitGraphWriter.PathDiffCalculator c = new CommitGraphWriter.PathDiffCalculator(); + + Optional> byteBuffers = c.changedPaths(walk.getObjectReader(), tip); + + assertTrue(byteBuffers.isPresent()); + List asString = byteBuffers.get().stream() + .map(b -> StandardCharsets.UTF_8.decode(b).toString()) + .collect(toList()); + assertThat(asString, containsInAnyOrder("d", "d/sd2", "d/sd2/f2")); + } + RevCommit commit(RevCommit... parents) throws Exception { return tr.commit(parents); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java index 0d9815eceb..37a0de84c4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java @@ -71,6 +71,9 @@ public class CommitGraphWriter { private static final int MAX_CHANGED_PATHS = 512; + private static final PathDiffCalculator PATH_DIFF_CALCULATOR + = new PathDiffCalculator(); + private final int hashsz; private final GraphCommits graphCommits; @@ -374,37 +377,6 @@ public class CommitGraphWriter { return generations; } - private static Optional> computeBloomFilterPaths( - ObjectReader or, RevCommit cmit) throws MissingObjectException, - IncorrectObjectTypeException, CorruptObjectException, IOException { - HashSet paths = new HashSet<>(); - try (TreeWalk walk = new TreeWalk(null, or)) { - walk.setRecursive(true); - if (cmit.getParentCount() == 0) { - walk.addTree(new EmptyTreeIterator()); - } else { - walk.addTree(cmit.getParent(0).getTree()); - } - walk.addTree(cmit.getTree()); - while (walk.next()) { - if (walk.idEqual(0, 1)) { - continue; - } - byte[] rawPath = walk.getRawPath(); - paths.add(ByteBuffer.wrap(rawPath)); - for (int i = 0; i < rawPath.length; i++) { - if (rawPath[i] == '/') { - paths.add(ByteBuffer.wrap(rawPath, 0, i)); - } - if (paths.size() > MAX_CHANGED_PATHS) { - return Optional.empty(); - } - } - } - } - return Optional.of(paths); - } - private BloomFilterChunks computeBloomFilterChunks(ProgressMonitor monitor) throws MissingObjectException, IncorrectObjectTypeException, CorruptObjectException, IOException { @@ -435,8 +407,8 @@ public class CommitGraphWriter { filtersReused++; } else { filtersComputed++; - Optional> paths = computeBloomFilterPaths( - graphCommits.getObjectReader(), cmit); + Optional> paths = PATH_DIFF_CALCULATOR + .changedPaths(graphCommits.getObjectReader(), cmit); if (paths.isEmpty()) { cpf = ChangedPathFilter.FULL; } else { @@ -473,6 +445,40 @@ public class CommitGraphWriter { } } + // Visible for testing + static class PathDiffCalculator { + Optional> changedPaths( + ObjectReader or, RevCommit cmit) throws MissingObjectException, + IncorrectObjectTypeException, CorruptObjectException, IOException { + HashSet paths = new HashSet<>(); + try (TreeWalk walk = new TreeWalk(null, or)) { + walk.setRecursive(true); + if (cmit.getParentCount() == 0) { + walk.addTree(new EmptyTreeIterator()); + } else { + walk.addTree(cmit.getParent(0).getTree()); + } + walk.addTree(cmit.getTree()); + while (walk.next()) { + if (walk.idEqual(0, 1)) { + continue; + } + byte[] rawPath = walk.getRawPath(); + paths.add(ByteBuffer.wrap(rawPath)); + for (int i = 0; i < rawPath.length; i++) { + if (rawPath[i] == '/') { + paths.add(ByteBuffer.wrap(rawPath, 0, i)); + } + if (paths.size() > MAX_CHANGED_PATHS) { + return Optional.empty(); + } + } + } + } + return Optional.of(paths); + } + } + private static class ChunkHeader { final int id; -- cgit v1.2.3 From 5e8fcfa853d99e036df9c9dc638370e40804fd38 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 31 May 2024 12:20:07 -0700 Subject: CommitGraphWriter: use ANY_DIFF instead of idEquals inside next() Calculating the paths modified in a commit respect its parents is taking undue amount of time in big trees. Use ANY_DIFF filter, instead of #idEquals() inside the #next(). This shorcuts the tree browsing earlier. Change-Id: I318eee3ae817b7b9004d60bdb8d0f1bf19b9962d --- .../internal/storage/commitgraph/CommitGraphWriterTest.java | 2 ++ .../jgit/internal/storage/commitgraph/CommitGraphWriter.java | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java index 7130d59b95..80a0f0cea5 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriterTest.java @@ -435,6 +435,8 @@ public class CommitGraphWriterTest extends RepositoryTestCase { .map(b -> StandardCharsets.UTF_8.decode(b).toString()) .collect(toList()); assertThat(asString, containsInAnyOrder("d", "d/sd2", "d/sd2/f2")); + // We don't walk into d/sd1/f1 + assertEquals(1, c.stepCounter); } RevCommit commit(RevCommit... parents) throws Exception { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java index 37a0de84c4..55539e2a66 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/CommitGraphWriter.java @@ -52,6 +52,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.EmptyTreeIterator; import org.eclipse.jgit.treewalk.TreeWalk; +import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.eclipse.jgit.util.NB; /** @@ -447,12 +448,18 @@ public class CommitGraphWriter { // Visible for testing static class PathDiffCalculator { + + // Walk steps in the last invocation of changedPaths + int stepCounter; + Optional> changedPaths( ObjectReader or, RevCommit cmit) throws MissingObjectException, IncorrectObjectTypeException, CorruptObjectException, IOException { + stepCounter = 0; HashSet paths = new HashSet<>(); try (TreeWalk walk = new TreeWalk(null, or)) { walk.setRecursive(true); + walk.setFilter(TreeFilter.ANY_DIFF); if (cmit.getParentCount() == 0) { walk.addTree(new EmptyTreeIterator()); } else { @@ -460,9 +467,7 @@ public class CommitGraphWriter { } walk.addTree(cmit.getTree()); while (walk.next()) { - if (walk.idEqual(0, 1)) { - continue; - } + stepCounter += 1; byte[] rawPath = walk.getRawPath(); paths.add(ByteBuffer.wrap(rawPath)); for (int i = 0; i < rawPath.length; i++) { -- cgit v1.2.3 From ea0ab1f862d9266a0fca04bbd5e16f3c2a1e2744 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 2 Jun 2024 10:03:19 +0200 Subject: Prepare 6.10.0-SNAPSHOT builds Change-Id: I64f6d6a0599cbab462dca236c00e6f3314b2a810 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 248d3035e3..0764c3a359 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c325db641c..c54674f6e4 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index a3bf3688ae..652eccba22 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index f7adb62641..c3696a18a7 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index d3400be3f1..c14399f745 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index a67fc35f4f..29ab7c55c8 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index e81b0bc7ef..d36377cac5 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index e62f4dae60..ee63876fff 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index ae719e492e..9bbca2d77a 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 4980ca028c..79239895db 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index aa31b954f7..062e5f627d 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 945ab6bd07..5742531918 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index f45926617a..046f048915 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 03e68b1139..cbcedbc82d 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 574de0f288..ab949bb495 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 61ca1413e3..ff54a69f51 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index d9546fbbd0..3281442764 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 24d307a5a0..cfd37159e3 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 9388277161..f499589dde 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="6.10.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index ea19ced2b1..4678ba611b 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 6564013e50..f975d2291d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 7aa6d487b5..869636a705 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index d837aa08b5..60ab313b1c 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 2ad478591a..3ddb4a2832 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 09e4a56a12..1382dc9e19 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 7bc62b193b..a4d12b4e7f 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index a996db0cae..3e06edfbc2 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 35acb9e591..873a1e5105 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index ef0f14bb72..e35c0aff70 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 70dd0f80d0..7a769a953d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index b09b9f2d14..41ac89179a 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index d02a359ccf..e4e18bf825 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 763042aa8f..dfe6cefa01 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 2527c6bb34..437c408e6c 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index f9f6c4c4f3..f42f57e396 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="6.10.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 5baa22d0f1..71a4093e5d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 7ec57e0d6f..5f7078596a 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 59cea4ab7b..8b12a66259 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 288558f852..120d585157 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 0eae10243f..783f67f691 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="6.10.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index d3897daf03..c234b0864e 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index c68d608584..f8f163aea8 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 93ada41c24..edec6b1483 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 36cc474648..2e3e022529 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 5234f71fe0..cbc0383058 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 74e45f0118..82db456698 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 74574666d4..4549184e99 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 659383d9e9..13df92806a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 24a35037d8..7ef53cdaef 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 80ee3c3779..b2455d05da 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index ad8d39675a..2e84dabc70 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 0b8021a97c..201b929cc5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index e83e8cd39d..95e80275fd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 5eaacd6724..611d9e4181 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 3bf8bc8b05..4420c81766 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 504760d24c..ee422f611c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 6062904bc7..892f296e73 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index f28fce39de..4bd107b3d1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 2cb3417e42..308c1a0bc8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 933ead3198..d530e320b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 7c6f9257b1..45367f4a0b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 7092d1c6a1..f7631ff7df 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 6cbc282cc3..eda89863c0 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index fb503f6dc7..df1468014d 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index b76fea27d1..fccebb5ef7 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index c3daf15531..36af740f71 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 6ee91d43e5..11d1110124 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 55fc28f61f..f3c02e7268 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 3516962498..348faaacbd 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index ed649f0125..49e0c106fa 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 26b5f2cc38..67c530b2fe 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 79b53aba97..eb471d121c 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index aa8968c40f..50a77bdbce 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 6b5ae5a3b9..32945af87e 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 16da6383d0..e8c2b90a7e 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 4a9b80cdad..21ad14a6d9 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index dd68e055a2..5f4ced811b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 50acfa2dea..78b3f9bd29 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 78695e22d6..421ae5d50e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 2252937527..ebc2b32312 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index afcdfd563c..d399b6db86 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 4ba32c41df..b418f9e949 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 7afc4ffcca..5f8ba7fc43 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.awtui;version="6.10.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 862e32d3ef..7b35c74b0c 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 21ee00f753..4331e6de91 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index c39061928b..7dcf81e68f 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.0.202405290101-rc1 +Bundle-Version: 6.10.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index ce116f3c6e..d8a9a84cd0 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202405290101-rc1 -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202405290101-rc1";roots="." +Bundle-Version: 6.10.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 3b3128e00a..8b8dc333e7 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 44d487f7d7..3ad1de9c45 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.0.202405290101-rc1 + 6.10.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From d0a2288f4d9567dd97eb4bdda845fe99aa64fd96 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 3 Jun 2024 23:10:25 +0200 Subject: JGit v6.10.0.202406032110-r Signed-off-by: Matthias Sohn Change-Id: I3128b2e4bbbed97adde90f7a47e15175e63e97f5 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0764c3a359..77e4a7f5b4 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c54674f6e4..10486cd7d0 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 652eccba22..6bf15ac732 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index c3696a18a7..54d134aba9 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index c14399f745..f5a7c575d1 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 29ab7c55c8..8171b8888e 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index d36377cac5..1c0bd77cdb 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index ee63876fff..3f5e31c9d9 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 9bbca2d77a..0b3ded2d10 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 79239895db..f89d0aa83d 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.ant - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.archive - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.ui - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.test - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 062e5f627d..b9d610023a 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 5742531918..3291a0a66d 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 046f048915..a19e47e62f 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index cbcedbc82d..00efd33c26 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index ab949bb495..a47ff68896 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index ff54a69f51..3738af9fad 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 3281442764..6f04338427 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index cfd37159e3..2cea9dd834 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index f499589dde..8131441e59 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="6.10.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 4678ba611b..9e60b2a882 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f975d2291d..0260169d7c 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 869636a705..89696b1be0 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 60ab313b1c..dc9dca7355 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3ddb4a2832..129a3a6c89 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 1382dc9e19..acb74c936c 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index a4d12b4e7f..43c7b9e9b1 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 3e06edfbc2..40ff6c8a08 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 873a1e5105..86da755ae9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index e35c0aff70..cf02fd69c2 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 7a769a953d..836870f919 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 41ac89179a..dbde433396 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index e4e18bf825..dad7ebba94 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index dfe6cefa01..c059867c97 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 437c408e6c..1035fac80e 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index f42f57e396..00f42b11ad 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="6.10.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 71a4093e5d..9072f2282c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 5f7078596a..4c5c5db510 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 8b12a66259..e3cb645bd7 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 120d585157..17c056b904 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 783f67f691..5724d312e0 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="6.10.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index c234b0864e..1c261c7d61 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index f8f163aea8..fb5604f2cd 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index edec6b1483..24afd2f94a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 2e3e022529..98c04835b1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index cbc0383058..75166a4248 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 82db456698..d8e2b2ff7e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 4549184e99..1aaef8e3be 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 13df92806a..c7a15b75cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 7ef53cdaef..9e05cf014e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index b2455d05da..9676fbfca6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2e84dabc70..1c0099bb59 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 201b929cc5..8f56d6a7a3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 95e80275fd..9615f39c5f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 611d9e4181..c33853ebbe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 4420c81766..07706a8eb9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index ee422f611c..c95b2ca2cf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 892f296e73..071c5203e2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 4bd107b3d1..df148a64b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 308c1a0bc8..1302671e0a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index d530e320b0..c32472f841 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 45367f4a0b..573676ff05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index f7631ff7df..2a655f70fd 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index eda89863c0..eddf412573 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index df1468014d..ca081639b5 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index fccebb5ef7..e7f13eec4d 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 36af740f71..fa268bdd94 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 11d1110124..16bed5b4c9 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index f3c02e7268..7889204d00 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 348faaacbd..3ea15dfb4c 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 49e0c106fa..98bf0ccfe0 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 67c530b2fe..79d8718679 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index eb471d121c..77f53f23f1 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 50a77bdbce..69160bb96c 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 32945af87e..caf515c2a9 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e8c2b90a7e..4ab09667e7 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 21ad14a6d9..ec076e6ec9 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 5f4ced811b..d7fbb1f583 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 78b3f9bd29..5373a84765 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 421ae5d50e..c22b23e8f3 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index ebc2b32312..0bb6267a01 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index d399b6db86..98bab1a319 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b418f9e949..a44113a897 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 5f8ba7fc43..d0b5aeb207 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.awtui;version="6.10.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 7b35c74b0c..1dc4a2b3ef 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 4331e6de91..20cf69adc2 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 7dcf81e68f..6ecce07c97 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.0.qualifier +Bundle-Version: 6.10.0.202406032110-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index d8a9a84cd0..80e7f87c5b 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.qualifier";roots="." +Bundle-Version: 6.10.0.202406032110-r +Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202406032110-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 8b8dc333e7..c9cbc12097 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 3ad1de9c45..746e475aa5 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.0-SNAPSHOT + 6.10.0.202406032110-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From 23aaf83e8b4fa38640eeb6206e909f23eaba2994 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Jun 2024 00:29:39 +0200 Subject: JGit v6.10.0.202406032230-r Signed-off-by: Matthias Sohn Change-Id: Id188a6cdc2db63c961f0b9338e6ae56d58853dff --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 77e4a7f5b4..0acd8ee01e 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 10486cd7d0..3ace94665f 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 6bf15ac732..5728d28c10 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 54d134aba9..2aff87c697 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index f5a7c575d1..e20b7f4f41 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 8171b8888e..c1ac3c9578 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 1c0bd77cdb..884489c9be 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 3f5e31c9d9..d491c82502 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 0b3ded2d10..99cd0f1530 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index f89d0aa83d..8fb88c79e0 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.ant - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.archive - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.ui - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.test - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.0.202406032110-r + 6.10.0.202406032230-r diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index b9d610023a..2d530c91f3 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 3291a0a66d..98c1a561b8 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index a19e47e62f..38c95ce0d8 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 00efd33c26..7e94068e19 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index a47ff68896..fc46e58041 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 3738af9fad..3724410e04 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 6f04338427..db7130bb6a 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 2cea9dd834..0e13aba0f4 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 8131441e59..d4148eddbf 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="6.10.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 9e60b2a882..72bcf819c2 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 0260169d7c..21997e4e11 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 89696b1be0..ad1994c710 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index dc9dca7355..8a8ffaafb8 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 129a3a6c89..55ed2ebc79 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index acb74c936c..0189abcf4d 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 43c7b9e9b1..8196ba04a0 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 40ff6c8a08..1d153e7859 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 86da755ae9..888d3397ca 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index cf02fd69c2..ac65e524ab 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 836870f919..6e06e4be57 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index dbde433396..f66cfd21b4 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index dad7ebba94..b335ff6640 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index c059867c97..fec7d17543 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 1035fac80e..d9c652ff8c 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 00f42b11ad..1b6f37c5d6 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="6.10.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 9072f2282c..781dd11c15 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 4c5c5db510..b9c951681b 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index e3cb645bd7..f9e4d55130 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 17c056b904..92e278f34a 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 5724d312e0..193d8f9ad7 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="6.10.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 1c261c7d61..0a26318410 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index fb5604f2cd..9901ae33c2 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 24afd2f94a..c0d55a862a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 98c04835b1..1b3d5a4d88 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 75166a4248..e29383aa38 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index d8e2b2ff7e..3039c9fb75 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 1aaef8e3be..b2d1d1d3a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index c7a15b75cb..43ab965b55 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 9e05cf014e..428e5eb0a8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 9676fbfca6..f374de0a11 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 1c0099bb59..ab40781a54 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 8f56d6a7a3..c87b63c377 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 9615f39c5f..dfd2d24597 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index c33853ebbe..63c88f8a94 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 07706a8eb9..e168923f02 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index c95b2ca2cf..764872e2f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 071c5203e2..c6826d502a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.0.202406032110-r + 6.10.0.202406032230-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index df148a64b0..a4a707a23a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 1302671e0a..00f452661f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index c32472f841..2bfb757542 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 573676ff05..5a10b254e6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2a655f70fd..117d995880 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index eddf412573..addf42b35c 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index ca081639b5..7764e17dcb 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index e7f13eec4d..27cd6b3b7e 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index fa268bdd94..ce07d81e5e 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 16bed5b4c9..96a42253c8 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 7889204d00..a046f0e289 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.0,6.11.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 3ea15dfb4c..bc03f5f814 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 98bf0ccfe0..fd8d28b529 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 79d8718679..41c7219fb5 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 77f53f23f1..63d054ffd1 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 69160bb96c..c1b6a4a81b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index caf515c2a9..a1d098c7ba 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 4ab09667e7..08904d0f0b 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index ec076e6ec9..730e859480 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index d7fbb1f583..60766ec41d 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 5373a84765..220f4917f2 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index c22b23e8f3..479d0b248f 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 0bb6267a01..50165ed679 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 98bab1a319..b1c9f0744a 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index a44113a897..fc1caa62f1 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index d0b5aeb207..23cb622b29 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.jgit.awtui;version="6.10.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 1dc4a2b3ef..cb70ccc12c 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 20cf69adc2..de01d97ade 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 6ecce07c97..d63f2f31b9 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.0.202406032110-r +Bundle-Version: 6.10.0.202406032230-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 80e7f87c5b..888385d0ff 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032110-r -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202406032110-r";roots="." +Bundle-Version: 6.10.0.202406032230-r +Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202406032230-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index c9cbc12097..1532b180a1 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032110-r + 6.10.0.202406032230-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 746e475aa5..e6e8cd37ec 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.0.202406032110-r + 6.10.0.202406032230-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From e0ff3986f59f4de87e8e60cde7dcb3058d966ad0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Jun 2024 09:08:00 +0200 Subject: Prepare 6.10.1-SNAPSHOT builds Change-Id: I3384e7405cadf063e7b0dd25468a8651c45628ac --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++---- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 14 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 34 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 ++++----- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 86 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 16 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 118 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 112 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 534 insertions(+), 534 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0acd8ee01e..58526deac9 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.ant.tasks;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 3ace94665f..11cca38244 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 5728d28c10..113896f15d 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)" + org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="6.10.0", - org.eclipse.jgit.ant.tasks;version="6.10.0"; +Export-Package: org.eclipse.jgit.ant;version="6.10.1", + org.eclipse.jgit.ant.tasks;version="6.10.1"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 2aff87c697..2616909676 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index e20b7f4f41..c128eacefd 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index c1ac3c9578..78904fd583 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="6.10.0"; +Export-Package: org.eclipse.jgit.archive;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="6.10.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="6.10.1";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 884489c9be..459e145cd7 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index d491c82502..af5695d9fb 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 99cd0f1530..16b1e2bdf1 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 8fb88c79e0..4c91d2c9ab 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 2d530c91f3..4e3c849c17 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -13,9 +13,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.sha1;version="[6.10.0,6.11.0)", + org.eclipse.jgit.gpg.bc.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.sha1;version="[6.10.1,6.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 98c1a561b8..dbb3dcd3c7 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 38c95ce0d8..514dc1f46d 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.1,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", @@ -28,9 +28,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", - org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", + org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="6.10.0", - org.eclipse.jgit.gpg.bc.internal;version="6.10.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="6.10.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="6.10.1", + org.eclipse.jgit.gpg.bc.internal;version="6.10.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="6.10.1";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 7e94068e19..609aa11eb2 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index fc46e58041..3ff49eda6e 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 3724410e04..87a048aaef 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="6.10.0"; + org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="6.10.1"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index db7130bb6a..040228c154 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 0e13aba0f4..d3919bc164 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index d4148eddbf..d3b4221d2d 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="6.10.0", - org.eclipse.jgit.http.server.glue;version="6.10.0"; +Export-Package: org.eclipse.jgit.http.server;version="6.10.1", + org.eclipse.jgit.http.server.glue;version="6.10.1"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="6.10.0"; + org.eclipse.jgit.http.server.resolver;version="6.10.1"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,14 +18,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.servlet;version="[2.5.0,5.0.0)", javax.servlet.http;version="[2.5.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.transport.parser;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)" + org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.transport.parser;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 72bcf819c2..498a3631ea 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 21997e4e11..dc176f566e 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index ad1994c710..4ade09a139 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -28,26 +28,26 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.http.server;version="[6.10.0,6.11.0)", - org.eclipse.jgit.http.server.glue;version="[6.10.0,6.11.0)", - org.eclipse.jgit.http.server.resolver;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http.apache;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.http.server;version="[6.10.1,6.11.0)", + org.eclipse.jgit.http.server.glue;version="[6.10.1,6.11.0)", + org.eclipse.jgit.http.server.resolver;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http.apache;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 8a8ffaafb8..62b1a2125f 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 55ed2ebc79..26fdf64132 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -21,17 +21,17 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.ssl;version="[10.0.0,11.0.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.http.server;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.0,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.http.server;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="6.10.0"; +Export-Package: org.eclipse.jgit.junit.http;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 0189abcf4d..be7b8d7d00 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 8196ba04a0..87395f29e9 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 1d153e7859..e704f2cecf 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", org.apache.sshd.sftp;version="[2.12.0,2.13.0)", org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", - org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="6.10.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="6.10.1" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 888d3397ca..fd28dfdacd 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index ac65e524ab..d4c79b9a86 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 6e06e4be57..f0176f05e5 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.0,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.util;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.merge;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="6.10.0", - org.eclipse.jgit.treewalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.time;version="[6.10.0,6.11.0)", +Import-Package: org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.merge;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="6.10.1", + org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.time;version="[6.10.1,6.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="6.10.0"; +Export-Package: org.eclipse.jgit.junit;version="6.10.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="6.10.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="6.10.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="6.10.1";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index f66cfd21b4..e9704a08f8 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index b335ff6640..12070f7353 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index fec7d17543..4240d6009d 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -26,24 +26,24 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.server;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.test;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.server;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.server.fs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.test;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index d9c652ff8c..8db851adae 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 1b6f37c5d6..827c39f108 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="6.10.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="6.10.1"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="6.10.0"; + org.eclipse.jgit.lfs.server.fs;version="6.10.1"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="6.10.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="6.10.0"; + org.eclipse.jgit.lfs.server.internal;version="6.10.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="6.10.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.annotation;version="[3.1.0,5.0.0)", javax.servlet.http;version="[3.1.0,5.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http.apache;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http.apache;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 781dd11c15..572e160b8a 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index b9c951681b..deb7b8fb1e 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index f9e4d55130..45192f51dd 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,27 +3,27 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.attributes;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", +Import-Package: org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.attributes;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="6.10.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="6.10.1";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 92e278f34a..1ad7c94e70 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 193d8f9ad7..3e092099f0 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="6.10.0", - org.eclipse.jgit.lfs.errors;version="6.10.0", - org.eclipse.jgit.lfs.internal;version="6.10.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="6.10.0" +Export-Package: org.eclipse.jgit.lfs;version="6.10.1", + org.eclipse.jgit.lfs.errors;version="6.10.1", + org.eclipse.jgit.lfs.internal;version="6.10.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="6.10.1" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.attributes;version="[6.10.0,6.11.0)", - org.eclipse.jgit.diff;version="[6.10.0,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.0,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.hooks;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.pack;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.0,6.11.0)" + org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.attributes;version="[6.10.1,6.11.0)", + org.eclipse.jgit.diff;version="[6.10.1,6.11.0)", + org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.hooks;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.pack;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 0a26318410..f865468324 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 9901ae33c2..b3e00c57e4 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index c0d55a862a..78c7a810a0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 1b3d5a4d88..36d74e9b2f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index e29383aa38..e1c76c8711 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index b2d1d1d3a7..8ddd5602ab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 428e5eb0a8..51ef6c4457 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index ab40781a54..5a95f9ebb4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index dfd2d24597..afdeb02c68 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index e168923f02..5af966b465 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 764872e2f3..2a056b55ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index a4a707a23a..6cb162b787 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 2bfb757542..ed02ffccef 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 117d995880..327210a88b 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index addf42b35c..e01d3b20a2 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.diff;version="[6.10.0,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.diffmergetool;version="6.10.0", - org.eclipse.jgit.internal.storage.file;version="6.10.0", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.merge;version="[6.10.0,6.11.0)", - org.eclipse.jgit.pgm;version="[6.10.0,6.11.0)", - org.eclipse.jgit.pgm.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.pgm.opt;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.0,6.11.0)", +Import-Package: org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.diff;version="[6.10.1,6.11.0)", + org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.diffmergetool;version="6.10.1", + org.eclipse.jgit.internal.storage.file;version="6.10.1", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.merge;version="[6.10.1,6.11.0)", + org.eclipse.jgit.pgm;version="[6.10.1,6.11.0)", + org.eclipse.jgit.pgm.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.pgm.opt;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 7764e17dcb..a358b99e59 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 27cd6b3b7e..c6215ca38d 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -14,49 +14,49 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)", org.eclipse.jetty.util;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.archive;version="[6.10.0,6.11.0)", - org.eclipse.jgit.awtui;version="[6.10.0,6.11.0)", - org.eclipse.jgit.blame;version="[6.10.0,6.11.0)", - org.eclipse.jgit.diff;version="[6.10.0,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.0,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.gitrepo;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.diffmergetool;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.io;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.server;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs.server.s3;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.merge;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.notes;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revplot;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk.filter;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.pack;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http.apache;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.sshd;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.0,6.11.0)", + org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.archive;version="[6.10.1,6.11.0)", + org.eclipse.jgit.awtui;version="[6.10.1,6.11.0)", + org.eclipse.jgit.blame;version="[6.10.1,6.11.0)", + org.eclipse.jgit.diff;version="[6.10.1,6.11.0)", + org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.gitrepo;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.io;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.server;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.server.fs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs.server.s3;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.merge;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.notes;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revplot;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk.filter;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.pack;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http.apache;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.sshd;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="6.10.0"; +Export-Package: org.eclipse.jgit.console;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="6.10.0"; + org.eclipse.jgit.pgm;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="6.10.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="6.10.0"; + org.eclipse.jgit.pgm.debug;version="6.10.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="6.10.0"; + org.eclipse.jgit.pgm.internal;version="6.10.1"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="6.10.0"; + org.eclipse.jgit.pgm.opt;version="6.10.1"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index ce07d81e5e..5236cf5709 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 96a42253c8..89d803ed4f 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index a046f0e289..5090d71efa 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.0,6.11.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.1,6.11.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.transport.sshd;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.10.0";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.10.1";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index bc03f5f814..1a0ea15a63 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index fd8d28b529..1893c8feee 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 41c7219fb5..64c40628b1 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -22,16 +22,16 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)", org.apache.sshd.core;version="[2.12.0,2.13.0)", org.apache.sshd.server;version="[2.12.0,2.13.0)", org.apache.sshd.server.forward;version="[2.12.0,2.13.0)", - org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit.ssh;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.sshd;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.sshd;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.sshd.agent;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 63d054ffd1..f4fa30e9f1 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index c1b6a4a81b..404129d0f3 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.1";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.0";x-inte org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="6.10.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="6.10.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="6.10.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="6.10.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="6.10.0"; + org.eclipse.jgit.internal.transport.sshd.agent;version="6.10.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="6.10.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="6.10.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="6.10.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="6.10.0", + org.eclipse.jgit.transport.sshd.agent;version="6.10.1", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.12.0,2.13.0)", @@ -89,12 +89,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.12.0,2.13.0)", org.apache.sshd.sftp.client;version="[2.12.0,2.13.0)", org.apache.sshd.sftp.common;version="[2.12.0,2.13.0)", - org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.fnmatch;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.fnmatch;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index a1d098c7ba..29482ec3c1 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 08904d0f0b..d73ab40086 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 730e859480..50168d8158 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit.ssh;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 60766ec41d..c5344917a0 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 220f4917f2..88b2e13f76 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.0,6.11.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.1,6.11.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.0" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.1" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.0,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 479d0b248f..408739ba05 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 50165ed679..994ff12618 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index b1c9f0744a..4f09990058 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -21,64 +21,64 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io;version="[2.15.0,3.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api;version="[6.10.0,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.archive;version="[6.10.0,6.11.0)", - org.eclipse.jgit.attributes;version="[6.10.0,6.11.0)", - org.eclipse.jgit.awtui;version="[6.10.0,6.11.0)", - org.eclipse.jgit.blame;version="[6.10.0,6.11.0)", - org.eclipse.jgit.diff;version="[6.10.0,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.0,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.events;version="[6.10.0,6.11.0)", - org.eclipse.jgit.fnmatch;version="[6.10.0,6.11.0)", - org.eclipse.jgit.gitrepo;version="[6.10.0,6.11.0)", - org.eclipse.jgit.hooks;version="[6.10.0,6.11.0)", - org.eclipse.jgit.ignore;version="[6.10.0,6.11.0)", - org.eclipse.jgit.ignore.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.diff;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.diffmergetool;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.fsck;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="6.10.0", - org.eclipse.jgit.internal.storage.dfs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.io;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.memory;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.transport.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.transport.parser;version="[6.10.0,6.11.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.0,6.11.0)", - org.eclipse.jgit.junit.time;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lfs;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.logging;version="[6.10.0,6.11.0)", - org.eclipse.jgit.merge;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.notes;version="[6.10.0,6.11.0)", - org.eclipse.jgit.patch;version="[6.10.0,6.11.0)", - org.eclipse.jgit.pgm;version="[6.10.0,6.11.0)", - org.eclipse.jgit.pgm.internal;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revplot;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk.filter;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.0,6.11.0)", - org.eclipse.jgit.storage.pack;version="[6.10.0,6.11.0)", - org.eclipse.jgit.submodule;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util.sha1;version="[6.10.0,6.11.0)", + org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.archive;version="[6.10.1,6.11.0)", + org.eclipse.jgit.attributes;version="[6.10.1,6.11.0)", + org.eclipse.jgit.awtui;version="[6.10.1,6.11.0)", + org.eclipse.jgit.blame;version="[6.10.1,6.11.0)", + org.eclipse.jgit.diff;version="[6.10.1,6.11.0)", + org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.events;version="[6.10.1,6.11.0)", + org.eclipse.jgit.fnmatch;version="[6.10.1,6.11.0)", + org.eclipse.jgit.gitrepo;version="[6.10.1,6.11.0)", + org.eclipse.jgit.hooks;version="[6.10.1,6.11.0)", + org.eclipse.jgit.ignore;version="[6.10.1,6.11.0)", + org.eclipse.jgit.ignore.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.diff;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.diffmergetool;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.fsck;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="6.10.1", + org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.io;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.memory;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.pack;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.reftable;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.transport.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.transport.parser;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.transport.ssh;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", + org.eclipse.jgit.junit.time;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.logging;version="[6.10.1,6.11.0)", + org.eclipse.jgit.merge;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.notes;version="[6.10.1,6.11.0)", + org.eclipse.jgit.patch;version="[6.10.1,6.11.0)", + org.eclipse.jgit.pgm;version="[6.10.1,6.11.0)", + org.eclipse.jgit.pgm.internal;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revplot;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk.filter;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", + org.eclipse.jgit.storage.pack;version="[6.10.1,6.11.0)", + org.eclipse.jgit.submodule;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util.sha1;version="[6.10.1,6.11.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index fc1caa62f1..b0ea83cd56 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 23cb622b29..7cf8277394 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.awtui;version="6.10.0" -Import-Package: org.eclipse.jgit.errors;version="[6.10.0,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.0,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revplot;version="[6.10.0,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.0,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.0,6.11.0)", - org.eclipse.jgit.util;version="[6.10.0,6.11.0)" +Export-Package: org.eclipse.jgit.awtui;version="6.10.1" +Import-Package: org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", + org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revplot;version="[6.10.1,6.11.0)", + org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", + org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", + org.eclipse.jgit.util;version="[6.10.1,6.11.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index cb70ccc12c..22586a6f65 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index de01d97ade..02381d7dbc 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d63f2f31b9..e9042772d2 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.0.202406032230-r +Bundle-Version: 6.10.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="6.10.0", - org.eclipse.jgit.api;version="6.10.0"; +Export-Package: org.eclipse.jgit.annotations;version="6.10.1", + org.eclipse.jgit.api;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,18 +25,18 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="6.10.0"; + org.eclipse.jgit.api.errors;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="6.10.0"; + org.eclipse.jgit.attributes;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="6.10.0"; + org.eclipse.jgit.blame;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="6.10.0"; + org.eclipse.jgit.diff;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -44,53 +44,53 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="6.10.0"; + org.eclipse.jgit.dircache;version="6.10.1"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="6.10.0"; + org.eclipse.jgit.errors;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="6.10.0"; + org.eclipse.jgit.events;version="6.10.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="6.10.0", - org.eclipse.jgit.gitrepo;version="6.10.0"; + org.eclipse.jgit.fnmatch;version="6.10.1", + org.eclipse.jgit.gitrepo;version="6.10.1"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="6.10.0";x-internal:=true, - org.eclipse.jgit.hooks;version="6.10.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="6.10.0", - org.eclipse.jgit.ignore.internal;version="6.10.0"; + org.eclipse.jgit.gitrepo.internal;version="6.10.1";x-internal:=true, + org.eclipse.jgit.hooks;version="6.10.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="6.10.1", + org.eclipse.jgit.ignore.internal;version="6.10.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="6.10.0"; + org.eclipse.jgit.internal;version="6.10.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="6.10.0"; + org.eclipse.jgit.internal.diff;version="6.10.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="6.10.0"; + org.eclipse.jgit.internal.diffmergetool;version="6.10.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="6.10.0"; + org.eclipse.jgit.internal.fsck;version="6.10.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="6.10.0"; + org.eclipse.jgit.internal.revwalk;version="6.10.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="6.10.0"; + org.eclipse.jgit.internal.storage.commitgraph;version="6.10.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="6.10.0"; + org.eclipse.jgit.internal.storage.dfs;version="6.10.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="6.10.0"; + org.eclipse.jgit.internal.storage.file;version="6.10.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -99,36 +99,36 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.0", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="6.10.0"; + org.eclipse.jgit.internal.storage.io;version="6.10.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="6.10.0"; + org.eclipse.jgit.internal.storage.memory;version="6.10.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="6.10.0"; + org.eclipse.jgit.internal.storage.pack;version="6.10.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="6.10.0"; + org.eclipse.jgit.internal.storage.reftable;version="6.10.1"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="6.10.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="6.10.0"; + org.eclipse.jgit.internal.submodule;version="6.10.1";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="6.10.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="6.10.0"; + org.eclipse.jgit.internal.transport.http;version="6.10.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="6.10.0"; + org.eclipse.jgit.internal.transport.parser;version="6.10.1"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="6.10.0"; + org.eclipse.jgit.internal.transport.ssh;version="6.10.1"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="6.10.0"; + org.eclipse.jgit.internal.util;version="6.10.1"; x-friends:=" org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="6.10.0"; + org.eclipse.jgit.lib;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -142,12 +142,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="6.10.0"; + org.eclipse.jgit.lib.internal;version="6.10.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="6.10.0", - org.eclipse.jgit.merge;version="6.10.0"; + org.eclipse.jgit.logging;version="6.10.1", + org.eclipse.jgit.merge;version="6.10.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -156,40 +156,40 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="6.10.0", - org.eclipse.jgit.notes;version="6.10.0"; + org.eclipse.jgit.nls;version="6.10.1", + org.eclipse.jgit.notes;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="6.10.0"; + org.eclipse.jgit.patch;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="6.10.0"; + org.eclipse.jgit.revplot;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="6.10.0"; + org.eclipse.jgit.revwalk;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="6.10.0"; + org.eclipse.jgit.revwalk.filter;version="6.10.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="6.10.0"; + org.eclipse.jgit.storage.file;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="6.10.0"; + org.eclipse.jgit.storage.pack;version="6.10.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="6.10.0"; + org.eclipse.jgit.submodule;version="6.10.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="6.10.0"; + org.eclipse.jgit.transport;version="6.10.1"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -202,21 +202,21 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="6.10.0"; + org.eclipse.jgit.transport.http;version="6.10.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="6.10.0"; + org.eclipse.jgit.transport.resolver;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="6.10.0"; + org.eclipse.jgit.treewalk;version="6.10.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="6.10.0"; + org.eclipse.jgit.treewalk.filter;version="6.10.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="6.10.0"; + org.eclipse.jgit.util;version="6.10.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -229,12 +229,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="6.10.0"; + org.eclipse.jgit.util.io;version="6.10.1"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="6.10.0", - org.eclipse.jgit.util.time;version="6.10.0" + org.eclipse.jgit.util.sha1;version="6.10.1", + org.eclipse.jgit.util.time;version="6.10.1" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 888385d0ff..054264b6a7 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.0.202406032230-r -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.0.202406032230-r";roots="." +Bundle-Version: 6.10.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 1532b180a1..67232cbc97 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index e6e8cd37ec..f960a3ed5d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.0.202406032230-r + 6.10.1-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 945e4d68cdccaa05528dfacc3ee73bd16b0b3c9e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Jun 2024 16:09:27 +0200 Subject: Prepare 7.0.0-SNAPSHOT builds Change-Id: I78b2779e4e5f34978cb9f1e8fa1dfe6dd5597c31 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++---- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 14 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 34 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 ++++----- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 86 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 16 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 118 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 112 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 534 insertions(+), 534 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 58526deac9..825e92d28b 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.ant.tasks;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 11cca38244..be954bd8e0 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 113896f15d..b5d8d5c07b 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)" + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="6.10.1", - org.eclipse.jgit.ant.tasks;version="6.10.1"; +Export-Package: org.eclipse.jgit.ant;version="7.0.0", + org.eclipse.jgit.ant.tasks;version="7.0.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 2616909676..22f8aff82c 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index c128eacefd..7c3edf475c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 78904fd583..bfd24cba22 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -13,17 +13,17 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.osgi.framework;version="[1.3.0,2.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="6.10.1"; +Export-Package: org.eclipse.jgit.archive;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.api, org.apache.commons.compress.archivers, org.osgi.framework", - org.eclipse.jgit.archive.internal;version="6.10.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.0.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 459e145cd7..322f52f9f4 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index af5695d9fb..054aa59429 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 16b1e2bdf1..7026ec60ad 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 4c91d2c9ab..1fe5318660 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 4e3c849c17..26a702eb11 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -13,9 +13,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.sha1;version="[6.10.1,6.11.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.sha1;version="[7.0.0,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index dbb3dcd3c7..d865b13901 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 514dc1f46d..84d7d0736b 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.1,6.11.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", @@ -28,9 +28,9 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="6.10.1", - org.eclipse.jgit.gpg.bc.internal;version="6.10.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="6.10.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc;version="7.0.0", + org.eclipse.jgit.gpg.bc.internal;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 609aa11eb2..0733a68ba0 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 3ff49eda6e..f4dce68fab 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 87a048aaef..2a06ae6f0e 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="6.10.1"; + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.0.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 040228c154..d29d3879d5 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index d3919bc164..51a79d61ef 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index d3b4221d2d..1336e56644 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="6.10.1", - org.eclipse.jgit.http.server.glue;version="6.10.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.0.0", + org.eclipse.jgit.http.server.glue;version="7.0.0"; uses:="javax.servlet,javax.servlet.http", - org.eclipse.jgit.http.server.resolver;version="6.10.1"; + org.eclipse.jgit.http.server.resolver;version="7.0.0"; uses:="org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, org.eclipse.jgit.transport, @@ -18,14 +18,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: javax.servlet;version="[2.5.0,5.0.0)", javax.servlet.http;version="[2.5.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.transport.parser;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)" + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 498a3631ea..bbb29cd846 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index dc176f566e..7645dd1418 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 4ade09a139..25089410a5 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -28,26 +28,26 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.http.server;version="[6.10.1,6.11.0)", - org.eclipse.jgit.http.server.glue;version="[6.10.1,6.11.0)", - org.eclipse.jgit.http.server.resolver;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http.apache;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.http.server;version="[7.0.0,7.1.0)", + org.eclipse.jgit.http.server.glue;version="[7.0.0,7.1.0)", + org.eclipse.jgit.http.server.resolver;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 62b1a2125f..9187612b97 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 26fdf64132..4de73b3587 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -21,17 +21,17 @@ Import-Package: javax.servlet;version="[2.5.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.ssl;version="[10.0.0,11.0.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.http.server;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.http.server;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="6.10.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.junit, javax.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index be7b8d7d00..cfeb426385 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 87395f29e9..05701bd243 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index e704f2cecf..9bad75f28e 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", org.apache.sshd.sftp;version="[2.12.0,2.13.0)", org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="6.10.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index fd28dfdacd..a7ca6336b8 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d4c79b9a86..2a885f204e 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index f0176f05e5..a58b78724e 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.util;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.merge;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="6.10.1", - org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.time;version="[6.10.1,6.11.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.merge;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="7.0.0", + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.time;version="[7.0.0,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="6.10.1"; +Export-Package: org.eclipse.jgit.junit;version="7.0.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="6.10.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="6.10.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.0.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index e9704a08f8..149ad00121 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 12070f7353..c33cb29b66 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 4240d6009d..0b21ced607 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -26,24 +26,24 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.security;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.thread;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.server;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.test;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.server;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.test;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 8db851adae..9cdd7a9f22 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 827c39f108..6f14014424 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="6.10.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; uses:="javax.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="6.10.1"; + org.eclipse.jgit.lfs.server.fs;version="7.0.0"; uses:="javax.servlet, javax.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="6.10.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="6.10.1"; + org.eclipse.jgit.lfs.server.internal;version="7.0.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.0.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", javax.servlet.annotation;version="[3.1.0,5.0.0)", javax.servlet.http;version="[3.1.0,5.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http.apache;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 572e160b8a..2cf86bc942 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index deb7b8fb1e..befaa367de 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 45192f51dd..0b93af2808 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,27 +3,27 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.attributes;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", +Import-Package: org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.attributes;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="6.10.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.0.0";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 1ad7c94e70..2c109c90ee 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 3e092099f0..a21894cdb5 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="6.10.1", - org.eclipse.jgit.lfs.errors;version="6.10.1", - org.eclipse.jgit.lfs.internal;version="6.10.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="6.10.1" +Export-Package: org.eclipse.jgit.lfs;version="7.0.0", + org.eclipse.jgit.lfs.errors;version="7.0.0", + org.eclipse.jgit.lfs.internal;version="7.0.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="7.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.attributes;version="[6.10.1,6.11.0)", - org.eclipse.jgit.diff;version="[6.10.1,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.hooks;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.pack;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)" + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.attributes;version="[7.0.0,7.1.0)", + org.eclipse.jgit.diff;version="[7.0.0,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.hooks;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.pack;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index f865468324..a048aa1738 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index b3e00c57e4..62508e245f 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 78c7a810a0..3dd7b10079 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 36d74e9b2f..ea66a2383c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index e1c76c8711..23fdd235cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 8ddd5602ab..92262a00be 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 51ef6c4457..6f03419cb7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 5a95f9ebb4..8eacae1fe7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index afdeb02c68..179eab8a6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 5af966b465..61b5dd6031 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 2a056b55ae..4c0068bfab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 6cb162b787..209274feeb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index ed02ffccef..ff46d9e65d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 327210a88b..e2f3cf68dd 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index e01d3b20a2..bde8eb1b00 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.diff;version="[6.10.1,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.diffmergetool;version="6.10.1", - org.eclipse.jgit.internal.storage.file;version="6.10.1", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.merge;version="[6.10.1,6.11.0)", - org.eclipse.jgit.pgm;version="[6.10.1,6.11.0)", - org.eclipse.jgit.pgm.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.pgm.opt;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", +Import-Package: org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.diff;version="[7.0.0,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.diffmergetool;version="7.0.0", + org.eclipse.jgit.internal.storage.file;version="7.0.0", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.merge;version="[7.0.0,7.1.0)", + org.eclipse.jgit.pgm;version="[7.0.0,7.1.0)", + org.eclipse.jgit.pgm.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.pgm.opt;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index a358b99e59..90090d6958 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index c6215ca38d..bcb086f2ac 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -14,49 +14,49 @@ Import-Package: javax.servlet;version="[3.1.0,5.0.0)", org.eclipse.jetty.servlet;version="[10.0.0,11.0.0)", org.eclipse.jetty.util;version="[10.0.0,11.0.0)", org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)", - org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.archive;version="[6.10.1,6.11.0)", - org.eclipse.jgit.awtui;version="[6.10.1,6.11.0)", - org.eclipse.jgit.blame;version="[6.10.1,6.11.0)", - org.eclipse.jgit.diff;version="[6.10.1,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.gitrepo;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.diffmergetool;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.io;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.server;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.server.fs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs.server.s3;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.merge;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.notes;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revplot;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk.filter;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.pack;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http.apache;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.sshd;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.archive;version="[7.0.0,7.1.0)", + org.eclipse.jgit.awtui;version="[7.0.0,7.1.0)", + org.eclipse.jgit.blame;version="[7.0.0,7.1.0)", + org.eclipse.jgit.diff;version="[7.0.0,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.gitrepo;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.io;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.server;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.merge;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.notes;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revplot;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk.filter;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.pack;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.sshd;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="6.10.1"; +Export-Package: org.eclipse.jgit.console;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="6.10.1"; + org.eclipse.jgit.pgm;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="6.10.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="6.10.1"; + org.eclipse.jgit.pgm.debug;version="7.0.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="6.10.1"; + org.eclipse.jgit.pgm.internal;version="7.0.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="6.10.1"; + org.eclipse.jgit.pgm.opt;version="7.0.0"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 5236cf5709..8bb1b64622 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 89d803ed4f..a33dcbaca1 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 5090d71efa..c353cb6eba 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.10.1,6.11.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.eclipse.jgit.transport.sshd;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.10.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.0.0";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 1a0ea15a63..684ab70f86 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 1893c8feee..f407ce11bf 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 64c40628b1..03f6d22a3c 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -22,16 +22,16 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)", org.apache.sshd.core;version="[2.12.0,2.13.0)", org.apache.sshd.server;version="[2.12.0,2.13.0)", org.apache.sshd.server.forward;version="[2.12.0,2.13.0)", - org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.sshd;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.sshd.agent;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit.ssh;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.sshd;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index f4fa30e9f1..967b781d10 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 404129d0f3..1722eeeed8 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.1";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.1";x-inte org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="6.10.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="6.10.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="6.10.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="6.10.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="6.10.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.0.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.0.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.0.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.0.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="6.10.1", + org.eclipse.jgit.transport.sshd.agent;version="7.0.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.12.0,2.13.0)", @@ -89,12 +89,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.12.0,2.13.0)", org.apache.sshd.sftp.client;version="[2.12.0,2.13.0)", org.apache.sshd.sftp.common;version="[2.12.0,2.13.0)", - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.fnmatch;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 29482ec3c1..bb0d79b3d5 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index d73ab40086..7cc3a55b26 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 50168d8158..3218f4b9dd 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit.ssh;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index c5344917a0..761b6c4aef 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 88b2e13f76..17fad22181 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[6.10.1,6.11.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.10.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 408739ba05..1dc0e01964 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 994ff12618..a3db63ca23 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 4f09990058..f403063478 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 @@ -21,64 +21,64 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io;version="[2.15.0,3.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api;version="[6.10.1,6.11.0)", - org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.archive;version="[6.10.1,6.11.0)", - org.eclipse.jgit.attributes;version="[6.10.1,6.11.0)", - org.eclipse.jgit.awtui;version="[6.10.1,6.11.0)", - org.eclipse.jgit.blame;version="[6.10.1,6.11.0)", - org.eclipse.jgit.diff;version="[6.10.1,6.11.0)", - org.eclipse.jgit.dircache;version="[6.10.1,6.11.0)", - org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.events;version="[6.10.1,6.11.0)", - org.eclipse.jgit.fnmatch;version="[6.10.1,6.11.0)", - org.eclipse.jgit.gitrepo;version="[6.10.1,6.11.0)", - org.eclipse.jgit.hooks;version="[6.10.1,6.11.0)", - org.eclipse.jgit.ignore;version="[6.10.1,6.11.0)", - org.eclipse.jgit.ignore.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.diff;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.diffmergetool;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.fsck;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="6.10.1", - org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.io;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.memory;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.pack;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.storage.reftable;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.transport.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.transport.parser;version="[6.10.1,6.11.0)", - org.eclipse.jgit.internal.transport.ssh;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", - org.eclipse.jgit.junit.time;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.logging;version="[6.10.1,6.11.0)", - org.eclipse.jgit.merge;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.notes;version="[6.10.1,6.11.0)", - org.eclipse.jgit.patch;version="[6.10.1,6.11.0)", - org.eclipse.jgit.pgm;version="[6.10.1,6.11.0)", - org.eclipse.jgit.pgm.internal;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revplot;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk.filter;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.file;version="[6.10.1,6.11.0)", - org.eclipse.jgit.storage.pack;version="[6.10.1,6.11.0)", - org.eclipse.jgit.submodule;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.http;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport.resolver;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.treewalk.filter;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.io;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util.sha1;version="[6.10.1,6.11.0)", + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.archive;version="[7.0.0,7.1.0)", + org.eclipse.jgit.attributes;version="[7.0.0,7.1.0)", + org.eclipse.jgit.awtui;version="[7.0.0,7.1.0)", + org.eclipse.jgit.blame;version="[7.0.0,7.1.0)", + org.eclipse.jgit.diff;version="[7.0.0,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.events;version="[7.0.0,7.1.0)", + org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)", + org.eclipse.jgit.gitrepo;version="[7.0.0,7.1.0)", + org.eclipse.jgit.hooks;version="[7.0.0,7.1.0)", + org.eclipse.jgit.ignore;version="[7.0.0,7.1.0)", + org.eclipse.jgit.ignore.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.diff;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.fsck;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.0.0", + org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.io;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.transport.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.0.0,7.1.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit.time;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.logging;version="[7.0.0,7.1.0)", + org.eclipse.jgit.merge;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.notes;version="[7.0.0,7.1.0)", + org.eclipse.jgit.patch;version="[7.0.0,7.1.0)", + org.eclipse.jgit.pgm;version="[7.0.0,7.1.0)", + org.eclipse.jgit.pgm.internal;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revplot;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk.filter;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", + org.eclipse.jgit.storage.pack;version="[7.0.0,7.1.0)", + org.eclipse.jgit.submodule;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util.sha1;version="[7.0.0,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b0ea83cd56..05f7c08bd2 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 7cf8277394..b776d2e6e0 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.eclipse.jgit.awtui;version="6.10.1" -Import-Package: org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", - org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", - org.eclipse.jgit.nls;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revplot;version="[6.10.1,6.11.0)", - org.eclipse.jgit.revwalk;version="[6.10.1,6.11.0)", - org.eclipse.jgit.transport;version="[6.10.1,6.11.0)", - org.eclipse.jgit.util;version="[6.10.1,6.11.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.0.0" +Import-Package: org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revplot;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 22586a6f65..8170fc6bd2 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 02381d7dbc..6d1e2676af 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index e9042772d2..8a05782114 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 6.10.1.qualifier +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="6.10.1", - org.eclipse.jgit.api;version="6.10.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.0.0", + org.eclipse.jgit.api;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,18 +25,18 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="6.10.1"; + org.eclipse.jgit.api.errors;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="6.10.1"; + org.eclipse.jgit.attributes;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="6.10.1"; + org.eclipse.jgit.blame;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="6.10.1"; + org.eclipse.jgit.diff;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -44,53 +44,53 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="6.10.1"; + org.eclipse.jgit.dircache;version="7.0.0"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="6.10.1"; + org.eclipse.jgit.errors;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="6.10.1"; + org.eclipse.jgit.events;version="7.0.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="6.10.1", - org.eclipse.jgit.gitrepo;version="6.10.1"; + org.eclipse.jgit.fnmatch;version="7.0.0", + org.eclipse.jgit.gitrepo;version="7.0.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="6.10.1";x-internal:=true, - org.eclipse.jgit.hooks;version="6.10.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="6.10.1", - org.eclipse.jgit.ignore.internal;version="6.10.1"; + org.eclipse.jgit.gitrepo.internal;version="7.0.0";x-internal:=true, + org.eclipse.jgit.hooks;version="7.0.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="7.0.0", + org.eclipse.jgit.ignore.internal;version="7.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="6.10.1"; + org.eclipse.jgit.internal;version="7.0.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="6.10.1"; + org.eclipse.jgit.internal.diff;version="7.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="6.10.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.0.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="6.10.1"; + org.eclipse.jgit.internal.fsck;version="7.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="6.10.1"; + org.eclipse.jgit.internal.revwalk;version="7.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="6.10.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="6.10.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.0.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="6.10.1"; + org.eclipse.jgit.internal.storage.file;version="7.0.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -99,36 +99,36 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="6.10.1"; + org.eclipse.jgit.internal.storage.io;version="7.0.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="6.10.1"; + org.eclipse.jgit.internal.storage.memory;version="7.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="6.10.1"; + org.eclipse.jgit.internal.storage.pack;version="7.0.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="6.10.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.0.0"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="6.10.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="6.10.1"; + org.eclipse.jgit.internal.submodule;version="7.0.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="6.10.1"; + org.eclipse.jgit.internal.transport.http;version="7.0.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="6.10.1"; + org.eclipse.jgit.internal.transport.parser;version="7.0.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="6.10.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.0.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="6.10.1"; + org.eclipse.jgit.internal.util;version="7.0.0"; x-friends:=" org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="6.10.1"; + org.eclipse.jgit.lib;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -142,12 +142,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="6.10.1"; + org.eclipse.jgit.lib.internal;version="7.0.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="6.10.1", - org.eclipse.jgit.merge;version="6.10.1"; + org.eclipse.jgit.logging;version="7.0.0", + org.eclipse.jgit.merge;version="7.0.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -156,40 +156,40 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="6.10.1", - org.eclipse.jgit.notes;version="6.10.1"; + org.eclipse.jgit.nls;version="7.0.0", + org.eclipse.jgit.notes;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="6.10.1"; + org.eclipse.jgit.patch;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="6.10.1"; + org.eclipse.jgit.revplot;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="6.10.1"; + org.eclipse.jgit.revwalk;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="6.10.1"; + org.eclipse.jgit.revwalk.filter;version="7.0.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="6.10.1"; + org.eclipse.jgit.storage.file;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="6.10.1"; + org.eclipse.jgit.storage.pack;version="7.0.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="6.10.1"; + org.eclipse.jgit.submodule;version="7.0.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="6.10.1"; + org.eclipse.jgit.transport;version="7.0.0"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -202,21 +202,21 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="6.10.1"; + org.eclipse.jgit.transport.http;version="7.0.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="6.10.1"; + org.eclipse.jgit.transport.resolver;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="6.10.1"; + org.eclipse.jgit.treewalk;version="7.0.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="6.10.1"; + org.eclipse.jgit.treewalk.filter;version="7.0.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="6.10.1"; + org.eclipse.jgit.util;version="7.0.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -229,12 +229,12 @@ Export-Package: org.eclipse.jgit.annotations;version="6.10.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="6.10.1"; + org.eclipse.jgit.util.io;version="7.0.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="6.10.1", - org.eclipse.jgit.util.time;version="6.10.1" + org.eclipse.jgit.util.sha1;version="7.0.0", + org.eclipse.jgit.util.time;version="7.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 054264b6a7..7531018bc3 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 6.10.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="6.10.1.qualifier";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 67232cbc97..3c6c38992c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index f960a3ed5d..1aa07fc701 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 6.10.1-SNAPSHOT + 7.0.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 17789059c6c9ef0da086f5553b0dd8d7e15e0eda Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Wed, 5 Jun 2024 10:17:48 +0200 Subject: Fix broken links to SCM and issue tracker in pom.xml Change-Id: I34537d42dedfd0a20363cc791722e28c779524b4 Signed-off-by: Antonin Delpeuch --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 1aa07fc701..eb82037088 100644 --- a/pom.xml +++ b/pom.xml @@ -33,8 +33,8 @@ - https://git.eclipse.org/r/plugins/gitiles/jgit/jgit - scm:git:https://git.eclipse.org/r/jgit/jgit + https://eclipse.gerrithub.io/plugins/gitiles/eclipse-jgit/jgit + scm:git:https://eclipse.gerrithub.io/eclipse-jgit/jgit @@ -95,8 +95,8 @@ - https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced;component=JGit;product=JGit;classification=Technology - Bugzilla + https://github.com/eclipse-jgit/jgit/issues + GitHub Issues -- cgit v1.2.3 From b41187429359cf9830fd34368d28a454653e187d Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 6 Jun 2024 12:01:04 -0700 Subject: RepoCommand: Add error to ManifestErrorException RepoCommand wraps errors in the manifest in a ManifestErrorException with a fixed message ("Invalid manifest"). Callers like supermanifest plugin cannot return a meaningful error to the client without digging into the cause chain. Add the actual error message to the ManifestErrorException, so callers can rely on #getMessage() to see what happens. Change-Id: I18be17fb5e4aaaf4f11ebd627580a91fe330eaca --- org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index 3aaef387f9..9979664ceb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -255,7 +255,7 @@ public class RepoCommand extends GitCommand { @SuppressWarnings("serial") static class ManifestErrorException extends GitAPIException { ManifestErrorException(Throwable cause) { - super(RepoText.get().invalidManifest, cause); + super(RepoText.get().invalidManifest + " " + cause.getMessage(), cause); } } -- cgit v1.2.3 From d3ff5b4e3e52e396d89aa9622aeff8aced61dc77 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 26 Apr 2024 01:20:25 +0100 Subject: Introduce GPG_SIGNATURE_PREFIX constant Change-Id: If6cabae76d7b38ce26fca534da6fe13973ebbf4f --- org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java | 7 +++++++ org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 60a23dde05..1835dc76a2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -493,6 +493,13 @@ public final class Constants { */ public static final String ATTR_BUILTIN_BINARY_MERGER = "binary"; //$NON-NLS-1$ + /** + * Prefix of a GPG signature. + * + * @since 7.0 + */ + public static final String GPG_SIGNATURE_PREFIX = "-----BEGIN PGP SIGNATURE-----"; //$NON-NLS-1$ + /** * Create a new digest function for objects. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java index 75dbd57740..5b50c2afd7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java @@ -13,6 +13,7 @@ package org.eclipse.jgit.revwalk; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.eclipse.jgit.lib.Constants.GPG_SIGNATURE_PREFIX; import java.io.IOException; import java.nio.charset.Charset; @@ -39,7 +40,7 @@ import org.eclipse.jgit.util.StringUtils; public class RevTag extends RevObject { private static final byte[] hSignature = Constants - .encodeASCII("-----BEGIN PGP SIGNATURE-----"); //$NON-NLS-1$ + .encodeASCII(GPG_SIGNATURE_PREFIX); /** * Parse an annotated tag from its canonical format. -- cgit v1.2.3 From e240b380f4fa98461e61adfcb8b9591c46bee4e3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Jun 2024 17:54:52 +0200 Subject: RepoProject: Fix @since tag of new methods The change Ia50b85b95bfd3710f9fbda2050be5950dd686941 didn't reach the 6.10 release hence update the API version to 7.0. Change-Id: If25121797d2955e1e741eec465f69a482af353d1 --- org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index aa1af21d23..b96faab452 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -395,7 +395,7 @@ public class RepoProject implements Comparable { * * @return the upstream value if present, null otherwise. * - * @since 6.10 + * @since 7.0 */ public String getUpstream() { return this.upstream; @@ -407,9 +407,10 @@ public class RepoProject implements Comparable { * Name of the git ref in which a sha1 can be found, when the revision is a * sha1. * - * @param upstream value of the attribute in the manifest + * @param upstream + * value of the attribute in the manifest * - * @since 6.10 + * @since 7.0 */ void setUpstream(String upstream) { this.upstream = upstream; -- cgit v1.2.3 From 025ef8dfd9a3437e4c234430ce2a062ddfb01fc9 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 14 Jun 2024 17:49:22 +0200 Subject: [releng] Bump japicmp base version to 6.10.0.202406032230-r Change-Id: If34ad4986c1764015d5f86e185880e2eda32d90e Signed-off-by: Thomas Wolf --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb82037088..df021372fb 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ ${commit.time.iso} - 6.9.0.202403050737-r + 6.10.0.202406032230-r 1.10.14 2.12.1 0.1.55 -- cgit v1.2.3 From d8f450aebb26cd1179ff39d0198a34b38a358b67 Mon Sep 17 00:00:00 2001 From: Daniele Sassoli Date: Mon, 24 Jun 2024 09:16:57 +0100 Subject: Migrate to python 3 Given that on most systems Python is still linked to the Python 2.7, switch explicitly to using Python 3. Python 2.7 was discontinued on January 1, 2020: [1]. Moreover, there is PEP recommending to use python3 in the shebang: [2]. [1] https://www.python.org/doc/sunset-python-2 [2] https://www.python.org/dev/peps/pep-0394 Change-Id: Idd3ed567b0384c6ff0a6121ad736f8af4c0f85e0 --- .bazelrc | 2 +- tools/workspace_status.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.bazelrc b/.bazelrc index 7c71c4a9d0..375beeca4c 100644 --- a/.bazelrc +++ b/.bazelrc @@ -2,7 +2,7 @@ # https://issues.gerritcodereview.com/issues/303819949 common --noenable_bzlmod -build --workspace_status_command="python ./tools/workspace_status.py" +build --workspace_status_command="python3 ./tools/workspace_status.py" build --repository_cache=~/.gerritcodereview/bazel-cache/repository build --incompatible_strict_action_env build --action_env=PATH diff --git a/tools/workspace_status.py b/tools/workspace_status.py index ca9e0a98c9..1186a4a77a 100644 --- a/tools/workspace_status.py +++ b/tools/workspace_status.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (C) 2020, David Ostrovsky and others # # This program and the accompanying materials are made available under the -- cgit v1.2.3 From e57c52dfb97a70975f05b8bc1bcaf424f46ee7c0 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 9 Apr 2024 13:25:43 -0700 Subject: DfsPackFile: Do not set primery index local ref from cache callback DfsPackFile assumes the indices are in pack streams, but we would like to consider other formats and storage. Currently, the local ref in the DfsPackFile to the index is set in the cache loading callback, which prevents abstracting the loading. Reorganize the code so: the loadPackIndex function just parses the bytes returning a reference and the caller sets the loaded index in the local ref and DfsBlockCache. We will follow this pattern with other indices in follow-up changes. Note that although DfsPackFile is used only in one thread, the loading in DfsBlockCache can happen from multiple threads concurrently and we want to keep only one ref around. Change-Id: Ie99de6c80784225484c0f99c51caa44c6a372c45 --- .../jgit/internal/storage/dfs/DfsPackFile.java | 43 ++++++++++++++-------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java index 5cc2a57aba..3e4d4d300c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java @@ -29,6 +29,7 @@ import java.nio.channels.Channels; import java.text.MessageFormat; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; import java.util.zip.CRC32; import java.util.zip.DataFormatException; import java.util.zip.Inflater; @@ -196,18 +197,24 @@ public final class DfsPackFile extends BlockBasedFile { .dispatch(new BeforeDfsPackIndexLoadedEvent(this)); try { DfsStreamKey idxKey = desc.getStreamKey(INDEX); - AtomicBoolean cacheHit = new AtomicBoolean(true); - DfsBlockCache.Ref idxref = cache.getOrLoadRef(idxKey, + // Keep the value parsed in the loader, in case the Ref<> is + // nullified in ClockBlockCacheTable#reserveSpace + // before we read its value. + AtomicReference loadedRef = new AtomicReference<>(null); + DfsBlockCache.Ref cachedRef = cache.getOrLoadRef(idxKey, REF_POSITION, () -> { - cacheHit.set(false); - return loadPackIndex(ctx, idxKey); + RefWithSize idx = loadPackIndex(ctx); + loadedRef.set(idx.ref); + return new DfsBlockCache.Ref<>(idxKey, REF_POSITION, + idx.size, idx.ref); }); - if (cacheHit.get()) { + if (loadedRef.get() == null) { ctx.stats.idxCacheHit++; } - PackIndex idx = idxref.get(); - if (index == null && idx != null) { - index = idx; + index = cachedRef.get() != null ? cachedRef.get() : loadedRef.get(); + if (index == null) { + throw new IOException( + "Couldn't get a reference to the primary index"); //$NON-NLS-1$ } ctx.emitIndexLoad(desc, INDEX, index); return index; @@ -1210,20 +1217,15 @@ public final class DfsPackFile extends BlockBasedFile { } } - private DfsBlockCache.Ref loadPackIndex( - DfsReader ctx, DfsStreamKey idxKey) throws IOException { + private RefWithSize loadPackIndex(DfsReader ctx) + throws IOException { try { ctx.stats.readIdx++; long start = System.nanoTime(); try (ReadableChannel rc = ctx.db.openFile(desc, INDEX)) { PackIndex idx = PackIndex.read(alignTo8kBlocks(rc)); ctx.stats.readIdxBytes += rc.position(); - index = idx; - return new DfsBlockCache.Ref<>( - idxKey, - REF_POSITION, - idx.getObjectCount() * REC_SIZE, - idx); + return new RefWithSize<>(idx, idx.getObjectCount() * REC_SIZE); } finally { ctx.stats.readIdxMicros += elapsedMicros(start); } @@ -1449,4 +1451,13 @@ public final class DfsPackFile extends BlockBasedFile { } } } + + private static final class RefWithSize { + final V ref; + final long size; + RefWithSize(V ref, long size) { + this.ref = ref; + this.size = size; + } + } } -- cgit v1.2.3 From e3e0a1ea35a27e50e0280715a417be7d69fa3345 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Thu, 27 Jun 2024 18:05:30 -0700 Subject: Make RepoProject#setUpstream public Applications using JGit such as Gerrit plugins may have their own manifest parsers. They can start using RepoProject to some extent with this change. Eventually, they can be migrated to use the ManifestParser in JGit, however until then, this change can help make the migration incremental. Change-Id: I6a32d4f4622c3842eedf7873cdfed2f1ca998f6f --- org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index b96faab452..09ce28386c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -412,7 +412,7 @@ public class RepoProject implements Comparable { * * @since 7.0 */ - void setUpstream(String upstream) { + public void setUpstream(String upstream) { this.upstream = upstream; } -- cgit v1.2.3 From 05dabef4edb0f5b01318777cbc69bc1fc7d1106b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 1 Jul 2024 23:10:10 +0200 Subject: Update org.apache.sshd to 2.13.1 Change-Id: I040ccaffba337b252d731fe9661209818b5b63e3 --- WORKSPACE | 6 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 50 +++++----- .../META-INF/MANIFEST.MF.orig | 104 +++++++++++++++++++++ .../org.eclipse.jgit.target/jgit-4.17.target | 6 +- .../org.eclipse.jgit.target/jgit-4.18.target | 6 +- .../org.eclipse.jgit.target/jgit-4.19.target | 6 +- .../org.eclipse.jgit.target/jgit-4.20.target | 6 +- .../org.eclipse.jgit.target/jgit-4.21.target | 6 +- .../org.eclipse.jgit.target/jgit-4.22.target | 6 +- .../org.eclipse.jgit.target/jgit-4.23.target | 6 +- .../org.eclipse.jgit.target/jgit-4.24.target | 6 +- .../org.eclipse.jgit.target/jgit-4.25.target | 6 +- .../org.eclipse.jgit.target/jgit-4.26.target | 6 +- .../org.eclipse.jgit.target/jgit-4.27.target | 6 +- .../org.eclipse.jgit.target/jgit-4.28.target | 6 +- .../org.eclipse.jgit.target/jgit-4.29.target | 6 +- .../org.eclipse.jgit.target/jgit-4.30.target | 6 +- .../org.eclipse.jgit.target/jgit-4.31.target | 6 +- .../org.eclipse.jgit.target/jgit-4.32.target | 6 +- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 28 +++--- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 104 ++++++++++----------- pom.xml | 2 +- 23 files changed, 249 insertions(+), 145 deletions(-) create mode 100644 org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig diff --git a/WORKSPACE b/WORKSPACE index 561b228d47..81e9dd3dff 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -108,18 +108,18 @@ maven_jar( sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", ) -SSHD_VERS = "2.12.1" +SSHD_VERS = "2.13.1" maven_jar( name = "sshd-osgi", artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, - sha1 = "45b0501857603881ab472c927852ffa406932aef", + sha1 = "50958cc44076749e790d7332021cff546707624c", ) maven_jar( name = "sshd-sftp", artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, - sha1 = "3ef6ded49799618c9438aa1044c6bf01124133bb", + sha1 = "e1b6da4ef604718e32cad59ef32618610da7a170", ) JNA_VERS = "5.14.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 424bac1043..a3777ffdda 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -8,31 +8,31 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)", - org.apache.sshd.server.command;version="[2.12.0,2.13.0)", - org.apache.sshd.server.session;version="[2.12.0,2.13.0)", - org.apache.sshd.server.shell;version="[2.12.0,2.13.0)", - org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", +Import-Package: org.apache.sshd.common;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.file.virtualfs;version="[2.13.0,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.io;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session;version="[2.13.0,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.threads;version="[2.13.0,2.14.0)", + org.apache.sshd.core;version="[2.13.0,2.14.0)", + org.apache.sshd.server;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.gss;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.keyboard;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.password;version="[2.13.0,2.14.0)", + org.apache.sshd.server.command;version="[2.13.0,2.14.0)", + org.apache.sshd.server.session;version="[2.13.0,2.14.0)", + org.apache.sshd.server.shell;version="[2.13.0,2.14.0)", + org.apache.sshd.server.subsystem;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp.server;version="[2.13.0,2.14.0)", org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", org.eclipse.jgit.api;version="[7.0.0,7.1.0)", org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig new file mode 100644 index 0000000000..e83582843e --- /dev/null +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig @@ -0,0 +1,104 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Automatic-Module-Name: org.eclipse.jgit.junit.ssh +Bundle-SymbolicName: org.eclipse.jgit.junit.ssh +Bundle-Version: 7.0.0.qualifier +Bundle-Localization: OSGI-INF/l10n/plugin +Bundle-Vendor: %Bundle-Vendor +Bundle-ActivationPolicy: lazy +<<<<<<< HEAD +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", + org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", + org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)", + org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", + org.apache.sshd.common.io;version="[2.12.0,2.13.0)", + org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", + org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", + org.apache.sshd.common.session;version="[2.12.0,2.13.0)", + org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", + org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", + org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", + org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", + org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)", + org.apache.sshd.core;version="[2.12.0,2.13.0)", + org.apache.sshd.server;version="[2.12.0,2.13.0)", + org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", + org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)", + org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)", + org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)", + org.apache.sshd.server.command;version="[2.12.0,2.13.0)", + org.apache.sshd.server.session;version="[2.12.0,2.13.0)", + org.apache.sshd.server.shell;version="[2.12.0,2.13.0)", + org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", + org.apache.sshd.sftp;version="[2.12.0,2.13.0)", + org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", +||||||| parent of 9724f9467f (Update org.apache.sshd to 2.13.1) +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", + org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", + org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)", + org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", + org.apache.sshd.common.io;version="[2.12.0,2.13.0)", + org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", + org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", + org.apache.sshd.common.session;version="[2.12.0,2.13.0)", + org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", + org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", + org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", + org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", + org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)", + org.apache.sshd.core;version="[2.12.0,2.13.0)", + org.apache.sshd.server;version="[2.12.0,2.13.0)", + org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", + org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)", + org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)", + org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)", + org.apache.sshd.server.command;version="[2.12.0,2.13.0)", + org.apache.sshd.server.session;version="[2.12.0,2.13.0)", + org.apache.sshd.server.shell;version="[2.12.0,2.13.0)", + org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", + org.apache.sshd.sftp;version="[2.12.0,2.13.0)", + org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", +======= +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Import-Package: org.apache.sshd.common;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.file.virtualfs;version="[2.13.0,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.io;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session;version="[2.13.0,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.threads;version="[2.13.0,2.14.0)", + org.apache.sshd.core;version="[2.13.0,2.14.0)", + org.apache.sshd.server;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.gss;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.keyboard;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth.password;version="[2.13.0,2.14.0)", + org.apache.sshd.server.command;version="[2.13.0,2.14.0)", + org.apache.sshd.server.session;version="[2.13.0,2.14.0)", + org.apache.sshd.server.shell;version="[2.13.0,2.14.0)", + org.apache.sshd.server.subsystem;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp.server;version="[2.13.0,2.14.0)", +>>>>>>> 9724f9467f (Update org.apache.sshd to 2.13.1) + org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", + org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.junit;version="[4.13,5.0.0)", + org.junit.experimental.theories;version="[4.13,5.0.0)", + org.slf4j;version="[1.7.0,3.0.0)" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.0" 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 7aa9221d35..1bf4969255 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 eab1a66679..e97ad339c6 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 bd48369602..4926f1b007 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 38afd33a48..743f24e532 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 dee512fbae..cd0bbf4174 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 1a00d75e85..04edd41fb7 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 6de8df8db7..cb5d26ffa4 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 a350e3b289..8cf9841620 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 f5f717daf7..3fb446a895 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 9df41727f5..daaac545d9 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 183d30d4d9..e14380c56c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index f467e4f3cc..bcb8b4282e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 9f30fd0fa2..ffe4e7497b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 3f1c19bbab..837819befa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index b89f385a05..30c141c4cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 372af86fa3..0beb627a89 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.13.1 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.13.1 jar 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 d90026719e..132c118445 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 @@ -238,12 +238,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.12.1" + version = "2.13.1" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.12.1" + version = "2.13.1" } } diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 54d610aa91..1ac232a306 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,20 +8,20 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)", - org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.net;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server;version="[2.12.0,2.13.0)", - org.apache.sshd.server.forward;version="[2.12.0,2.13.0)", +Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.0,2.14.0)", + org.apache.sshd.common;version="[2.13.0,2.14.0)", + org.apache.sshd.common.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session;version="[2.13.0,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.net;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", + org.apache.sshd.core;version="[2.13.0,2.14.0)", + org.apache.sshd.server;version="[2.13.0,2.14.0)", + org.apache.sshd.server.forward;version="[2.13.0,2.14.0)", org.eclipse.jgit.api;version="[7.0.0,7.1.0)", org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.0,7.1.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 02d94662ee..aa50fdd8ce 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -37,58 +37,58 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-inter org.eclipse.jgit.transport.sshd.agent;version="7.0.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.12.0,2.13.0)", - org.apache.sshd.client;version="[2.12.0,2.13.0)", - org.apache.sshd.client.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.client.auth.keyboard;version="[2.12.0,2.13.0)", - org.apache.sshd.client.auth.password;version="[2.12.0,2.13.0)", - org.apache.sshd.client.auth.pubkey;version="[2.12.0,2.13.0)", - org.apache.sshd.client.channel;version="[2.12.0,2.13.0)", - org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)", - org.apache.sshd.client.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.client.future;version="[2.12.0,2.13.0)", - org.apache.sshd.client.keyverifier;version="[2.12.0,2.13.0)", - org.apache.sshd.client.session;version="[2.12.0,2.13.0)", - org.apache.sshd.client.session.forward;version="[2.12.0,2.13.0)", - org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.common.channel;version="[2.12.0,2.13.0)", - org.apache.sshd.common.cipher;version="[2.12.0,2.13.0)", - org.apache.sshd.common.compression;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys.loader;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.12.0,2.13.0)", - org.apache.sshd.common.digest;version="[2.12.0,2.13.0)", - org.apache.sshd.common.forward;version="[2.12.0,2.13.0)", - org.apache.sshd.common.future;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex.extension;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.mac;version="[2.12.0,2.13.0)", - org.apache.sshd.common.random;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.closeable;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.io.der;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.io.functors;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.io.resource;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.net;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.client;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.common;version="[2.12.0,2.13.0)", + org.apache.sshd.agent;version="[2.13.0,2.14.0)", + org.apache.sshd.client;version="[2.13.0,2.14.0)", + org.apache.sshd.client.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.client.auth.keyboard;version="[2.13.0,2.14.0)", + org.apache.sshd.client.auth.password;version="[2.13.0,2.14.0)", + org.apache.sshd.client.auth.pubkey;version="[2.13.0,2.14.0)", + org.apache.sshd.client.channel;version="[2.13.0,2.14.0)", + org.apache.sshd.client.config.hosts;version="[2.13.0,2.14.0)", + org.apache.sshd.client.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.client.future;version="[2.13.0,2.14.0)", + org.apache.sshd.client.keyverifier;version="[2.13.0,2.14.0)", + org.apache.sshd.client.session;version="[2.13.0,2.14.0)", + org.apache.sshd.client.session.forward;version="[2.13.0,2.14.0)", + org.apache.sshd.common;version="[2.13.0,2.14.0)", + org.apache.sshd.common.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.common.channel;version="[2.13.0,2.14.0)", + org.apache.sshd.common.cipher;version="[2.13.0,2.14.0)", + org.apache.sshd.common.compression;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys.loader;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.13.0,2.14.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.13.0,2.14.0)", + org.apache.sshd.common.digest;version="[2.13.0,2.14.0)", + org.apache.sshd.common.forward;version="[2.13.0,2.14.0)", + org.apache.sshd.common.future;version="[2.13.0,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.io;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex.extension;version="[2.13.0,2.14.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.13.0,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", + org.apache.sshd.common.mac;version="[2.13.0,2.14.0)", + org.apache.sshd.common.random;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session;version="[2.13.0,2.14.0)", + org.apache.sshd.common.session.helpers;version="[2.13.0,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.closeable;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.io;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.io.der;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.io.functors;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.io.resource;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.net;version="[2.13.0,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", + org.apache.sshd.core;version="[2.13.0,2.14.0)", + org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp.client;version="[2.13.0,2.14.0)", + org.apache.sshd.sftp.common;version="[2.13.0,2.14.0)", org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)", diff --git a/pom.xml b/pom.xml index 676e75c23e..3f6fb16aca 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 6.10.0.202406032230-r 1.10.14 - 2.12.1 + 2.13.1 0.1.55 1.1.3 1.2.3 -- cgit v1.2.3 From 3aff253e9d9f6c217221e80c3968019c7829c856 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 2 Jul 2024 00:12:43 +0200 Subject: Update jetty to 12.0.10 Change-Id: I20622430e766cc856e7d62483983d3466384eef4 --- WORKSPACE | 34 +++++++++++----------- .../org.eclipse.jgit.target/jgit-4.17.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.18.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.19.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.20.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.21.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.22.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.23.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.24.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.25.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.26.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.27.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.28.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.29.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.30.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.31.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.32.target | 18 ++++++------ .../org.eclipse.jgit.target/maven/dependencies.tpd | 16 +++++----- pom.xml | 2 +- 19 files changed, 170 insertions(+), 170 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 81e9dd3dff..2e417c9812 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -246,62 +246,62 @@ maven_jar( sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", ) -JETTY_VER = "12.0.9" +JETTY_VER = "12.0.10" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, - sha1 = "19e056d75741e7348411d677a9b26a54ea4b7d16", - src_sha1 = "d7fcb4e9d259c1dd8595c6163054be449072fe14", + sha1 = "a8d087bde78f231084901553bb6829663b4a22f1", + src_sha1 = "277a23875dd866b12ac09024656b90cb74d0d27f", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "0c03a77f9d1a8b595cb4a83011cef735bd34bc95", - src_sha1 = "9fba93bbce1466ef9c77d7a75338abd479641721", + sha1 = "a7bd8056fa84439411f60fedd8a94b1983880cf9", + src_sha1 = "027e27a757f2d23f28ac26f06e9bf2c49a885cfe", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "87adc518dd68b674e08d7e4968d07b6dc73214f1", - src_sha1 = "5404f097aae0126b820b040b4e924f31fe4ff25b", + sha1 = "0dcdef1c9ead5040e6b637512ab1794191058a22", + src_sha1 = "196fa1a06b65a3b6f549a8ac4523cafe59b1cbd6", ) maven_jar( name = "jetty-session", artifact = "org.eclipse.jetty:jetty-session:" + JETTY_VER, - sha1 = "628444f02dfbc4efbd1920a12e055580b227e86b", - src_sha1 = "2ac0ca2c84fa8e40655af1482a9c67d60d659ad2", + sha1 = "96dd580a79d938b532e8cff47475efbcaa80ea58", + src_sha1 = "390d3c79b3b9ff14f8361f7235c6a20374ea9b7e", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "cb54f006b1484306bc4b24dc3802cff472a6ba82", - src_sha1 = "a1a6bc169e06007cabf6534fd7c7d1f2e91ab775", + sha1 = "71f438b9cf1ba0b3411c5eddd386eeeeca25168a", + src_sha1 = "cd8b7d81dc839d40bf3dfd2dd2d82731b2a32a67", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "03e8f5b5c6d583ea591064671c23b8639c132052", - src_sha1 = "41b5752f3aa4c77f872649c215142aee1d6a3395", + sha1 = "4d5ddfc6ad4d6504531861806fade68c7d477f1b", + src_sha1 = "36f008ab135171e5ebbee18351f16a4eca7a678e", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "996ebc69825af41d49e2edc6796eb714acdc3369", - src_sha1 = "fe3b4ecf5a176bfd3c0055e5e1490503d90965e8", + sha1 = "ec7c95b5a289560f4a7be57170f4fdbedde72b92", + src_sha1 = "d5c1d7e9723514f5dae9dd89231c4c68129e2a64", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "634f67e811e0ad2acb32feaaf409927d80cd69ae", - src_sha1 = "192f1e1254f659af64c6cd1124807fa12bdfa721", + sha1 = "343c9c07e3ff461209a4eb7787dca665b5313818", + src_sha1 = "4f11df356220d181fd9a6dbb44f18a739d8418a1", ) BOUNCYCASTLE_VER = "1.78.1" 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 1bf4969255..631e4e8046 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 e97ad339c6..1d606cb4a5 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 4926f1b007..1cb0134075 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 743f24e532..2daad55733 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 cd0bbf4174..5db0218fa7 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 04edd41fb7..0960e19f4f 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 cb5d26ffa4..c4f9afd1ab 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 8cf9841620..39af3d68f8 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 3fb446a895..6639febbfc 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 daaac545d9..b344f2c740 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index e14380c56c..2c01df62bc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index bcb8b4282e..7d9d025fbc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index ffe4e7497b..3737089e2d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 837819befa..a2aa05cd36 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 30c141c4cc..c5a13aaa16 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 0beb627a89..5a7df61d2e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-http - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-io - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-security - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-server - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-session - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util - 12.0.9 + 12.0.10 jar org.eclipse.jetty jetty-util-ajax - 12.0.9 + 12.0.10 jar 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 132c118445..ed34756bf3 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 @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.9" + version = "12.0.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.9" + version = "12.0.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.9" + version = "12.0.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.9" + version = "12.0.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.9" + version = "12.0.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.9" + version = "12.0.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.9" + version = "12.0.10" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.9" + version = "12.0.10" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 3f6fb16aca..d3434447af 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.26.2 6.0.0 6.0.0 - 12.0.9 + 12.0.10 0.21.2 4.5.14 4.4.16 -- cgit v1.2.3 From 077a7139f9a4ad19d24ca066380c924ae46fc133 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 2 Jul 2024 00:26:44 +0200 Subject: Update bytebuddy to 1.14.17 Change-Id: I082c3726aa1b4f5bf97ac619b8265c734fc1d196 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 19 files changed, 54 insertions(+), 54 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 2e417c9812..b1a802a3af 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "fc4a3d051da838946f9dffe725efbd06cd7d1eec", ) -BYTE_BUDDY_VERSION = "1.14.16" +BYTE_BUDDY_VERSION = "1.14.17" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "e1b9a06e131b7d5b183c8ccc7c29b9e5a8dba077", + sha1 = "a8d08f3c1e75ecc7f38a8cfd7e9fa47919096373", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "4a451ee6484abac3a498df0f3b33ed00a6fced4d", + sha1 = "e3c251a39dc90badaf71c83427ba46840f219d8d", ) maven_jar( 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 631e4e8046..16fba84b6e 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 1d606cb4a5..a86c21b4c6 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 1cb0134075..bf2cba12a0 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 2daad55733..b46b31b1bb 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 5db0218fa7..2d09438904 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 0960e19f4f..70669a85a9 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 c4f9afd1ab..ddd7675c4c 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 39af3d68f8..9e96b38204 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 6639febbfc..c5405aa40a 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 b344f2c740..c60aa9ef50 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 2c01df62bc..8de5ac0ae0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 7d9d025fbc..ac8dabc037 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 3737089e2d..e89c063c25 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index a2aa05cd36..078a8054b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index c5a13aaa16..643228856b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 5a7df61d2e..58e495b9fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.16 + 1.14.17 jar net.bytebuddy byte-buddy-agent - 1.14.16 + 1.14.17 jar 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 ed34756bf3..fc20d20414 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.14.16" + version = "1.14.17" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.14.16" + version = "1.14.17" } } diff --git a/pom.xml b/pom.xml index d3434447af..67f03c1ae0 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.26.0 5.14.0 - 1.14.16 + 1.14.17 jacoco -- cgit v1.2.3 From 583cec3f623d87eece33e17411227272444a848a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 2 Jul 2024 00:35:36 +0200 Subject: Update org.eclipse.jdt.ecj to 3.38.0 Change-Id: I2e10c428991801e3da5ce1851eff23e508c2bd10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67f03c1ae0..7a07a3c8a6 100644 --- a/pom.xml +++ b/pom.xml @@ -1116,7 +1116,7 @@ org.eclipse.jdt ecj - 3.37.0 + 3.38.0 -- cgit v1.2.3 From 47fd412affd8d7578606ae9b3015a911b71b13ed Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Fri, 28 Jun 2024 10:02:05 -0700 Subject: RepoProject: read the 'dest-branch' attribute of a project The manifest spec [1] defines a "dest-branch" attribute. Parse its value and store it in the RepoProject. Also, create a getter/setter for dest-branch. [1] https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.md#Element-project Change-Id: I8ad83b0fec59d2b0967864e4de4fefde4ab971ff --- .../eclipse/jgit/gitrepo/ManifestParserTest.java | 30 ++++++++++++++++++++++ .../org/eclipse/jgit/gitrepo/ManifestParser.java | 2 ++ .../src/org/eclipse/jgit/gitrepo/RepoProject.java | 26 +++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java index 76176fe347..fca27d32aa 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java @@ -177,6 +177,36 @@ public class ManifestParserTest { assertNull(bar.getUpstream()); } + @Test + public void testWithDestBranch() throws Exception { + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + + ManifestParser parser = new ManifestParser(null, null, "master", + "https://git.google.com/", null, null); + parser.read(new ByteArrayInputStream( + xmlContent.toString().getBytes(UTF_8))); + + Map repos = parser.getProjects().stream().collect( + Collectors.toMap(RepoProject::getName, Function.identity())); + assertEquals(2, repos.size()); + + RepoProject foo = repos.get("foo"); + assertEquals("foo", foo.getName()); + assertEquals("branchX", foo.getDestBranch()); + + RepoProject bar = repos.get("bar"); + assertEquals("bar", bar.getName()); + assertNull(bar.getDestBranch()); + } + void testNormalize(String in, String want) { URI got = ManifestParser.normalizeEmptyPath(URI.create(in)); if (!got.toString().equals(want)) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java index 7402c760c3..b033177e05 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java @@ -178,6 +178,8 @@ public class ManifestParser extends DefaultHandler { .setRecommendShallow(attributes.getValue("clone-depth")); currentProject .setUpstream(attributes.getValue("upstream")); + currentProject + .setDestBranch(attributes.getValue("dest-branch")); break; case "remote": String alias = attributes.getValue("alias"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index 09ce28386c..d8fec78493 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -39,6 +39,7 @@ public class RepoProject implements Comparable { private final List copyfiles; private final List linkfiles; private String upstream; + private String destBranch; private String recommendShallow; private String url; private String defaultRevision; @@ -401,6 +402,17 @@ public class RepoProject implements Comparable { return this.upstream; } + /** + * Return the dest-branch attribute of the project + * + * @return the dest-branch value if present, null otherwise. + * + * @since 7.0 + */ + public String getDestBranch() { + return this.destBranch; + } + /** * Set the upstream attribute of the project * @@ -416,6 +428,20 @@ public class RepoProject implements Comparable { this.upstream = upstream; } + /** + * Set the dest-branch attribute of the project + * + * Name of a Git branch. + * + * @param destBranch + * value of the attribute in the manifest + * + * @since 7.0 + */ + public void setDestBranch(String destBranch) { + this.destBranch = destBranch; + } + private String getPathWithSlash() { if (path.endsWith("/")) { //$NON-NLS-1$ return path; -- cgit v1.2.3 From e5534111577b0f9c9b50140461adea31f789c06c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 30 May 2024 10:56:20 -0700 Subject: RepoProject: read the "upstream" attribute of a project The manifest spec [1] defines the "upstream" attribute: "name of the git ref in which a sha1 can be found", when the revision is a sha1. The parser is ignoring it, but RepoCommand could use it to populate the "ref=" field of pinned submodules. Parse the value and store it in the RepoProject. RepoProject is public API and the current constructors are not telescopic, so we cannot just add a new constructor with an extra argument. Use plain getter/setters.j [1] https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.md#Element-project Change-Id: Ia50b85b95bfd3710f9fbda2050be5950dd686941 (cherry picked from commit 1dd6324d4b4d9596813b18a44e315295f559ea12) --- .../eclipse/jgit/gitrepo/ManifestParserTest.java | 39 ++++++++++++++++++++++ .../org/eclipse/jgit/gitrepo/ManifestParser.java | 2 ++ .../src/org/eclipse/jgit/gitrepo/RepoProject.java | 26 +++++++++++++++ 3 files changed, 67 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java index 20958a812c..76176fe347 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java @@ -11,6 +11,7 @@ package org.eclipse.jgit.gitrepo; import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -18,7 +19,9 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.net.URI; import java.util.HashSet; +import java.util.Map; import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -138,6 +141,42 @@ public class ManifestParserTest { .collect(Collectors.toSet())); } + @Test + public void testPinProjectWithUpstream() throws Exception { + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + + ManifestParser parser = new ManifestParser(null, null, "master", + "https://git.google.com/", null, null); + parser.read(new ByteArrayInputStream( + xmlContent.toString().getBytes(UTF_8))); + + Map repos = parser.getProjects().stream().collect( + Collectors.toMap(RepoProject::getName, Function.identity())); + assertEquals(2, repos.size()); + + RepoProject foo = repos.get("pin-with-upstream"); + assertEquals("pin-with-upstream", foo.getName()); + assertEquals("9b2fe85c0279f4d5ac69f07ddcd48566c3555405", + foo.getRevision()); + assertEquals("branchX", foo.getUpstream()); + + RepoProject bar = repos.get("pin-without-upstream"); + assertEquals("pin-without-upstream", bar.getName()); + assertEquals("76ce6d91a2e07fdfcbfc8df6970c9e98a98e36a0", + bar.getRevision()); + assertNull(bar.getUpstream()); + } + void testNormalize(String in, String want) { URI got = ManifestParser.normalizeEmptyPath(URI.create(in)); if (!got.toString().equals(want)) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java index 957b3869f2..7402c760c3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java @@ -176,6 +176,8 @@ public class ManifestParser extends DefaultHandler { attributes.getValue("groups")); currentProject .setRecommendShallow(attributes.getValue("clone-depth")); + currentProject + .setUpstream(attributes.getValue("upstream")); break; case "remote": String alias = attributes.getValue("alias"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index 8deb7386a6..aa1af21d23 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -38,6 +38,7 @@ public class RepoProject implements Comparable { private final Set groups; private final List copyfiles; private final List linkfiles; + private String upstream; private String recommendShallow; private String url; private String defaultRevision; @@ -389,6 +390,31 @@ public class RepoProject implements Comparable { this.linkfiles.clear(); } + /** + * Return the upstream attribute of the project + * + * @return the upstream value if present, null otherwise. + * + * @since 6.10 + */ + public String getUpstream() { + return this.upstream; + } + + /** + * Set the upstream attribute of the project + * + * Name of the git ref in which a sha1 can be found, when the revision is a + * sha1. + * + * @param upstream value of the attribute in the manifest + * + * @since 6.10 + */ + void setUpstream(String upstream) { + this.upstream = upstream; + } + private String getPathWithSlash() { if (path.endsWith("/")) { //$NON-NLS-1$ return path; -- cgit v1.2.3 From 784f0baecbbb68f1e136efe862087634d10826eb Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 30 May 2024 14:04:56 -0700 Subject: RepoCommand: Copy manifest upstream into .gitmodules ref field Project entries in the manifest with a specific sha1 as revision can use the "upstream" field to report the ref pointing to that sha1. This information is very valuable for downstream tools, as they can limit their search for a blob to the relevant ref, but it gets lost in the translation to .gitmodules. Save the value of the upstream field when available/relevant in the ref field of the .gitmodules entry. Change-Id: I14a2395925618d5e6b34be85466e32f5ef8fbf6e (cherry picked from commit 48465f84014904edddcdd48258c67bc19555d4c3) --- .../jgit/gitrepo/BareSuperprojectWriterTest.java | 45 +++++++++++ .../org/eclipse/jgit/gitrepo/RepoCommandTest.java | 88 ++++++++++++++++++++++ .../jgit/gitrepo/BareSuperprojectWriter.java | 3 + .../src/org/eclipse/jgit/gitrepo/RepoCommand.java | 1 + 4 files changed, 137 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/BareSuperprojectWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/BareSuperprojectWriterTest.java index c3b93879b2..5065b57840 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/BareSuperprojectWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/BareSuperprojectWriterTest.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.gitrepo; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.nullValue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -22,6 +23,7 @@ import java.util.List; import org.eclipse.jgit.gitrepo.BareSuperprojectWriter.BareWriterConfig; import org.eclipse.jgit.gitrepo.RepoCommand.RemoteReader; import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; @@ -67,6 +69,49 @@ public class BareSuperprojectWriterTest extends RepositoryTestCase { } } + @Test + public void write_setGitModulesContents_pinned() throws Exception { + try (Repository bareRepo = createBareRepository()) { + RepoProject pinWithUpstream = new RepoProject("pinWithUpstream", + "path/x", "cbc0fae7e1911d27e1de37d364698dba4411c78b", + "remote", ""); + pinWithUpstream.setUrl("http://example.com/a"); + pinWithUpstream.setUpstream("branchX"); + + RepoProject pinWithoutUpstream = new RepoProject( + "pinWithoutUpstream", "path/y", + "cbc0fae7e1911d27e1de37d364698dba4411c78b", "remote", ""); + pinWithoutUpstream.setUrl("http://example.com/b"); + + RemoteReader mockRemoteReader = mock(RemoteReader.class); + + BareSuperprojectWriter w = new BareSuperprojectWriter(bareRepo, + null, "refs/heads/master", author, mockRemoteReader, + BareWriterConfig.getDefault(), List.of()); + + RevCommit commit = w + .write(Arrays.asList(pinWithUpstream, pinWithoutUpstream)); + + String contents = readContents(bareRepo, commit, ".gitmodules"); + Config cfg = new Config(); + cfg.fromText(contents); + + assertThat(cfg.getString("submodule", "pinWithUpstream", "path"), + is("path/x")); + assertThat(cfg.getString("submodule", "pinWithUpstream", "url"), + is("http://example.com/a")); + assertThat(cfg.getString("submodule", "pinWithUpstream", "ref"), + is("branchX")); + + assertThat(cfg.getString("submodule", "pinWithoutUpstream", "path"), + is("path/y")); + assertThat(cfg.getString("submodule", "pinWithoutUpstream", "url"), + is("http://example.com/b")); + assertThat(cfg.getString("submodule", "pinWithoutUpstream", "ref"), + nullValue()); + } + } + @Test public void write_setExtraContents() throws Exception { try (Repository bareRepo = createBareRepository()) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java index ca6f2e1053..3162e7910b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/RepoCommandTest.java @@ -1171,6 +1171,94 @@ public class RepoCommandTest extends RepositoryTestCase { } } + @Test + public void testRecordRemoteBranch_pinned() throws Exception { + Repository remoteDb = createBareRepository(); + Repository tempDb = createWorkRepository(); + + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", + xmlContent.toString()); + + RepoCommand command = new RepoCommand(remoteDb); + command.setPath( + tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") + .setURI(rootUri).setRecordRemoteBranch(true).call(); + // Clone it + File directory = createTempDirectory("testBareRepo"); + try (Repository localDb = Git.cloneRepository().setDirectory(directory) + .setURI(remoteDb.getDirectory().toURI().toString()).call() + .getRepository();) { + // The .gitmodules file should exist + File gitmodules = new File(localDb.getWorkTree(), ".gitmodules"); + assertTrue("The .gitmodules file should exist", + gitmodules.exists()); + FileBasedConfig c = new FileBasedConfig(gitmodules, FS.DETECTED); + c.load(); + assertEquals("Pinned submodule with upstream records the ref", + "branchX", c.getString("submodule", "pin-upstream", "ref")); + assertNull("Pinned submodule without upstream don't have ref", + c.getString("submodule", "pin-noupstream", "ref")); + } + } + + @Test + public void testRecordRemoteBranch_pinned_nameConflict() throws Exception { + Repository remoteDb = createBareRepository(); + Repository tempDb = createWorkRepository(); + + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + JGitTestUtil.writeTrashFile(tempDb, "manifest.xml", + xmlContent.toString()); + + RepoCommand command = new RepoCommand(remoteDb); + command.setPath( + tempDb.getWorkTree().getAbsolutePath() + "/manifest.xml") + .setURI(rootUri).setRecordRemoteBranch(true).call(); + // Clone it + File directory = createTempDirectory("testBareRepo"); + try (Repository localDb = Git.cloneRepository().setDirectory(directory) + .setURI(remoteDb.getDirectory().toURI().toString()).call() + .getRepository();) { + // The .gitmodules file should exist + File gitmodules = new File(localDb.getWorkTree(), ".gitmodules"); + assertTrue("The .gitmodules file should exist", + gitmodules.exists()); + FileBasedConfig c = new FileBasedConfig(gitmodules, FS.DETECTED); + c.load(); + assertEquals("Upstream is preserved in name conflict", "branchX", + c.getString("submodule", "pin-upstream/pin-upstream", + "ref")); + assertEquals("Upstream is preserved in name conflict (other side)", + "branchX", c.getString("submodule", + "pin-upstream/pin-upstream-name-conflict", "ref")); + } + } @Test public void testRecordSubmoduleLabels() throws Exception { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java index 3ce97a4ff7..d191e23399 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java @@ -156,6 +156,9 @@ class BareSuperprojectWriter { ObjectId objectId; if (ObjectId.isId(proj.getRevision())) { objectId = ObjectId.fromString(proj.getRevision()); + if (config.recordRemoteBranch && proj.getUpstream() != null) { + cfg.setString("submodule", name, "ref", proj.getUpstream()); + } } else { objectId = callback.sha1(url, proj.getRevision()); if (objectId == null && !config.ignoreRemoteFailures) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index 95c1c8b22e..3aaef387f9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -615,6 +615,7 @@ public class RepoCommand extends GitCommand { p.setUrl(proj.getUrl()); p.addCopyFiles(proj.getCopyFiles()); p.addLinkFiles(proj.getLinkFiles()); + p.setUpstream(proj.getUpstream()); ret.add(p); } } -- cgit v1.2.3 From 4bc6eb8a70281b30e40ebe2fb12927ce2d2640df Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 6 Jun 2024 12:01:04 -0700 Subject: RepoCommand: Add error to ManifestErrorException RepoCommand wraps errors in the manifest in a ManifestErrorException with a fixed message ("Invalid manifest"). Callers like supermanifest plugin cannot return a meaningful error to the client without digging into the cause chain. Add the actual error message to the ManifestErrorException, so callers can rely on #getMessage() to see what happens. Change-Id: I18be17fb5e4aaaf4f11ebd627580a91fe330eaca (cherry picked from commit b41187429359cf9830fd34368d28a454653e187d) --- org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index 3aaef387f9..9979664ceb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -255,7 +255,7 @@ public class RepoCommand extends GitCommand { @SuppressWarnings("serial") static class ManifestErrorException extends GitAPIException { ManifestErrorException(Throwable cause) { - super(RepoText.get().invalidManifest, cause); + super(RepoText.get().invalidManifest + " " + cause.getMessage(), cause); } } -- cgit v1.2.3 From 3d8420ecd83745355a5f4f08541d019032f8bac8 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Thu, 27 Jun 2024 18:05:30 -0700 Subject: Make RepoProject#setUpstream public Applications using JGit such as Gerrit plugins may have their own manifest parsers. They can start using RepoProject to some extent with this change. Eventually, they can be migrated to use the ManifestParser in JGit, however until then, this change can help make the migration incremental. Change-Id: I6a32d4f4622c3842eedf7873cdfed2f1ca998f6f (cherry picked from commit e3e0a1ea35a27e50e0280715a417be7d69fa3345) --- org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index aa1af21d23..3ed0bef317 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -411,7 +411,7 @@ public class RepoProject implements Comparable { * * @since 6.10 */ - void setUpstream(String upstream) { + public void setUpstream(String upstream) { this.upstream = upstream; } -- cgit v1.2.3 From cfdfb01f4c7de1d61a4913deac1d02837b53df82 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Fri, 28 Jun 2024 10:02:05 -0700 Subject: RepoProject: read the 'dest-branch' attribute of a project The manifest spec [1] defines a "dest-branch" attribute. Parse its value and store it in the RepoProject. Also, create a getter/setter for dest-branch. [1] https://gerrit.googlesource.com/git-repo/+/master/docs/manifest-format.md#Element-project Change-Id: I8ad83b0fec59d2b0967864e4de4fefde4ab971ff (cherry picked from commit 47fd412affd8d7578606ae9b3015a911b71b13ed) --- .../eclipse/jgit/gitrepo/ManifestParserTest.java | 30 ++++++++++++++++++++++ org.eclipse.jgit/.settings/.api_filters | 19 ++++++++++++++ .../org/eclipse/jgit/gitrepo/ManifestParser.java | 2 ++ .../src/org/eclipse/jgit/gitrepo/RepoProject.java | 26 +++++++++++++++++++ 4 files changed, 77 insertions(+) create mode 100644 org.eclipse.jgit/.settings/.api_filters diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java index 76176fe347..fca27d32aa 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/gitrepo/ManifestParserTest.java @@ -177,6 +177,36 @@ public class ManifestParserTest { assertNull(bar.getUpstream()); } + @Test + public void testWithDestBranch() throws Exception { + StringBuilder xmlContent = new StringBuilder(); + xmlContent.append("\n") + .append("") + .append("") + .append("") + .append("") + .append("") + .append(""); + + ManifestParser parser = new ManifestParser(null, null, "master", + "https://git.google.com/", null, null); + parser.read(new ByteArrayInputStream( + xmlContent.toString().getBytes(UTF_8))); + + Map repos = parser.getProjects().stream().collect( + Collectors.toMap(RepoProject::getName, Function.identity())); + assertEquals(2, repos.size()); + + RepoProject foo = repos.get("foo"); + assertEquals("foo", foo.getName()); + assertEquals("branchX", foo.getDestBranch()); + + RepoProject bar = repos.get("bar"); + assertEquals("bar", bar.getName()); + assertNull(bar.getDestBranch()); + } + void testNormalize(String in, String want) { URI got = ManifestParser.normalizeEmptyPath(URI.create(in)); if (!got.toString().equals(want)) { diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters new file mode 100644 index 0000000000..50a04d20f0 --- /dev/null +++ b/org.eclipse.jgit/.settings/.api_filters @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java index 7402c760c3..b033177e05 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/ManifestParser.java @@ -178,6 +178,8 @@ public class ManifestParser extends DefaultHandler { .setRecommendShallow(attributes.getValue("clone-depth")); currentProject .setUpstream(attributes.getValue("upstream")); + currentProject + .setDestBranch(attributes.getValue("dest-branch")); break; case "remote": String alias = attributes.getValue("alias"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java index 3ed0bef317..b7a9ac5b73 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoProject.java @@ -39,6 +39,7 @@ public class RepoProject implements Comparable { private final List copyfiles; private final List linkfiles; private String upstream; + private String destBranch; private String recommendShallow; private String url; private String defaultRevision; @@ -401,6 +402,17 @@ public class RepoProject implements Comparable { return this.upstream; } + /** + * Return the dest-branch attribute of the project + * + * @return the dest-branch value if present, null otherwise. + * + * @since 7.0 + */ + public String getDestBranch() { + return this.destBranch; + } + /** * Set the upstream attribute of the project * @@ -415,6 +427,20 @@ public class RepoProject implements Comparable { this.upstream = upstream; } + /** + * Set the dest-branch attribute of the project + * + * Name of a Git branch. + * + * @param destBranch + * value of the attribute in the manifest + * + * @since 7.0 + */ + public void setDestBranch(String destBranch) { + this.destBranch = destBranch; + } + private String getPathWithSlash() { if (path.endsWith("/")) { //$NON-NLS-1$ return path; -- cgit v1.2.3 From e8ad3d0c12c11d0c5455f8be677b2b3fe8edfd0c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 10 Jul 2024 17:46:52 +0200 Subject: JGit v7.0.0.202407101547-m1 Signed-off-by: Matthias Sohn Change-Id: I80b799fc8f8d349ec3edb156e81593233013ae8b --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF.orig | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 90 files changed, 124 insertions(+), 124 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7c079a5899..4341d4330b 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index be954bd8e0..b93eba0ef7 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index b6b52e595e..cce1686ed0 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 22f8aff82c..fedf136e7b 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7c3edf475c..c782820bd7 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index e1a3671819..3a7fc7e807 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 322f52f9f4..9092ffbe16 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 054aa59429..a2ba477529 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index d8a616f09e..cc989833f6 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 1fe5318660..637b299feb 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.test - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 27510e2095..82a4e30ed9 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index d865b13901..14ca035320 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 9749ac1111..4434fee29e 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 0733a68ba0..1795da320a 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f4dce68fab..6848b56dce 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c1ec7ae7c8..b5d9a91991 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index d29d3879d5..0756adb9dd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51a79d61ef..00eef2a1da 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 124129d73d..5895616461 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index bbb29cd846..6bc4e4271d 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 7645dd1418..7d44263416 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index edce2d8d27..ae355523d0 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 01ee7824ca..9007775319 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3e983511d5..1b6a4f0a67 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index cfeb426385..3a3f982d7b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 67c82652cb..c907c92de1 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index a3777ffdda..1eb74dd30c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig index e83582843e..fa79080b8c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index a7ca6336b8..5adfd03887 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2a885f204e..f13a83d661 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index af1cbf256a..3d728c4be5 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 149ad00121..62fc277967 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c33cb29b66..6f92b4cbcb 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 8e41ee3d28..8d4a841a77 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 49c1023ef0..8b6223c6da 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index a59c82ed1a..7ab8289184 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 2cf86bc942..90461d9007 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index befaa367de..8be77f14a7 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 96c8953398..f0dbfd237c 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2c109c90ee..7ca184f88f 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f4c1e566a4..8f51e702a9 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index a048aa1738..7fe2f37568 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 62508e245f..6e00d73bd4 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 3dd7b10079..8f442c757f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index ea66a2383c..c3a7a71810 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 23fdd235cb..2782b4a2f6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index fc1bf49989..d4102d8b49 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 92262a00be..1dd9f34e76 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 3344dcbb1b..94349491b3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 6f03419cb7..d09ee0086d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 45162c97a7..279d82bd67 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8eacae1fe7..f6b8c8cee6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 287a723b9c..e98874e386 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 179eab8a6b..07ccadfeac 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index cbb8e4fafc..8eae96b6c3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 61b5dd6031..174244b15b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 4c0068bfab..474b9dbbcb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 12ab06937a..7e7214de4c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 209274feeb..d9e7218024 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 1d82d4a1cc..11cf514180 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index ff46d9e65d..5e42552d42 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index c4d4fcf825..47aaafdf0f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 4274c94ac3..c693f02e72 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 955c5c04b5..2d65efd322 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 90090d6958..775723561f 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index bb0c23dd72..0c97fc6273 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 8bb1b64622..50f93acb53 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 7cd76c3011..d13c655ba7 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index ad0164086a..8236fbf4e8 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 684ab70f86..369fdc9ea5 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index f407ce11bf..70558928f7 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 1ac232a306..4c3632a02d 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 967b781d10..e30c4d2b20 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index aa50fdd8ce..40bf2b6b6d 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index bb0d79b3d5..6c85a52512 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 7cc3a55b26..0fa70a7bb7 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 3bf4edd65f..c97d847425 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 761b6c4aef..c43884abb8 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 9da7452428..6cbe43b2eb 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 1dc0e01964..0ef2f69f14 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index a3db63ca23..23fc3097d9 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index ab70d68a3f..37423930e9 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 05f7c08bd2..053dc63a1d 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 04bda44748..335b8332dc 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 8170fc6bd2..471baecf61 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 6d1e2676af..f89f99c4de 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d6c0ba5dcc..400ca0521d 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407101547-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 7531018bc3..57dd030182 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407101547-m1 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202407101547-m1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 3c6c38992c..22da3d723c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 7a07a3c8a6..99d7900a3f 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0-SNAPSHOT + 7.0.0.202407101547-m1 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 2ea9ccf3e8ccc6603fa13336903b453bb5c140d4 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 1 Jul 2024 12:24:36 -0700 Subject: DfsPackFile: Enable/disable object size index via DfsReaderOptions DfsPackFile always uses the object size index if available. That is the desired final state, but for a safe rollout, we should be able to disable using the object size index. Add an option (dfs.useObjectSizeIndex) to enable/disable the usage of the object size index. False by default. This changes the default from true to false. It only makes a different for the DFS stack when writing of the index was explicitely enabled. This is an optimization, so it shouldn't cause any regression. Operators can restore previous behaviour setting "dfs.useObjectSizeIndex" to true. Change-Id: I44bf5a57e3942a4ecfe66d58bfa9175e99f96fcc --- .../storage/dfs/DfsGarbageCollectorTest.java | 3 +++ .../jgit/internal/storage/dfs/DfsInserterTest.java | 1 + .../jgit/internal/storage/dfs/DfsPackFileTest.java | 1 + .../internal/storage/dfs/DfsPackParserTest.java | 1 + .../jgit/internal/storage/dfs/DfsReaderTest.java | 2 ++ .../jgit/internal/storage/dfs/DfsPackFile.java | 1 + .../internal/storage/dfs/DfsReaderOptions.java | 29 ++++++++++++++++++++++ .../src/org/eclipse/jgit/lib/ConfigConstants.java | 7 ++++++ 8 files changed, 45 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java index e193de9764..2be11d32ea 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java @@ -18,6 +18,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collections; import java.util.concurrent.TimeUnit; + import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; import org.eclipse.jgit.internal.storage.commitgraph.CommitGraphWriter; import org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource; @@ -1171,6 +1172,7 @@ public class DfsGarbageCollectorTest { gcWithObjectSizeIndex(10); + odb.getReaderOptions().setUseObjectSizeIndex(true); DfsReader reader = odb.newReader(); DfsPackFile gcPack = findFirstBySource(odb.getPacks(), GC); assertTrue(gcPack.hasObjectSizeIndex(reader)); @@ -1191,6 +1193,7 @@ public class DfsGarbageCollectorTest { gcWithObjectSizeIndex(10); + odb.getReaderOptions().setUseObjectSizeIndex(true); DfsReader reader = odb.newReader(); DfsPackFile gcPack = findFirstBySource(odb.getPacks(), GC); assertTrue(gcPack.hasObjectSizeIndex(reader)); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsInserterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsInserterTest.java index b84a0b00ae..0b558edf2c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsInserterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsInserterTest.java @@ -295,6 +295,7 @@ public class DfsInserterTest { public void testObjectSizeIndexOnInsert() throws IOException { db.getConfig().setInt(CONFIG_PACK_SECTION, null, CONFIG_KEY_MIN_BYTES_OBJ_SIZE_INDEX, 0); + db.getObjectDatabase().getReaderOptions().setUseObjectSizeIndex(true); byte[] contents = Constants.encode("foo"); ObjectId fooId; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java index d21e51f276..bc851f8dde 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java @@ -126,6 +126,7 @@ public class DfsPackFileTest { setObjectSizeIndexMinBytes(0); ObjectId blobId = setupPack(512, 800); + db.getObjectDatabase().getReaderOptions().setUseObjectSizeIndex(true); DfsReader reader = db.getObjectDatabase().newReader(); DfsPackFile pack = db.getObjectDatabase().getPacks()[0]; assertTrue(pack.hasObjectSizeIndex(reader)); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackParserTest.java index 130af27773..c1cd231c66 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackParserTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackParserTest.java @@ -61,6 +61,7 @@ public class DfsPackParserTest { ins.flush(); } + repo.getObjectDatabase().getReaderOptions().setUseObjectSizeIndex(true); DfsReader reader = repo.getObjectDatabase().newReader(); PackList packList = repo.getObjectDatabase().getPackList(); assertEquals(1, packList.packs.length); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsReaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsReaderTest.java index 254184ee80..a0c228906e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsReaderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsReaderTest.java @@ -37,6 +37,8 @@ public class DfsReaderTest { @Before public void setUp() { db = new InMemoryRepository(new DfsRepositoryDescription("test")); + // These tests assume the object size index is enabled. + db.getObjectDatabase().getReaderOptions().setUseObjectSizeIndex(true); } @Test diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java index 3e4d4d300c..b94a84a41c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java @@ -354,6 +354,7 @@ public final class DfsPackFile extends BlockBasedFile { } if (objectSizeIndexLoadAttempted + || !ctx.getOptions().shouldUseObjectSizeIndex() || !desc.hasFileExt(OBJECT_SIZE_INDEX)) { // Pack doesn't have object size index return null; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java index f2ac461deb..5f5e81977b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java @@ -15,6 +15,7 @@ import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_DELTA_BASE_CACHE_LIMIT; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_BUFFER; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_THRESHOLD; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_USE_OBJECT_SIZE_INDEX; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.storage.pack.PackConfig; @@ -36,6 +37,8 @@ public class DfsReaderOptions { private boolean loadRevIndexInParallel; + private boolean useObjectSizeIndex; + /** * Create a default reader configuration. */ @@ -136,6 +139,28 @@ public class DfsReaderOptions { return this; } + /** + * Use the object size index if available. + * + * @return true if the reader should try to use the object size index. if + * false, the reader ignores that index. + */ + public boolean shouldUseObjectSizeIndex() { + return useObjectSizeIndex; + } + + /** + * Set if the reader should try to use the object size index + * + * @param useObjectSizeIndex true to use it, false to ignore the object size index + * + * @return {@code this} + */ + public DfsReaderOptions setUseObjectSizeIndex(boolean useObjectSizeIndex) { + this.useObjectSizeIndex = useObjectSizeIndex; + return this; + } + /** * Update properties by setting fields from the configuration. *

@@ -168,6 +193,10 @@ public class DfsReaderOptions { CONFIG_DFS_SECTION, CONFIG_KEY_STREAM_BUFFER, getStreamPackBufferSize())); + + setUseObjectSizeIndex(rc.getBoolean(CONFIG_CORE_SECTION, + CONFIG_DFS_SECTION, CONFIG_KEY_USE_OBJECT_SIZE_INDEX, + false)); return this; } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 0edf3c5ad0..e9fbc65696 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -1012,4 +1012,11 @@ public final class ConfigConstants { * @since 6.7 */ public static final String CONFIG_KEY_READ_CHANGED_PATHS = "readChangedPaths"; + + /** + * The "useObjectSizeIndex" key + * + * @since 7.0 + */ + public static final String CONFIG_KEY_USE_OBJECT_SIZE_INDEX = "useObjectSizeIndex"; } -- cgit v1.2.3 From ebf600dc9f6bcb65b9b48c6c273544e74428c286 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 11 Jul 2024 15:48:05 -0700 Subject: ssh: Remove .orig file This temporal file sneaked into the repo in [1]. [1] https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1196934 Change-Id: I840244fb237f592bd6ed3075d61085d125d32d7e --- .../META-INF/MANIFEST.MF.orig | 104 --------------------- 1 file changed, 104 deletions(-) delete mode 100644 org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig deleted file mode 100644 index e83582843e..0000000000 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig +++ /dev/null @@ -1,104 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name -Automatic-Module-Name: org.eclipse.jgit.junit.ssh -Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.qualifier -Bundle-Localization: OSGI-INF/l10n/plugin -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -<<<<<<< HEAD -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)", - org.apache.sshd.server.command;version="[2.12.0,2.13.0)", - org.apache.sshd.server.session;version="[2.12.0,2.13.0)", - org.apache.sshd.server.shell;version="[2.12.0,2.13.0)", - org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", -||||||| parent of 9724f9467f (Update org.apache.sshd to 2.13.1) -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)", - org.apache.sshd.server.command;version="[2.12.0,2.13.0)", - org.apache.sshd.server.session;version="[2.12.0,2.13.0)", - org.apache.sshd.server.shell;version="[2.12.0,2.13.0)", - org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", -======= -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.sshd.common;version="[2.13.0,2.14.0)", - org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", - org.apache.sshd.common.file.virtualfs;version="[2.13.0,2.14.0)", - org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", - org.apache.sshd.common.io;version="[2.13.0,2.14.0)", - org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", - org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", - org.apache.sshd.common.session;version="[2.13.0,2.14.0)", - org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.threads;version="[2.13.0,2.14.0)", - org.apache.sshd.core;version="[2.13.0,2.14.0)", - org.apache.sshd.server;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.gss;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.keyboard;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.password;version="[2.13.0,2.14.0)", - org.apache.sshd.server.command;version="[2.13.0,2.14.0)", - org.apache.sshd.server.session;version="[2.13.0,2.14.0)", - org.apache.sshd.server.shell;version="[2.13.0,2.14.0)", - org.apache.sshd.server.subsystem;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp.server;version="[2.13.0,2.14.0)", ->>>>>>> 9724f9467f (Update org.apache.sshd to 2.13.1) - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.junit;version="[4.13,5.0.0)", - org.junit.experimental.theories;version="[4.13,5.0.0)", - org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.0" -- cgit v1.2.3 From b343442bdb8333ec31d4a17a82bb6e02aee3fbe6 Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Fri, 7 Jun 2024 16:12:18 -0700 Subject: DfsBlockCacheConfig: support configurations for dfs cache tables per extensions Parse configurations for tables containing a set of extensions, defined in [core "dfs.*"] sections. Parse configurations for cache tables according to configurations defined in [core "dfs.*"] git config sections for sets of extensions. The current [core "dfs"] is the default to any extension not listed in any other table. Configuration falls back to the defaults defined in the DfsBlockCacheConfig.java file when not set on each cache table configuration. Sample format for individual cache tables: In this example: 1. PACK types would go to the "default" table 2. INDEX and BITMAP_INDEX types would go to the "multipleExtensionCache" table 3. REFTABLE types would go to the "reftableCache" table [core "dfs"] // Configuration for the "default" cache table. blockSize = 512 blockLimit = 100 concurrencyLevel = 5 (...) [core "dfs.multipleExtensionCache"] packExtensions = "INDEX BITMAP_INDEX" blockSize = 512 blockLimit = 100 concurrencyLevel = 5 (...) [core "dfs.reftableCache"] packExtensions = "REFTABLE" blockSize = 512 blockLimit = 100 concurrencyLevel = 5 (...) Change-Id: I0e534e6d78b684832e3d3d269cee2590aa0f1911 --- .../storage/dfs/DfsBlockCacheConfigTest.java | 159 ++++++++++++++++ .../org/eclipse/jgit/internal/JGitText.properties | 4 + .../src/org/eclipse/jgit/internal/JGitText.java | 4 + .../internal/storage/dfs/DfsBlockCacheConfig.java | 199 +++++++++++++++++---- .../src/org/eclipse/jgit/lib/ConfigConstants.java | 10 ++ 5 files changed, 342 insertions(+), 34 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java index 2df0ba1b05..6ca0ff6a16 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java @@ -38,11 +38,27 @@ package org.eclipse.jgit.internal.storage.dfs; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_CACHE_PREFIX; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_LIMIT; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_SIZE; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONCURRENCY_LEVEL; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PACK_EXTENSIONS; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_RATIO; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.closeTo; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThrows; +import java.util.List; +import java.util.stream.Collectors; + import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.DfsBlockCachePackExtConfig; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.lib.Config; import org.junit.Test; public class DfsBlockCacheConfigTest { @@ -80,4 +96,147 @@ public class DfsBlockCacheConfigTest { assertThat(config.getBlockSize(), is(65536)); } + + @Test + public void fromConfigs() { + Config config = new Config(); + config.setLong(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_BLOCK_LIMIT, 50 * 1024); + config.setInt(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_BLOCK_SIZE, 1024); + config.setInt(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_CONCURRENCY_LEVEL, 3); + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_STREAM_RATIO, "0.5"); + + DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig() + .fromConfig(config); + assertThat(cacheConfig.getBlockLimit(), is(50L * 1024L)); + assertThat(cacheConfig.getBlockSize(), is(1024)); + assertThat(cacheConfig.getConcurrencyLevel(), is(3)); + assertThat(cacheConfig.getStreamRatio(), closeTo(0.5, 0.0001)); + } + + @Test + public void fromConfig_blockLimitNotAMultipleOfBlockSize_throws() { + Config config = new Config(); + config.setLong(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_BLOCK_LIMIT, 1025); + config.setInt(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_BLOCK_SIZE, 1024); + + assertThrows(IllegalArgumentException.class, + () -> new DfsBlockCacheConfig().fromConfig(config)); + } + + @Test + public void fromConfig_streamRatioInvalidFormat_throws() { + Config config = new Config(); + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_STREAM_RATIO, "0.a5"); + + assertThrows(IllegalArgumentException.class, + () -> new DfsBlockCacheConfig().fromConfig(config)); + } + + @Test + public void fromConfig_generatesDfsBlockCachePackExtConfigs() { + Config config = new Config(); + addPackExtConfigEntry(config, "pack", List.of(PackExt.PACK), + /* blockLimit= */ 20 * 512, /* blockSize= */ 512); + + addPackExtConfigEntry(config, "bitmap", List.of(PackExt.BITMAP_INDEX), + /* blockLimit= */ 25 * 1024, /* blockSize= */ 1024); + + addPackExtConfigEntry(config, "index", + List.of(PackExt.INDEX, PackExt.OBJECT_SIZE_INDEX, + PackExt.REVERSE_INDEX), + /* blockLimit= */ 30 * 1024, /* blockSize= */ 1024); + + DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig() + .fromConfig(config); + var configs = cacheConfig.getPackExtCacheConfigurations(); + assertThat(configs, hasSize(3)); + var packConfig = getConfigForExt(configs, PackExt.PACK); + assertThat(packConfig.getBlockLimit(), is(20L * 512L)); + assertThat(packConfig.getBlockSize(), is(512)); + + var bitmapConfig = getConfigForExt(configs, PackExt.BITMAP_INDEX); + assertThat(bitmapConfig.getBlockLimit(), is(25L * 1024L)); + assertThat(bitmapConfig.getBlockSize(), is(1024)); + + var indexConfig = getConfigForExt(configs, PackExt.INDEX); + assertThat(indexConfig.getBlockLimit(), is(30L * 1024L)); + assertThat(indexConfig.getBlockSize(), is(1024)); + assertThat(getConfigForExt(configs, PackExt.OBJECT_SIZE_INDEX), + is(indexConfig)); + assertThat(getConfigForExt(configs, PackExt.REVERSE_INDEX), + is(indexConfig)); + } + + @Test + public void fromConfigs_dfsBlockCachePackExtConfigWithDuplicateExtensions_throws() { + Config config = new Config(); + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_CACHE_PREFIX + "pack1", + CONFIG_KEY_PACK_EXTENSIONS, PackExt.PACK.name()); + + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_CACHE_PREFIX + "pack2", + CONFIG_KEY_PACK_EXTENSIONS, PackExt.PACK.name()); + + assertThrows(IllegalArgumentException.class, + () -> new DfsBlockCacheConfig().fromConfig(config)); + } + + @Test + public void fromConfigs_dfsBlockCachePackExtConfigWithEmptyExtensions_throws() { + Config config = new Config(); + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_CACHE_PREFIX + "pack1", + CONFIG_KEY_PACK_EXTENSIONS, ""); + + assertThrows(IllegalArgumentException.class, + () -> new DfsBlockCacheConfig().fromConfig(config)); + } + + @Test + public void fromConfigs_dfsBlockCachePackExtConfigWithNoExtensions_throws() { + Config config = new Config(); + config.setInt(CONFIG_CORE_SECTION, CONFIG_DFS_CACHE_PREFIX + "pack1", + CONFIG_KEY_BLOCK_SIZE, 0); + + assertThrows(IllegalArgumentException.class, + () -> new DfsBlockCacheConfig().fromConfig(config)); + } + + @Test + public void fromConfigs_dfsBlockCachePackExtConfigWithUnknownExtensions_throws() { + Config config = new Config(); + config.setString(CONFIG_CORE_SECTION, + CONFIG_DFS_CACHE_PREFIX + "unknownExt", + CONFIG_KEY_PACK_EXTENSIONS, "NotAKnownExt"); + + assertThrows(IllegalArgumentException.class, + () -> new DfsBlockCacheConfig().fromConfig(config)); + } + + private static void addPackExtConfigEntry(Config config, String configName, + List packExts, long blockLimit, int blockSize) { + String packExtConfigName = CONFIG_DFS_CACHE_PREFIX + configName; + config.setString(CONFIG_CORE_SECTION, packExtConfigName, + CONFIG_KEY_PACK_EXTENSIONS, packExts.stream().map(PackExt::name) + .collect(Collectors.joining(" "))); + config.setLong(CONFIG_CORE_SECTION, packExtConfigName, + CONFIG_KEY_BLOCK_LIMIT, blockLimit); + config.setInt(CONFIG_CORE_SECTION, packExtConfigName, + CONFIG_KEY_BLOCK_SIZE, blockSize); + } + + private static DfsBlockCacheConfig getConfigForExt( + List configs, PackExt packExt) { + for (DfsBlockCachePackExtConfig config : configs) { + if (config.getPackExts().contains(packExt)) { + return config.getPackExtCacheConfiguration(); + } + } + return null; + } } diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 19c90086aa..9d12facb33 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -285,6 +285,7 @@ DIRCUnrecognizedExtendedFlags=Unrecognized extended flags: {0} downloadCancelled=Download cancelled downloadCancelledDuringIndexing=Download cancelled during indexing duplicateAdvertisementsOf=duplicate advertisements of {0} +duplicatePackExtensionsSet=Attempting to configure duplicate pack extensions: {0}.{1}.{2} contains {3} duplicateRef=Duplicate ref: {0} duplicateRefAttribute=Duplicate ref attribute: {0} duplicateRemoteRefUpdateIsIllegal=Duplicate remote ref update is illegal. Affected remote name: {0} @@ -539,6 +540,8 @@ noMergeBase=No merge base could be determined. Reason={0}. {1} noMergeHeadSpecified=No merge head specified nonBareLinkFilesNotSupported=Link files are not supported with nonbare repos nonCommitToHeads=Cannot point a branch to a non-commit object +noPackExtConfigurationGiven=No PackExt configuration given +noPackExtGivenForConfiguration=No PackExt given for configuration noPathAttributesFound=No Attributes found for {0}. noSuchRef=no such ref noSuchRefKnown=no such ref: {0} @@ -829,6 +832,7 @@ unknownObject=unknown object unknownObjectInIndex=unknown object {0} found in index but not in pack file unknownObjectType=Unknown object type {0}. unknownObjectType2=unknown +unknownPackExtension=Unknown pack extension: {0}.{1}.{2}={3} unknownPositionEncoding=Unknown position encoding %s unknownRefStorageFormat=Unknown ref storage format "{0}" unknownRepositoryFormat=Unknown repository format diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 700b54a7a6..311d9c22aa 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -315,6 +315,7 @@ public class JGitText extends TranslationBundle { /***/ public String downloadCancelled; /***/ public String downloadCancelledDuringIndexing; /***/ public String duplicateAdvertisementsOf; + /***/ public String duplicatePackExtensionsSet; /***/ public String duplicateRef; /***/ public String duplicateRefAttribute; /***/ public String duplicateRemoteRefUpdateIsIllegal; @@ -569,6 +570,8 @@ public class JGitText extends TranslationBundle { /***/ public String noMergeHeadSpecified; /***/ public String nonBareLinkFilesNotSupported; /***/ public String nonCommitToHeads; + /***/ public String noPackExtConfigurationGiven; + /***/ public String noPackExtGivenForConfiguration; /***/ public String noPathAttributesFound; /***/ public String noSuchRef; /***/ public String noSuchRefKnown; @@ -858,6 +861,7 @@ public class JGitText extends TranslationBundle { /***/ public String unknownObjectInIndex; /***/ public String unknownObjectType; /***/ public String unknownObjectType2; + /***/ public String unknownPackExtension; /***/ public String unknownPositionEncoding; /***/ public String unknownRefStorageFormat; /***/ public String unknownRepositoryFormat; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index 77273cec61..fa86701de8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -11,17 +11,25 @@ package org.eclipse.jgit.internal.storage.dfs; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_CACHE_PREFIX; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_LIMIT; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BLOCK_SIZE; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONCURRENCY_LEVEL; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PACK_EXTENSIONS; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_RATIO; import java.text.MessageFormat; import java.time.Duration; +import java.util.ArrayList; import java.util.Collections; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.List; import java.util.Map; +import java.util.Set; import java.util.function.Consumer; +import java.util.stream.Collectors; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.PackExt; @@ -42,15 +50,21 @@ public class DfsBlockCacheConfig { public static final int DEFAULT_CACHE_HOT_MAX = 1; private long blockLimit; + private int blockSize; + private double streamRatio; + private int concurrencyLevel; private Consumer refLock; + private Map cacheHotMap; private IndexEventConsumer indexEventConsumer; + private List packExtCacheConfigurations; + /** * Create a default configuration. */ @@ -60,6 +74,7 @@ public class DfsBlockCacheConfig { setStreamRatio(0.30); setConcurrencyLevel(32); cacheHotMap = Collections.emptyMap(); + packExtCacheConfigurations = Collections.emptyList(); } /** @@ -77,10 +92,10 @@ public class DfsBlockCacheConfig { * Set maximum number bytes of heap memory to dedicate to caching pack file * data. *

- * It is strongly recommended to set the block limit to be an integer multiple - * of the block size. This constraint is not enforced by this method (since - * it may be called before {@link #setBlockSize(int)}), but it is enforced by - * {@link #fromConfig(Config)}. + * It is strongly recommended to set the block limit to be an integer + * multiple of the block size. This constraint is not enforced by this + * method (since it may be called before {@link #setBlockSize(int)}), but it + * is enforced by {@link #fromConfig(Config)}. * * @param newLimit * maximum number bytes of heap memory to dedicate to caching @@ -89,9 +104,9 @@ public class DfsBlockCacheConfig { */ public DfsBlockCacheConfig setBlockLimit(long newLimit) { if (newLimit <= 0) { - throw new IllegalArgumentException(MessageFormat.format( - JGitText.get().blockLimitNotPositive, - Long.valueOf(newLimit))); + throw new IllegalArgumentException( + MessageFormat.format(JGitText.get().blockLimitNotPositive, + Long.valueOf(newLimit))); } blockLimit = newLimit; return this; @@ -239,62 +254,101 @@ public class DfsBlockCacheConfig { return this; } + /** + * Get the list of pack ext cache configs. + * + * @return the list of pack ext cache configs. + */ + List getPackExtCacheConfigurations() { + return packExtCacheConfigurations; + } + /** * Update properties by setting fields from the configuration. *

* If a property is not defined in the configuration, then it is left * unmodified. *

- * Enforces certain constraints on the combination of settings in the config, - * for example that the block limit is a multiple of the block size. + * Enforces certain constraints on the combination of settings in the + * config, for example that the block limit is a multiple of the block size. * * @param rc * configuration to read properties from. * @return {@code this} */ public DfsBlockCacheConfig fromConfig(Config rc) { - long cfgBlockLimit = rc.getLong( - CONFIG_CORE_SECTION, - CONFIG_DFS_SECTION, - CONFIG_KEY_BLOCK_LIMIT, - getBlockLimit()); - int cfgBlockSize = rc.getInt( - CONFIG_CORE_SECTION, - CONFIG_DFS_SECTION, - CONFIG_KEY_BLOCK_SIZE, + fromConfig(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, rc); + loadPackExtConfigs(rc); + return this; + } + + private void fromConfig(String section, String subSection, Config rc) { + long cfgBlockLimit = rc.getLong(section, subSection, + CONFIG_KEY_BLOCK_LIMIT, getBlockLimit()); + int cfgBlockSize = rc.getInt(section, subSection, CONFIG_KEY_BLOCK_SIZE, getBlockSize()); if (cfgBlockLimit % cfgBlockSize != 0) { throw new IllegalArgumentException(MessageFormat.format( JGitText.get().blockLimitNotMultipleOfBlockSize, - Long.valueOf(cfgBlockLimit), - Long.valueOf(cfgBlockSize))); + Long.valueOf(cfgBlockLimit), Long.valueOf(cfgBlockSize))); } setBlockLimit(cfgBlockLimit); setBlockSize(cfgBlockSize); - setConcurrencyLevel(rc.getInt( - CONFIG_CORE_SECTION, - CONFIG_DFS_SECTION, - CONFIG_KEY_CONCURRENCY_LEVEL, - getConcurrencyLevel())); + setConcurrencyLevel(rc.getInt(section, subSection, + CONFIG_KEY_CONCURRENCY_LEVEL, getConcurrencyLevel())); - String v = rc.getString( - CONFIG_CORE_SECTION, - CONFIG_DFS_SECTION, - CONFIG_KEY_STREAM_RATIO); + String v = rc.getString(section, subSection, CONFIG_KEY_STREAM_RATIO); if (v != null) { try { setStreamRatio(Double.parseDouble(v)); } catch (NumberFormatException e) { throw new IllegalArgumentException(MessageFormat.format( - JGitText.get().enumValueNotSupported3, - CONFIG_CORE_SECTION, - CONFIG_DFS_SECTION, - CONFIG_KEY_STREAM_RATIO, v), e); + JGitText.get().enumValueNotSupported3, section, + subSection, CONFIG_KEY_STREAM_RATIO, v), e); } } - return this; + } + + private void loadPackExtConfigs(Config config) { + List subSections = config.getSubsections(CONFIG_CORE_SECTION) + .stream() + .filter(section -> section.startsWith(CONFIG_DFS_CACHE_PREFIX)) + .collect(Collectors.toList()); + if (subSections.size() == 0) { + return; + } + ArrayList cacheConfigs = new ArrayList<>(); + Set extensionsSeen = new HashSet<>(); + for (String subSection : subSections) { + var cacheConfig = DfsBlockCachePackExtConfig.fromConfig(config, + CONFIG_CORE_SECTION, subSection); + Set packExtsDuplicates = intersection(extensionsSeen, + cacheConfig.packExts); + if (packExtsDuplicates.size() > 0) { + String duplicatePackExts = packExtsDuplicates.stream() + .map(PackExt::toString) + .collect(Collectors.joining(",")); + throw new IllegalArgumentException(MessageFormat.format( + JGitText.get().duplicatePackExtensionsSet, + CONFIG_CORE_SECTION, subSection, + CONFIG_KEY_PACK_EXTENSIONS, duplicatePackExts)); + } + extensionsSeen.addAll(cacheConfig.packExts); + cacheConfigs.add(cacheConfig); + } + packExtCacheConfigurations = cacheConfigs; + } + + private static Set intersection(Set first, Set second) { + Set ret = new HashSet<>(); + for (T entry : second) { + if (first.contains(entry)) { + ret.add(entry); + } + } + return ret; } /** Consumer of DfsBlockCache loading and eviction events for indexes. */ @@ -346,4 +400,81 @@ public class DfsBlockCacheConfig { return false; } } + + /** + * A configuration for a single cache table storing 1 or more Pack + * extensions. + *

+ * The current pack ext cache tables implementation supports the same + * parameters the ClockBlockCacheTable (current default implementation). + *

+ * Configuration falls back to the defaults coded values defined in the + * {@link DfsBlockCacheConfig} when not set on each cache table + * configuration and NOT the values of the basic dfs section. + *

+ * + * + * Format: + * [core "dfs.packCache"] + * packExtensions = "PACK" + * blockSize = 512 + * blockLimit = 100 + * concurrencyLevel = 5 + * + * [core "dfs.multipleExtensionCache"] + * packExtensions = "INDEX REFTABLE BITMAP_INDEX" + * blockSize = 512 + * blockLimit = 100 + * concurrencyLevel = 5 + * + */ + static class DfsBlockCachePackExtConfig { + // Set of pack extensions that will map to the cache instance. + private final EnumSet packExts; + + // Configuration for the cache instance. + private final DfsBlockCacheConfig packExtCacheConfiguration; + + private DfsBlockCachePackExtConfig(EnumSet packExts, + DfsBlockCacheConfig packExtCacheConfiguration) { + this.packExts = packExts; + this.packExtCacheConfiguration = packExtCacheConfiguration; + } + + Set getPackExts() { + return packExts; + } + + DfsBlockCacheConfig getPackExtCacheConfiguration() { + return packExtCacheConfiguration; + } + + private static DfsBlockCachePackExtConfig fromConfig(Config config, + String section, String subSection) { + String packExtensions = config.getString(section, subSection, + CONFIG_KEY_PACK_EXTENSIONS); + if (packExtensions == null) { + throw new IllegalArgumentException( + JGitText.get().noPackExtGivenForConfiguration); + } + String[] extensions = packExtensions.split(" ", -1); + Set packExts = new HashSet<>(extensions.length); + for (String extension : extensions) { + try { + packExts.add(PackExt.valueOf(extension)); + } catch (IllegalArgumentException e) { + throw new IllegalArgumentException(MessageFormat.format( + JGitText.get().unknownPackExtension, section, + subSection, CONFIG_KEY_PACK_EXTENSIONS, extension), + e); + } + } + + DfsBlockCacheConfig dfsBlockCacheConfig = new DfsBlockCacheConfig(); + dfsBlockCacheConfig.fromConfig(section, subSection, config); + return new DfsBlockCachePackExtConfig(EnumSet.copyOf(packExts), + dfsBlockCacheConfig); + } + + } } \ No newline at end of file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 0edf3c5ad0..61db6a0762 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -77,6 +77,9 @@ public final class ConfigConstants { /** The "dfs" section */ public static final String CONFIG_DFS_SECTION = "dfs"; + /** The dfs cache subsection prefix */ + public static final String CONFIG_DFS_CACHE_PREFIX = "dfs."; + /** * The "receive" section * @since 4.6 @@ -331,6 +334,13 @@ public final class ConfigConstants { /** The "deltaBaseCacheLimit" key */ public static final String CONFIG_KEY_DELTA_BASE_CACHE_LIMIT = "deltaBaseCacheLimit"; + /** + * The "packExtensions" key + * + * @since 7.0 + **/ + public static final String CONFIG_KEY_PACK_EXTENSIONS = "packExtensions"; + /** * The "symlinks" key * @since 3.3 -- cgit v1.2.3 From 075f28d3d18b39fd4e67d33b730658ee165abc1a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 14 Jul 2024 22:38:03 +0200 Subject: Prepare 7.0.0-SNAPSHOT builds Change-Id: I18015892edc81cd42456a6eacb49607930070be9 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF.orig | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 90 files changed, 124 insertions(+), 124 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 4341d4330b..7c079a5899 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index b93eba0ef7..be954bd8e0 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index cce1686ed0..b6b52e595e 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index fedf136e7b..22f8aff82c 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index c782820bd7..7c3edf475c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 3a7fc7e807..e1a3671819 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 9092ffbe16..322f52f9f4 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index a2ba477529..054aa59429 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index cc989833f6..d8a616f09e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 637b299feb..1fe5318660 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 82a4e30ed9..27510e2095 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 14ca035320..d865b13901 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 4434fee29e..9749ac1111 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 1795da320a..0733a68ba0 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 6848b56dce..f4dce68fab 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index b5d9a91991..c1ec7ae7c8 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 0756adb9dd..d29d3879d5 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 00eef2a1da..51a79d61ef 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 5895616461..124129d73d 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 6bc4e4271d..bbb29cd846 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 7d44263416..7645dd1418 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index ae355523d0..edce2d8d27 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9007775319..01ee7824ca 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 1b6a4f0a67..3e983511d5 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 3a3f982d7b..cfeb426385 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c907c92de1..67c82652cb 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 1eb74dd30c..a3777ffdda 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig index fa79080b8c..e83582843e 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF.orig @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 5adfd03887..a7ca6336b8 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index f13a83d661..2a885f204e 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 3d728c4be5..af1cbf256a 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 62fc277967..149ad00121 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 6f92b4cbcb..c33cb29b66 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 8d4a841a77..8e41ee3d28 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 8b6223c6da..49c1023ef0 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 7ab8289184..a59c82ed1a 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 90461d9007..2cf86bc942 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 8be77f14a7..befaa367de 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index f0dbfd237c..96c8953398 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 7ca184f88f..2c109c90ee 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 8f51e702a9..f4c1e566a4 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 7fe2f37568..a048aa1738 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 6e00d73bd4..62508e245f 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 8f442c757f..3dd7b10079 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index c3a7a71810..ea66a2383c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 2782b4a2f6..23fdd235cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index d4102d8b49..fc1bf49989 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 1dd9f34e76..92262a00be 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 94349491b3..3344dcbb1b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index d09ee0086d..6f03419cb7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 279d82bd67..45162c97a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index f6b8c8cee6..8eacae1fe7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index e98874e386..287a723b9c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 07ccadfeac..179eab8a6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 8eae96b6c3..cbb8e4fafc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 174244b15b..61b5dd6031 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 474b9dbbcb..4c0068bfab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 7e7214de4c..12ab06937a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index d9e7218024..209274feeb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 11cf514180..1d82d4a1cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 5e42552d42..ff46d9e65d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 47aaafdf0f..c4d4fcf825 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index c693f02e72..4274c94ac3 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 2d65efd322..955c5c04b5 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 775723561f..90090d6958 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 0c97fc6273..bb0c23dd72 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 50f93acb53..8bb1b64622 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index d13c655ba7..7cd76c3011 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 8236fbf4e8..ad0164086a 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 369fdc9ea5..684ab70f86 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 70558928f7..f407ce11bf 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 4c3632a02d..1ac232a306 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index e30c4d2b20..967b781d10 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 40bf2b6b6d..aa50fdd8ce 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 6c85a52512..bb0d79b3d5 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 0fa70a7bb7..7cc3a55b26 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index c97d847425..3bf4edd65f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index c43884abb8..761b6c4aef 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 6cbe43b2eb..9da7452428 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 0ef2f69f14..1dc0e01964 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 23fc3097d9..a3db63ca23 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 37423930e9..ab70d68a3f 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 053dc63a1d..05f7c08bd2 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 335b8332dc..04bda44748 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 471baecf61..8170fc6bd2 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index f89f99c4de..6d1e2676af 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 400ca0521d..d6c0ba5dcc 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.202407101547-m1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 57dd030182..7531018bc3 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407101547-m1 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202407101547-m1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 22da3d723c..3c6c38992c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 99d7900a3f..7a07a3c8a6 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0.202407101547-m1 + 7.0.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From f9beeb3b33e438fa3a10eb3871206573ae986abb Mon Sep 17 00:00:00 2001 From: Janne Valkealahti Date: Thu, 4 Jul 2024 07:44:49 +0100 Subject: Add worktrees read support Based on deritative work done in Andre's work in [1]. This change focuses on adding support for reading the repository state when branches are checked out using git's worktrees. I've refactored original work by removing all unrelevant changes which were mostly around refactoring to extract i.e. constants which mostly created noise for a review. I've tried to address original review comments: - Not adding non-behavioral changes - "HEAD" should get resolved from gitDir - Reftable recently landed in cgit 2.45, see https://github.com/git/git/blob/master/Documentation/RelNotes/2.45.0.txt#L8 We can add worktree support for reftable in a later change. - Some new tests to read from a linked worktree which is created manually as there's no write support. [1] https://git.eclipse.org/r/c/jgit/jgit/+/163940/18 Change-Id: Id077d58fb6c09ecb090eb09d5dbc7edc351a581d --- .../src/org/eclipse/jgit/pgm/Config.java | 2 +- .../org/eclipse/jgit/api/EolRepositoryTest.java | 2 +- .../org/eclipse/jgit/api/LinkedWorktreeTest.java | 192 +++++++++++++++++++++ .../jgit/attributes/AttributesHandlerTest.java | 2 +- .../internal/storage/file/BatchRefUpdateTest.java | 2 +- .../jgit/internal/storage/file/GcPackRefsTest.java | 2 +- .../jgit/internal/storage/file/GcReflogTest.java | 2 +- .../internal/storage/file/RefDirectoryTest.java | 31 ++-- .../internal/storage/file/ReflogReaderTest.java | 2 +- .../internal/storage/file/ReflogWriterTest.java | 2 +- .../org/eclipse/jgit/api/SubmoduleAddCommand.java | 2 +- .../eclipse/jgit/api/SubmoduleUpdateCommand.java | 2 +- .../eclipse/jgit/dircache/DirCacheCheckout.java | 2 + .../storage/file/FileReftableDatabase.java | 8 +- .../jgit/internal/storage/file/FileRepository.java | 39 +++-- .../org/eclipse/jgit/internal/storage/file/GC.java | 2 +- .../eclipse/jgit/internal/storage/file/GcLog.java | 2 +- .../internal/storage/file/InfoAttributesNode.java | 2 +- .../jgit/internal/storage/file/RefDirectory.java | 20 ++- .../internal/storage/file/ReflogReaderImpl.java | 6 +- .../eclipse/jgit/lib/BaseRepositoryBuilder.java | 116 +++++++++++-- .../src/org/eclipse/jgit/lib/Constants.java | 52 ++++++ .../src/org/eclipse/jgit/lib/IndexDiff.java | 2 +- .../src/org/eclipse/jgit/lib/Repository.java | 16 +- .../src/org/eclipse/jgit/lib/RepositoryCache.java | 51 ++++-- .../eclipse/jgit/transport/TransportGitSsh.java | 6 + .../org/eclipse/jgit/transport/TransportLocal.java | 1 + .../eclipse/jgit/treewalk/WorkingTreeIterator.java | 4 +- org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 33 +++- 29 files changed, 520 insertions(+), 85 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LinkedWorktreeTest.java diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java index 52f40c2957..f5de7045d0 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Config.java @@ -94,7 +94,7 @@ class Config extends TextBuiltin { if (global || isListAll()) list(SystemReader.getInstance().openUserConfig(null, fs)); if (local || isListAll()) - list(new FileBasedConfig(fs.resolve(getRepository().getDirectory(), + list(new FileBasedConfig(fs.resolve(getRepository().getCommonDirectory(), Constants.CONFIG), fs)); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolRepositoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolRepositoryTest.java index b937b1f6a9..4c971ffb6b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolRepositoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/EolRepositoryTest.java @@ -559,7 +559,7 @@ public class EolRepositoryTest extends RepositoryTestCase { } if (infoAttributesContent != null) { - File f = new File(db.getDirectory(), Constants.INFO_ATTRIBUTES); + File f = new File(db.getCommonDirectory(), Constants.INFO_ATTRIBUTES); write(f, infoAttributesContent); } config.save(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LinkedWorktreeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LinkedWorktreeTest.java new file mode 100644 index 0000000000..3b60e1b5c0 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/LinkedWorktreeTest.java @@ -0,0 +1,192 @@ +/* + * Copyright (C) 2024, Broadcom and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.api; + +import static org.eclipse.jgit.lib.Constants.HEAD; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Collection; +import java.util.Iterator; + +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.junit.JGitTestUtil; +import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ReflogEntry; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.FS.ExecutionResult; +import org.eclipse.jgit.util.RawParseUtils; +import org.eclipse.jgit.util.TemporaryBuffer; +import org.junit.Test; + +public class LinkedWorktreeTest extends RepositoryTestCase { + + @Override + public void setUp() throws Exception { + super.setUp(); + + try (Git git = new Git(db)) { + git.commit().setMessage("Initial commit").call(); + } + } + + @Test + public void testWeCanReadFromLinkedWorktreeFromBare() throws Exception { + FS fs = db.getFS(); + File directory = trash.getParentFile(); + String dbDirName = db.getWorkTree().getName(); + cloneBare(fs, directory, dbDirName, "bare"); + File bareDirectory = new File(directory, "bare"); + worktreeAddExisting(fs, bareDirectory, "master"); + + File worktreesDir = new File(bareDirectory, "worktrees"); + File masterWorktreesDir = new File(worktreesDir, "master"); + + FileRepository repository = new FileRepository(masterWorktreesDir); + try (Git git = new Git(repository)) { + ObjectId objectId = repository.resolve(HEAD); + assertNotNull(objectId); + + Iterator log = git.log().all().call().iterator(); + assertTrue(log.hasNext()); + assertTrue("Initial commit".equals(log.next().getShortMessage())); + + // we have reflog entry + // depending on git version we either have one or + // two entries where extra is zeroid entry with + // same message or no message + Collection reflog = git.reflog().call(); + assertNotNull(reflog); + assertTrue(reflog.size() > 0); + ReflogEntry[] reflogs = reflog.toArray(new ReflogEntry[0]); + assertEquals(reflogs[reflogs.length - 1].getComment(), + "reset: moving to HEAD"); + + // index works with file changes + File masterDir = new File(directory, "master"); + File testFile = new File(masterDir, "test"); + + Status status = git.status().call(); + assertTrue(status.getUncommittedChanges().size() == 0); + assertTrue(status.getUntracked().size() == 0); + + JGitTestUtil.write(testFile, "test"); + status = git.status().call(); + assertTrue(status.getUncommittedChanges().size() == 0); + assertTrue(status.getUntracked().size() == 1); + + git.add().addFilepattern("test").call(); + status = git.status().call(); + assertTrue(status.getUncommittedChanges().size() == 1); + assertTrue(status.getUntracked().size() == 0); + } + } + + @Test + public void testWeCanReadFromLinkedWorktreeFromNonBare() throws Exception { + FS fs = db.getFS(); + worktreeAddNew(fs, db.getWorkTree(), "wt"); + + File worktreesDir = new File(db.getDirectory(), "worktrees"); + File masterWorktreesDir = new File(worktreesDir, "wt"); + + FileRepository repository = new FileRepository(masterWorktreesDir); + try (Git git = new Git(repository)) { + ObjectId objectId = repository.resolve(HEAD); + assertNotNull(objectId); + + Iterator log = git.log().all().call().iterator(); + assertTrue(log.hasNext()); + assertTrue("Initial commit".equals(log.next().getShortMessage())); + + // we have reflog entry + Collection reflog = git.reflog().call(); + assertNotNull(reflog); + assertTrue(reflog.size() > 0); + ReflogEntry[] reflogs = reflog.toArray(new ReflogEntry[0]); + assertEquals(reflogs[reflogs.length - 1].getComment(), + "reset: moving to HEAD"); + + // index works with file changes + File directory = trash.getParentFile(); + File wtDir = new File(directory, "wt"); + File testFile = new File(wtDir, "test"); + + Status status = git.status().call(); + assertTrue(status.getUncommittedChanges().size() == 0); + assertTrue(status.getUntracked().size() == 0); + + JGitTestUtil.write(testFile, "test"); + status = git.status().call(); + assertTrue(status.getUncommittedChanges().size() == 0); + assertTrue(status.getUntracked().size() == 1); + + git.add().addFilepattern("test").call(); + status = git.status().call(); + assertTrue(status.getUncommittedChanges().size() == 1); + assertTrue(status.getUntracked().size() == 0); + } + + } + + private static void cloneBare(FS fs, File directory, String from, String to) throws IOException, InterruptedException { + ProcessBuilder builder = fs.runInShell("git", + new String[] { "clone", "--bare", from, to }); + builder.directory(directory); + builder.environment().put("HOME", fs.userHome().getAbsolutePath()); + StringBuilder input = new StringBuilder(); + ExecutionResult result = fs.execute(builder, new ByteArrayInputStream( + input.toString().getBytes(StandardCharsets.UTF_8))); + String stdOut = toString(result.getStdout()); + String errorOut = toString(result.getStderr()); + assertNotNull(stdOut); + assertNotNull(errorOut); + } + + private static void worktreeAddExisting(FS fs, File directory, String name) throws IOException, InterruptedException { + ProcessBuilder builder = fs.runInShell("git", + new String[] { "worktree", "add", "../" + name, name }); + builder.directory(directory); + builder.environment().put("HOME", fs.userHome().getAbsolutePath()); + StringBuilder input = new StringBuilder(); + ExecutionResult result = fs.execute(builder, new ByteArrayInputStream( + input.toString().getBytes(StandardCharsets.UTF_8))); + String stdOut = toString(result.getStdout()); + String errorOut = toString(result.getStderr()); + assertNotNull(stdOut); + assertNotNull(errorOut); + } + + private static void worktreeAddNew(FS fs, File directory, String name) throws IOException, InterruptedException { + ProcessBuilder builder = fs.runInShell("git", + new String[] { "worktree", "add", "-b", name, "../" + name, "master"}); + builder.directory(directory); + builder.environment().put("HOME", fs.userHome().getAbsolutePath()); + StringBuilder input = new StringBuilder(); + ExecutionResult result = fs.execute(builder, new ByteArrayInputStream( + input.toString().getBytes(StandardCharsets.UTF_8))); + String stdOut = toString(result.getStdout()); + String errorOut = toString(result.getStderr()); + assertNotNull(stdOut); + assertNotNull(errorOut); + } + + private static String toString(TemporaryBuffer b) throws IOException { + return RawParseUtils.decode(b.toByteArray()); + } + +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesHandlerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesHandlerTest.java index 7fb98ec53b..c41dd81add 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesHandlerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesHandlerTest.java @@ -584,7 +584,7 @@ public class AttributesHandlerTest extends RepositoryTestCase { } if (infoAttributesContent != null) { - File f = new File(db.getDirectory(), Constants.INFO_ATTRIBUTES); + File f = new File(db.getCommonDirectory(), Constants.INFO_ATTRIBUTES); write(f, infoAttributesContent); } config.save(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java index daf4382719..1af42cb229 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java @@ -171,7 +171,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { assertEquals(c2.getResult(), ReceiveCommand.Result.OK); } - File packed = new File(diskRepo.getDirectory(), "packed-refs"); + File packed = new File(diskRepo.getCommonDirectory(), "packed-refs"); String packedStr = new String(Files.readAllBytes(packed.toPath()), UTF_8); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java index 8baa3cc341..c57295518d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java @@ -58,7 +58,7 @@ public class GcPackRefsTest extends GcTestCase { String ref = "dir/ref"; tr.branch(ref).commit().create(); String name = repo.findRef(ref).getName(); - Path dir = repo.getDirectory().toPath().resolve(name).getParent(); + Path dir = repo.getCommonDirectory().toPath().resolve(name).getParent(); assertNotNull(dir); gc.packRefs(); assertFalse(Files.exists(dir)); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcReflogTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcReflogTest.java index e6c1ee5fd6..29f180d76b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcReflogTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcReflogTest.java @@ -30,7 +30,7 @@ public class GcReflogTest extends GcTestCase { BranchBuilder bb = tr.branch("refs/heads/master"); bb.commit().add("A", "A").add("B", "B").create(); bb.commit().add("A", "A2").add("B", "B2").create(); - new File(repo.getDirectory(), Constants.LOGS + "/refs/heads/master") + new File(repo.getCommonDirectory(), Constants.LOGS + "/refs/heads/master") .delete(); stats = gc.getStatistics(); assertEquals(8, stats.numberOfLooseObjects); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java index 2bafde65d3..baa0182b87 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefDirectoryTest.java @@ -90,25 +90,26 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase { @Test public void testCreate() throws IOException { // setUp above created the directory. We just have to test it. - File d = diskRepo.getDirectory(); + File gitDir = diskRepo.getDirectory(); + File commonDir = diskRepo.getCommonDirectory(); assertSame(diskRepo, refdir.getRepository()); - assertTrue(new File(d, "refs").isDirectory()); - assertTrue(new File(d, "logs").isDirectory()); - assertTrue(new File(d, "logs/refs").isDirectory()); - assertFalse(new File(d, "packed-refs").exists()); + assertTrue(new File(commonDir, "refs").isDirectory()); + assertTrue(new File(commonDir, "logs").isDirectory()); + assertTrue(new File(commonDir, "logs/refs").isDirectory()); + assertFalse(new File(commonDir, "packed-refs").exists()); - assertTrue(new File(d, "refs/heads").isDirectory()); - assertTrue(new File(d, "refs/tags").isDirectory()); - assertEquals(2, new File(d, "refs").list().length); - assertEquals(0, new File(d, "refs/heads").list().length); - assertEquals(0, new File(d, "refs/tags").list().length); + assertTrue(new File(commonDir, "refs/heads").isDirectory()); + assertTrue(new File(commonDir, "refs/tags").isDirectory()); + assertEquals(2, new File(commonDir, "refs").list().length); + assertEquals(0, new File(commonDir, "refs/heads").list().length); + assertEquals(0, new File(commonDir, "refs/tags").list().length); - assertTrue(new File(d, "logs/refs/heads").isDirectory()); - assertFalse(new File(d, "logs/HEAD").exists()); - assertEquals(0, new File(d, "logs/refs/heads").list().length); + assertTrue(new File(commonDir, "logs/refs/heads").isDirectory()); + assertFalse(new File(gitDir, "logs/HEAD").exists()); + assertEquals(0, new File(commonDir, "logs/refs/heads").list().length); - assertEquals("ref: refs/heads/master\n", read(new File(d, HEAD))); + assertEquals("ref: refs/heads/master\n", read(new File(gitDir, HEAD))); } @Test(expected = UnsupportedOperationException.class) @@ -1382,7 +1383,7 @@ public class RefDirectoryTest extends LocalDiskRepositoryTestCase { } private void deleteLooseRef(String name) { - File path = new File(diskRepo.getDirectory(), name); + File path = new File(diskRepo.getCommonDirectory(), name); assertTrue("deleted " + name, path.delete()); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java index dc0e749373..eb521ff9eb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java @@ -238,7 +238,7 @@ public class ReflogReaderTest extends SampleDataRepositoryTestCase { private void setupReflog(String logName, byte[] data) throws FileNotFoundException, IOException { - File logfile = new File(db.getDirectory(), logName); + File logfile = new File(db.getCommonDirectory(), logName); if (!logfile.getParentFile().mkdirs() && !logfile.getParentFile().isDirectory()) { throw new IOException( diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java index 8d0e99dea0..8e9b7b84bd 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java @@ -48,7 +48,7 @@ public class ReflogWriterTest extends SampleDataRepositoryTestCase { private void readReflog(byte[] buffer) throws FileNotFoundException, IOException { - File logfile = new File(db.getDirectory(), "logs/refs/heads/master"); + File logfile = new File(db.getCommonDirectory(), "logs/refs/heads/master"); if (!logfile.getParentFile().mkdirs() && !logfile.getParentFile().isDirectory()) { throw new IOException( diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java index 8fb5d60b85..401f069e4e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java @@ -176,7 +176,7 @@ public class SubmoduleAddCommand extends CloneCommand clone = Git.cloneRepository(); configure(clone); clone.setDirectory(moduleDirectory); - clone.setGitDir(new File(new File(repo.getDirectory(), + clone.setGitDir(new File(new File(repo.getCommonDirectory(), Constants.MODULES), path)); clone.setURI(resolvedUri); if (monitor != null) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java index df73164161..751dabcd6b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java @@ -128,7 +128,7 @@ public class SubmoduleUpdateCommand extends clone.setURI(url); clone.setDirectory(generator.getDirectory()); clone.setGitDir( - new File(new File(repo.getDirectory(), Constants.MODULES), + new File(new File(repo.getCommonDirectory(), Constants.MODULES), generator.getPath())); if (monitor != null) { clone.setProgressMonitor(monitor); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index 6ae5153c12..fa0a82fd58 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -1647,6 +1647,8 @@ public class DirCacheCheckout { filterProcessBuilder.directory(repo.getWorkTree()); filterProcessBuilder.environment().put(Constants.GIT_DIR_KEY, repo.getDirectory().getAbsolutePath()); + filterProcessBuilder.environment().put(Constants.GIT_COMMON_DIR_KEY, + repo.getCommonDirectory().getAbsolutePath()); ExecutionResult result; int rc; try { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java index ed2516ddd0..80240e5062 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java @@ -68,14 +68,14 @@ public class FileReftableDatabase extends RefDatabase { private final FileReftableStack reftableStack; FileReftableDatabase(FileRepository repo) throws IOException { - this(repo, new File(new File(repo.getDirectory(), Constants.REFTABLE), + this(repo, new File(new File(repo.getCommonDirectory(), Constants.REFTABLE), Constants.TABLES_LIST)); } FileReftableDatabase(FileRepository repo, File refstackName) throws IOException { this.fileRepository = repo; this.reftableStack = new FileReftableStack(refstackName, - new File(fileRepository.getDirectory(), Constants.REFTABLE), + new File(fileRepository.getCommonDirectory(), Constants.REFTABLE), () -> fileRepository.fireEvent(new RefsChangedEvent()), () -> fileRepository.getConfig()); this.reftableDatabase = new ReftableDatabase() { @@ -318,7 +318,7 @@ public class FileReftableDatabase extends RefDatabase { @Override public void create() throws IOException { FileUtils.mkdir( - new File(fileRepository.getDirectory(), Constants.REFTABLE), + new File(fileRepository.getCommonDirectory(), Constants.REFTABLE), true); } @@ -615,7 +615,7 @@ public class FileReftableDatabase extends RefDatabase { FileReftableDatabase newDb = null; File reftableList = null; try { - File reftableDir = new File(repo.getDirectory(), + File reftableDir = new File(repo.getCommonDirectory(), Constants.REFTABLE); reftableList = new File(reftableDir, Constants.TABLES_LIST); if (!reftableDir.isDirectory()) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index e5a00d3925..b5d29a3fc8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -165,7 +165,7 @@ public class FileRepository extends Repository { throw new IOException(e.getMessage(), e); } repoConfig = new FileBasedConfig(userConfig, getFS().resolve( - getDirectory(), Constants.CONFIG), + getCommonDirectory(), Constants.CONFIG), getFS()); loadRepoConfig(); @@ -193,7 +193,7 @@ public class FileRepository extends Repository { options.getObjectDirectory(), // options.getAlternateObjectDirectories(), // getFS(), // - new File(getDirectory(), Constants.SHALLOW)); + new File(getCommonDirectory(), Constants.SHALLOW)); if (objectDatabase.exists()) { if (repositoryFormatVersion > 1) @@ -622,16 +622,17 @@ public class FileRepository extends Repository { * on IO problem */ void convertToPackedRefs(boolean writeLogs, boolean backup) throws IOException { + File commonDirectory = getCommonDirectory(); List all = refs.getRefs(); - File packedRefs = new File(getDirectory(), Constants.PACKED_REFS); + File packedRefs = new File(commonDirectory, Constants.PACKED_REFS); if (packedRefs.exists()) { throw new IOException(MessageFormat.format(JGitText.get().fileAlreadyExists, packedRefs.getName())); } - File refsFile = new File(getDirectory(), "refs"); //$NON-NLS-1$ + File refsFile = new File(commonDirectory, "refs"); //$NON-NLS-1$ File refsHeadsFile = new File(refsFile, "heads");//$NON-NLS-1$ - File headFile = new File(getDirectory(), Constants.HEAD); + File headFile = new File(commonDirectory, Constants.HEAD); FileReftableDatabase oldDb = (FileReftableDatabase) refs; // Remove the dummy files that ensure compatibility with older git @@ -701,7 +702,7 @@ public class FileRepository extends Repository { } if (!backup) { - File reftableDir = new File(getDirectory(), Constants.REFTABLE); + File reftableDir = new File(commonDirectory, Constants.REFTABLE); FileUtils.delete(reftableDir, FileUtils.RECURSIVE | FileUtils.IGNORE_ERRORS); } @@ -730,8 +731,10 @@ public class FileRepository extends Repository { @SuppressWarnings("nls") void convertToReftable(boolean writeLogs, boolean backup) throws IOException { - File reftableDir = new File(getDirectory(), Constants.REFTABLE); - File headFile = new File(getDirectory(), Constants.HEAD); + File commonDirectory = getCommonDirectory(); + File directory = getDirectory(); + File reftableDir = new File(commonDirectory, Constants.REFTABLE); + File headFile = new File(directory, Constants.HEAD); if (reftableDir.exists() && FileUtils.hasFiles(reftableDir.toPath())) { throw new IOException(JGitText.get().reftableDirExists); } @@ -739,28 +742,28 @@ public class FileRepository extends Repository { // Ignore return value, as it is tied to temporary newRefs file. FileReftableDatabase.convertFrom(this, writeLogs); - File refsFile = new File(getDirectory(), "refs"); + File refsFile = new File(commonDirectory, "refs"); // non-atomic: remove old data. - File packedRefs = new File(getDirectory(), Constants.PACKED_REFS); - File logsDir = new File(getDirectory(), Constants.LOGS); + File packedRefs = new File(commonDirectory, Constants.PACKED_REFS); + File logsDir = new File(commonDirectory, Constants.LOGS); List additional = getRefDatabase().getAdditionalRefs().stream() .map(Ref::getName).collect(toList()); additional.add(Constants.HEAD); if (backup) { - FileUtils.rename(refsFile, new File(getDirectory(), "refs.old")); + FileUtils.rename(refsFile, new File(commonDirectory, "refs.old")); if (packedRefs.exists()) { - FileUtils.rename(packedRefs, new File(getDirectory(), + FileUtils.rename(packedRefs, new File(commonDirectory, Constants.PACKED_REFS + ".old")); } if (logsDir.exists()) { FileUtils.rename(logsDir, - new File(getDirectory(), Constants.LOGS + ".old")); + new File(commonDirectory, Constants.LOGS + ".old")); } for (String r : additional) { - FileUtils.rename(new File(getDirectory(), r), - new File(getDirectory(), r + ".old")); + FileUtils.rename(new File(commonDirectory, r), + new File(commonDirectory, r + ".old")); } } else { FileUtils.delete(packedRefs, FileUtils.SKIP_MISSING); @@ -770,7 +773,7 @@ public class FileRepository extends Repository { FileUtils.delete(refsFile, FileUtils.RECURSIVE | FileUtils.SKIP_MISSING); for (String r : additional) { - new File(getDirectory(), r).delete(); + new File(commonDirectory, r).delete(); } } @@ -784,7 +787,7 @@ public class FileRepository extends Repository { // Some tools might write directly into .git/refs/heads/BRANCH. By // putting a file here, this fails spectacularly. - FileUtils.createNewFile(new File(refsFile, "heads")); + FileUtils.createNewFile(new File(refsFile, Constants.HEADS)); repoConfig.setString(ConfigConstants.CONFIG_EXTENSIONS_SECTION, null, ConfigConstants.CONFIG_KEY_REF_STORAGE, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index cf26f8d284..4fafc5a088 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1047,7 +1047,7 @@ public class GC { } private void deleteEmptyRefsFolders() throws IOException { - Path refs = repo.getDirectory().toPath().resolve(Constants.R_REFS); + Path refs = repo.getCommonDirectory().toPath().resolve(Constants.R_REFS); // Avoid deleting a folder that was created after the threshold so that concurrent // operations trying to create a reference are not impacted Instant threshold = Instant.now().minus(30, ChronoUnit.SECONDS); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java index 628bf5db0c..8647b3e664 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java @@ -50,7 +50,7 @@ class GcLog { */ GcLog(FileRepository repo) { this.repo = repo; - logFile = new File(repo.getDirectory(), "gc.log"); //$NON-NLS-1$ + logFile = new File(repo.getCommonDirectory(), "gc.log"); //$NON-NLS-1$ lock = new LockFile(logFile); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InfoAttributesNode.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InfoAttributesNode.java index 11d842b246..e8d442b8fb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InfoAttributesNode.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/InfoAttributesNode.java @@ -46,7 +46,7 @@ public class InfoAttributesNode extends AttributesNode { FS fs = repository.getFS(); - File attributes = fs.resolve(repository.getDirectory(), + File attributes = fs.resolve(repository.getCommonDirectory(), Constants.INFO_ATTRIBUTES); FileRepository.AttributesNodeProviderImpl.loadRulesFromFile(r, attributes); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 8e57bf9f2f..604868133e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -16,6 +16,7 @@ package org.eclipse.jgit.internal.storage.file; import static java.nio.charset.StandardCharsets.UTF_8; import static org.eclipse.jgit.lib.Constants.HEAD; import static org.eclipse.jgit.lib.Constants.LOGS; +import static org.eclipse.jgit.lib.Constants.L_LOGS; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; import static org.eclipse.jgit.lib.Constants.PACKED_REFS; import static org.eclipse.jgit.lib.Constants.R_HEADS; @@ -124,6 +125,8 @@ public class RefDirectory extends RefDatabase { private final File gitDir; + private final File gitCommonDir; + final File refsDir; final File packedRefsFile; @@ -188,6 +191,7 @@ public class RefDirectory extends RefDatabase { RefDirectory(RefDirectory refDb) { parent = refDb.parent; gitDir = refDb.gitDir; + gitCommonDir = refDb.gitCommonDir; refsDir = refDb.refsDir; logsDir = refDb.logsDir; logsRefsDir = refDb.logsRefsDir; @@ -204,10 +208,11 @@ public class RefDirectory extends RefDatabase { final FS fs = db.getFS(); parent = db; gitDir = db.getDirectory(); - refsDir = fs.resolve(gitDir, R_REFS); - logsDir = fs.resolve(gitDir, LOGS); - logsRefsDir = fs.resolve(gitDir, LOGS + '/' + R_REFS); - packedRefsFile = fs.resolve(gitDir, PACKED_REFS); + gitCommonDir = db.getCommonDirectory(); + refsDir = fs.resolve(gitCommonDir, R_REFS); + logsDir = fs.resolve(gitCommonDir, LOGS); + logsRefsDir = fs.resolve(gitCommonDir, L_LOGS + R_REFS); + packedRefsFile = fs.resolve(gitCommonDir, PACKED_REFS); looseRefs.set(RefList. emptyList()); packedRefs.set(NO_PACKED_REFS); @@ -1329,7 +1334,12 @@ public class RefDirectory extends RefDatabase { name = name.substring(R_REFS.length()); return new File(refsDir, name); } - return new File(gitDir, name); + // HEAD needs to get resolved from git dir as resolving it from common dir + // would always lead back to current default branch + if (name.equals(HEAD)) { + return new File(gitDir, name); + } + return new File(gitCommonDir, name); } static int levelsIn(String name) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java index 21b5a54eb7..f1888eb90f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ReflogReaderImpl.java @@ -10,6 +10,8 @@ package org.eclipse.jgit.internal.storage.file; +import static org.eclipse.jgit.lib.Constants.HEAD; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -37,7 +39,9 @@ class ReflogReaderImpl implements ReflogReader { * {@code Ref} name */ ReflogReaderImpl(Repository db, String refname) { - logName = new File(db.getDirectory(), Constants.LOGS + '/' + refname); + File logBaseDir = refname.equals(HEAD) ? db.getDirectory() + : db.getCommonDirectory(); + logName = new File(logBaseDir, Constants.L_LOGS + refname); } /* (non-Javadoc) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java index 5dfb648faa..d232be6276 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java @@ -13,13 +13,17 @@ package org.eclipse.jgit.lib; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BARE; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WORKTREE; +import static org.eclipse.jgit.lib.Constants.CONFIG; import static org.eclipse.jgit.lib.Constants.DOT_GIT; import static org.eclipse.jgit.lib.Constants.GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY; import static org.eclipse.jgit.lib.Constants.GIT_CEILING_DIRECTORIES_KEY; +import static org.eclipse.jgit.lib.Constants.GIT_COMMON_DIR_KEY; import static org.eclipse.jgit.lib.Constants.GIT_DIR_KEY; import static org.eclipse.jgit.lib.Constants.GIT_INDEX_FILE_KEY; import static org.eclipse.jgit.lib.Constants.GIT_OBJECT_DIRECTORY_KEY; import static org.eclipse.jgit.lib.Constants.GIT_WORK_TREE_KEY; +import static org.eclipse.jgit.lib.Constants.OBJECTS; +import static org.eclipse.jgit.lib.Constants.GITDIR_FILE; import java.io.File; import java.io.IOException; @@ -70,7 +74,21 @@ public class BaseRepositoryBuilder alternateObjectDirectories; @@ -171,6 +191,30 @@ public class BaseRepositoryBuilder * This method tries to read the standard Git environment variables, such as - * {@code GIT_DIR} and {@code GIT_WORK_TREE} to configure this builder - * instance. If an environment variable is set, it overrides the value - * already set in this builder. + * {@code GIT_DIR}, {@code GIT_COMMON_DIR}, {@code GIT_WORK_TREE} etc. to + * configure this builder instance. If an environment variable is set, it + * overrides the value already set in this builder. * * @return {@code this} (for chaining calls). */ @@ -410,9 +454,9 @@ public class BaseRepositoryBuilder * This method tries to read the standard Git environment variables, such as - * {@code GIT_DIR} and {@code GIT_WORK_TREE} to configure this builder - * instance. If a property is already set in the builder, the environment - * variable is not used. + * {@code GIT_DIR}, {@code GIT_COMMON_DIR}, {@code GIT_WORK_TREE} etc. to + * configure this builder instance. If a property is already set in the + * builder, the environment variable is not used. * * @param sr * the SystemReader abstraction to access the environment. @@ -425,6 +469,13 @@ public class BaseRepositoryBuilder @@ -695,8 +761,12 @@ public class BaseRepositoryBuilder Date: Mon, 15 Jul 2024 11:35:56 -0700 Subject: DfsBlockCacheTable: extract stats get* methods to interface Having the DfsBlockCacheTable methods extracted to an interface will allow alternative implementations of BlockCacheStats not tied to the current implementation. Change-Id: I534f7998f46253cdb7a68d5ec21d4f42ea586e8e --- .../internal/storage/dfs/ClockBlockCacheTable.java | 2 +- .../jgit/internal/storage/dfs/DfsBlockCache.java | 12 +-- .../internal/storage/dfs/DfsBlockCacheTable.java | 117 ++++++++++++--------- 3 files changed, 77 insertions(+), 54 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java index d0907bcc8d..ce71a71d67 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java @@ -135,7 +135,7 @@ final class ClockBlockCacheTable implements DfsBlockCacheTable { } @Override - public DfsBlockCacheStats getDfsBlockCacheStats() { + public BlockCacheStats getBlockCacheStats() { return dfsBlockCacheStats; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java index 56719cf0f4..3e1300c867 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java @@ -119,7 +119,7 @@ public final class DfsBlockCache { * @return total number of bytes in the cache, per pack file extension. */ public long[] getCurrentSize() { - return dfsBlockCacheTable.getDfsBlockCacheStats().getCurrentSize(); + return dfsBlockCacheTable.getBlockCacheStats().getCurrentSize(); } /** @@ -138,7 +138,7 @@ public final class DfsBlockCache { * extension. */ public long[] getHitCount() { - return dfsBlockCacheTable.getDfsBlockCacheStats().getHitCount(); + return dfsBlockCacheTable.getBlockCacheStats().getHitCount(); } /** @@ -149,7 +149,7 @@ public final class DfsBlockCache { * extension. */ public long[] getMissCount() { - return dfsBlockCacheTable.getDfsBlockCacheStats().getMissCount(); + return dfsBlockCacheTable.getBlockCacheStats().getMissCount(); } /** @@ -158,7 +158,7 @@ public final class DfsBlockCache { * @return total number of requests (hit + miss), per pack file extension. */ public long[] getTotalRequestCount() { - return dfsBlockCacheTable.getDfsBlockCacheStats() + return dfsBlockCacheTable.getBlockCacheStats() .getTotalRequestCount(); } @@ -168,7 +168,7 @@ public final class DfsBlockCache { * @return hit ratios */ public long[] getHitRatio() { - return dfsBlockCacheTable.getDfsBlockCacheStats().getHitRatio(); + return dfsBlockCacheTable.getBlockCacheStats().getHitRatio(); } /** @@ -179,7 +179,7 @@ public final class DfsBlockCache { * file extension. */ public long[] getEvictions() { - return dfsBlockCacheTable.getDfsBlockCacheStats().getEvictions(); + return dfsBlockCacheTable.getBlockCacheStats().getEvictions(); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java index 701d1fdce3..309f2d1595 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java @@ -129,18 +129,72 @@ public interface DfsBlockCacheTable { T get(DfsStreamKey key, long position); /** - * Get the DfsBlockCacheStats object for this block cache table's + * Get the {@link BlockCacheStats} object for this block cache table's * statistics. * - * @return the DfsBlockCacheStats tracking this block cache table's + * @return the {@link BlockCacheStats} tracking this block cache table's * statistics. */ - DfsBlockCacheStats getDfsBlockCacheStats(); + BlockCacheStats getBlockCacheStats(); + + /** + * Provides methods used with Block Cache statistics. + */ + interface BlockCacheStats { + /** + * Get total number of bytes in the cache, per pack file extension. + * + * @return total number of bytes in the cache, per pack file extension. + */ + long[] getCurrentSize(); + + /** + * Get number of requests for items in the cache, per pack file + * extension. + * + * @return the number of requests for items in the cache, per pack file + * extension. + */ + long[] getHitCount(); + + /** + * Get number of requests for items not in the cache, per pack file + * extension. + * + * @return the number of requests for items not in the cache, per pack + * file extension. + */ + long[] getMissCount(); + + /** + * Get total number of requests (hit + miss), per pack file extension. + * + * @return total number of requests (hit + miss), per pack file + * extension. + */ + long[] getTotalRequestCount(); + + /** + * Get hit ratios. + * + * @return hit ratios. + */ + long[] getHitRatio(); + + /** + * Get number of evictions performed due to cache being full, per pack + * file extension. + * + * @return the number of evictions performed due to cache being full, + * per pack file extension. + */ + long[] getEvictions(); + } /** * Keeps track of stats for a Block Cache table. */ - class DfsBlockCacheStats { + class DfsBlockCacheStats implements BlockCacheStats { /** * Number of times a block was found in the cache, per pack file * extension. @@ -214,44 +268,23 @@ public interface DfsBlockCacheTable { getStat(liveBytes, key).addAndGet(size); } - /** - * Get total number of bytes in the cache, per pack file extension. - * - * @return total number of bytes in the cache, per pack file extension. - */ - long[] getCurrentSize() { + @Override + public long[] getCurrentSize() { return getStatVals(liveBytes); } - /** - * Get number of requests for items in the cache, per pack file - * extension. - * - * @return the number of requests for items in the cache, per pack file - * extension. - */ - long[] getHitCount() { + @Override + public long[] getHitCount() { return getStatVals(statHit); } - /** - * Get number of requests for items not in the cache, per pack file - * extension. - * - * @return the number of requests for items not in the cache, per pack - * file extension. - */ - long[] getMissCount() { + @Override + public long[] getMissCount() { return getStatVals(statMiss); } - /** - * Get total number of requests (hit + miss), per pack file extension. - * - * @return total number of requests (hit + miss), per pack file - * extension. - */ - long[] getTotalRequestCount() { + @Override + public long[] getTotalRequestCount() { AtomicLong[] hit = statHit.get(); AtomicLong[] miss = statMiss.get(); long[] cnt = new long[Math.max(hit.length, miss.length)]; @@ -264,12 +297,8 @@ public interface DfsBlockCacheTable { return cnt; } - /** - * Get hit ratios. - * - * @return hit ratios. - */ - long[] getHitRatio() { + @Override + public long[] getHitRatio() { AtomicLong[] hit = statHit.get(); AtomicLong[] miss = statMiss.get(); long[] ratio = new long[Math.max(hit.length, miss.length)]; @@ -288,14 +317,8 @@ public interface DfsBlockCacheTable { return ratio; } - /** - * Get number of evictions performed due to cache being full, per pack - * file extension. - * - * @return the number of evictions performed due to cache being full, - * per pack file extension. - */ - long[] getEvictions() { + @Override + public long[] getEvictions() { return getStatVals(statEvict); } -- cgit v1.2.3 From 01000f754e8d9726f245343d955fca89a2e183ba Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 15 Jul 2024 22:57:25 +0200 Subject: Add 4.33 target platform for Eclipse 2024-09 Change-Id: If234cdba011e0a63cd4a292d66832aa59cce9079 --- .../org.eclipse.jgit.target/jgit-4.33.target | 290 +++++++++++++++++++++ .../org.eclipse.jgit.target/jgit-4.33.tpd | 8 + .../org.eclipse.jgit.target/orbit/orbit-4.31.tpd | 2 +- .../org.eclipse.jgit.target/orbit/orbit-4.33.tpd | 27 ++ 4 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target new file mode 100644 index 0000000000..fac43dc922 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.tukaani + xz + 1.9 + jar + + + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.13.1 + jar + + + org.apache.sshd + sshd-sftp + 2.13.1 + jar + + + + + + + org.mockito + mockito-core + 5.12.0 + jar + + + + + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + org.hamcrest + hamcrest + 2.2 + jar + + + + + + + com.google.code.gson + gson + 2.11.0 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + + + + + + org.assertj + assertj-core + 3.26.0 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd new file mode 100644 index 0000000000..d01a8a98ba --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd @@ -0,0 +1,8 @@ +target "jgit-4.33" with source configurePhase + +include "orbit/orbit-4.33.tpd" +include "maven/dependencies.tpd" + +location "https://download.eclipse.org/staging/2024-09/" { + org.eclipse.osgi lazy +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd index 0554a8578c..9d00cb4c4f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd @@ -1,4 +1,4 @@ -target "orbit-4.30" with source configurePhase +target "orbit-4.31" with source configurePhase // see https://download.eclipse.org/tools/orbit/downloads/ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12" { diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd new file mode 100644 index 0000000000..8dca4cb681 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd @@ -0,0 +1,27 @@ +target "orbit-4.33" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + net.i2p.crypto.eddsa [0.3.0,0.3.0] + net.i2p.crypto.eddsa.source [0.3.0,0.3.0] + org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] + org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} -- cgit v1.2.3 From 439512d7f82c503638e6b12689e751bb8debc015 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 10 Apr 2024 10:52:44 -0700 Subject: DfsPackFile: Do not set local reverse index ref from cache callback The DfsBlockCache loading callback sets the local reference to the index in the DfsPackFile. This prevents abstracting the loading to implement it over multiple backends. Reorg the code so the loadReverseIndex do only the loading, the caller sets it into DfsBlockCache and the external code sets the local reference in DfsPackFile. This is the same pattern we did with the PackIndex in the parent commit. Change-Id: I3a395b347965fa7b0e5a3398c4da311dc11c58a1 --- .../jgit/internal/storage/dfs/DfsPackFile.java | 38 ++++++++++++---------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java index b94a84a41c..cdd10618e0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java @@ -330,18 +330,27 @@ public final class DfsPackFile extends BlockBasedFile { PackIndex idx = idx(ctx); DfsStreamKey revKey = desc.getStreamKey(REVERSE_INDEX); - AtomicBoolean cacheHit = new AtomicBoolean(true); - DfsBlockCache.Ref revref = cache.getOrLoadRef(revKey, - REF_POSITION, () -> { - cacheHit.set(false); - return loadReverseIdx(ctx, revKey, idx); + // Keep the value parsed in the loader, in case the Ref<> is + // nullified in ClockBlockCacheTable#reserveSpace + // before we read its value. + AtomicReference loadedRef = new AtomicReference<>( + null); + DfsBlockCache.Ref cachedRef = cache + .getOrLoadRef(revKey, REF_POSITION, () -> { + RefWithSize ridx = loadReverseIdx(ctx, + idx); + loadedRef.set(ridx.ref); + return new DfsBlockCache.Ref<>(revKey, REF_POSITION, + ridx.size, ridx.ref); }); - if (cacheHit.get()) { + if (loadedRef.get() == null) { ctx.stats.ridxCacheHit++; } - PackReverseIndex revidx = revref.get(); - if (reverseIndex == null && revidx != null) { - reverseIndex = revidx; + reverseIndex = cachedRef.get() != null ? cachedRef.get() + : loadedRef.get(); + if (reverseIndex == null) { + throw new IOException( + "Couldn't get a reference to the reverse index"); //$NON-NLS-1$ } ctx.emitIndexLoad(desc, REVERSE_INDEX, reverseIndex); return reverseIndex; @@ -1241,18 +1250,13 @@ public final class DfsPackFile extends BlockBasedFile { } } - private DfsBlockCache.Ref loadReverseIdx( - DfsReader ctx, DfsStreamKey revKey, PackIndex idx) { + private static RefWithSize loadReverseIdx(DfsReader ctx, + PackIndex idx) { ctx.stats.readReverseIdx++; long start = System.nanoTime(); PackReverseIndex revidx = PackReverseIndexFactory.computeFromIndex(idx); - reverseIndex = revidx; ctx.stats.readReverseIdxMicros += elapsedMicros(start); - return new DfsBlockCache.Ref<>( - revKey, - REF_POSITION, - idx.getObjectCount() * 8, - revidx); + return new RefWithSize<>(revidx, idx.getObjectCount() * 8); } private DfsBlockCache.Ref loadObjectSizeIndex( -- cgit v1.2.3 From 1c9d1a49b0f9fcf7980775f22302df35293a3776 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 19 Jul 2024 15:44:15 -0700 Subject: PackObjectSizeIndex: Read all bytes and use the byte[] directly The parser reads N integers one by one from the stream, assuming the InputStream does some ahead reading from storage. We see some very slow loading of indexes and suspect that this preemptive reading is not happening. The slow loading can be reproduced in clones, and it produces higher latencies and locks many threads waiting for the loading. Read the whole array from storage in one shot to avoid many small IO reads. Work directly on the resulting byte[], so there is no need of a second copy to cast to int/long. This is how other indexes, like primary or commit graph, work. Change-Id: I60058606e2c457f60aa4646a1f10ae7b28ce34c2 --- .../org/eclipse/jgit/internal/JGitText.properties | 1 + .../src/org/eclipse/jgit/internal/JGitText.java | 1 + .../storage/file/PackObjectSizeIndexV1.java | 181 ++++++++++++++------- 3 files changed, 122 insertions(+), 61 deletions(-) diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 9d12facb33..8c02bbeeab 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -806,6 +806,7 @@ truncatedHunkOldLinesMissing=Truncated hunk, at least {0} old lines is missing tSizeMustBeGreaterOrEqual1=tSize must be >= 1 unableToCheckConnectivity=Unable to check connectivity. unableToCreateNewObject=Unable to create new object: {0} +unableToReadFullArray=Unable to read an array with {0} elements from the stream unableToReadFullInt=Unable to read a full int from the stream unableToReadPackfile=Unable to read packfile {0} unableToRemovePath=Unable to remove path ''{0}'' diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 311d9c22aa..cbda506f99 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -836,6 +836,7 @@ public class JGitText extends TranslationBundle { /***/ public String unableToCheckConnectivity; /***/ public String unableToCreateNewObject; /***/ public String unableToReadFullInt; + /***/ public String unableToReadFullArray; /***/ public String unableToReadPackfile; /***/ public String unableToRemovePath; /***/ public String unableToWrite; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java index a3d74be040..e172f141f5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java @@ -12,7 +12,7 @@ package org.eclipse.jgit.internal.storage.file; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; -import java.util.Arrays; +import java.text.MessageFormat; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.util.NB; @@ -35,7 +35,7 @@ class PackObjectSizeIndexV1 implements PackObjectSizeIndex { private final UInt24Array positions24; - private final int[] positions32; + private final IntArray positions32; /** * Parallel array to concat(positions24, positions32) with the size of the @@ -45,35 +45,37 @@ class PackObjectSizeIndexV1 implements PackObjectSizeIndex { * doesn't fit in an int and |value|-1 is the position for the size in the * size64 array e.g. a value of -1 is sizes64[0], -2 = sizes64[1], ... */ - private final int[] sizes32; + private final IntArray sizes32; - private final long[] sizes64; + private final LongArray sizes64; static PackObjectSizeIndex parse(InputStream in) throws IOException { /** Header and version already out of the input */ - IndexInputStreamReader stream = new IndexInputStreamReader(in); - int threshold = stream.readInt(); // minSize - int objCount = stream.readInt(); + byte[] buffer = new byte[8]; + in.readNBytes(buffer, 0, 8); + int threshold = NB.decodeInt32(buffer, 0); // minSize + int objCount = NB.decodeInt32(buffer, 4); if (objCount == 0) { return new EmptyPackObjectSizeIndex(threshold); } - return new PackObjectSizeIndexV1(stream, threshold, objCount); + return new PackObjectSizeIndexV1(in, threshold, objCount); } - private PackObjectSizeIndexV1(IndexInputStreamReader stream, int threshold, + private PackObjectSizeIndexV1(InputStream stream, int threshold, int objCount) throws IOException { this.threshold = threshold; UInt24Array pos24 = null; - int[] pos32 = null; + IntArray pos32 = null; + StreamHelper helper = new StreamHelper(); byte positionEncoding; - while ((positionEncoding = stream.readByte()) != 0) { + while ((positionEncoding = helper.readByte(stream)) != 0) { if (Byte.compareUnsigned(positionEncoding, BITS_24) == 0) { - int sz = stream.readInt(); + int sz = helper.readInt(stream); pos24 = new UInt24Array(stream.readNBytes(sz * 3)); } else if (Byte.compareUnsigned(positionEncoding, BITS_32) == 0) { - int sz = stream.readInt(); - pos32 = stream.readIntArray(sz); + int sz = helper.readInt(stream); + pos32 = IntArray.from(stream, sz); } else { throw new UnsupportedEncodingException( String.format(JGitText.get().unknownPositionEncoding, @@ -81,16 +83,16 @@ class PackObjectSizeIndexV1 implements PackObjectSizeIndex { } } positions24 = pos24 != null ? pos24 : UInt24Array.EMPTY; - positions32 = pos32 != null ? pos32 : new int[0]; + positions32 = pos32 != null ? pos32 : IntArray.EMPTY; - sizes32 = stream.readIntArray(objCount); - int c64sizes = stream.readInt(); + sizes32 = IntArray.from(stream, objCount); + int c64sizes = helper.readInt(stream); if (c64sizes == 0) { - sizes64 = new long[0]; + sizes64 = LongArray.EMPTY; return; } - sizes64 = stream.readLongArray(c64sizes); - int c128sizes = stream.readInt(); + sizes64 = LongArray.from(stream, c64sizes); + int c128sizes = helper.readInt(stream); if (c128sizes != 0) { // this MUST be 0 (we don't support 128 bits sizes yet) throw new IOException(JGitText.get().unsupportedSizesObjSizeIndex); @@ -102,8 +104,8 @@ class PackObjectSizeIndexV1 implements PackObjectSizeIndex { int pos = -1; if (!positions24.isEmpty() && idxOffset <= positions24.getLastValue()) { pos = positions24.binarySearch(idxOffset); - } else if (positions32.length > 0 && idxOffset >= positions32[0]) { - int pos32 = Arrays.binarySearch(positions32, idxOffset); + } else if (!positions32.empty() && idxOffset >= positions32.get(0)) { + int pos32 = positions32.binarySearch(idxOffset); if (pos32 >= 0) { pos = pos32 + positions24.size(); } @@ -112,17 +114,17 @@ class PackObjectSizeIndexV1 implements PackObjectSizeIndex { return -1; } - int objSize = sizes32[pos]; + int objSize = sizes32.get(pos); if (objSize < 0) { int secondPos = Math.abs(objSize) - 1; - return sizes64[secondPos]; + return sizes64.get(secondPos); } return objSize; } @Override public long getObjectCount() { - return (long) positions24.size() + positions32.length; + return (long) positions24.size() + positions32.size(); } @Override @@ -131,69 +133,126 @@ class PackObjectSizeIndexV1 implements PackObjectSizeIndex { } /** - * Wrapper to read parsed content from the byte stream + * A byte[] that should be interpreted as an int[] */ - private static class IndexInputStreamReader { + private static class IntArray { + private static final IntArray EMPTY = new IntArray(new byte[0]); - private final byte[] buffer = new byte[8]; + private static final int INT_SIZE = 4; - private final InputStream in; + private final byte[] data; - IndexInputStreamReader(InputStream in) { - this.in = in; - } + private final int size; - int readInt() throws IOException { - int n = in.readNBytes(buffer, 0, 4); - if (n < 4) { - throw new IOException(JGitText.get().unableToReadFullInt); + static IntArray from(InputStream in, int ints) throws IOException { + int expectedBytes = ints * INT_SIZE; + byte[] data = in.readNBytes(expectedBytes); + if (data.length < expectedBytes) { + throw new IOException(MessageFormat + .format(JGitText.get().unableToReadFullArray, ints)); } - return NB.decodeInt32(buffer, 0); + return new IntArray(data); + } + + private IntArray(byte[] data) { + this.data = data; + size = data.length / INT_SIZE; } - int[] readIntArray(int intsCount) throws IOException { - if (intsCount == 0) { - return new int[0]; + /** + * Returns position of element in array, -1 if not there + * + * @param needle + * element to look for + * @return position of the element in the array or -1 if not found + */ + int binarySearch(int needle) { + if (size == 0) { + return -1; } + int high = size; + int low = 0; + do { + int mid = (low + high) >>> 1; + int cmp = Integer.compare(needle, get(mid)); + if (cmp < 0) + high = mid; + else if (cmp == 0) { + return mid; + } else + low = mid + 1; + } while (low < high); + return -1; + } - int[] dest = new int[intsCount]; - for (int i = 0; i < intsCount; i++) { - dest[i] = readInt(); + int get(int position) { + if (position < 0 || position >= size) { + throw new IndexOutOfBoundsException(position); } - return dest; + return NB.decodeInt32(data, position * INT_SIZE); } - long readLong() throws IOException { - int n = in.readNBytes(buffer, 0, 8); - if (n < 8) { - throw new IOException(JGitText.get().unableToReadFullInt); + boolean empty() { + return size == 0; + } + + int size() { + return size; + } + } + + /** + * A byte[] that should be interpreted as an long[] + */ + private static class LongArray { + private static final LongArray EMPTY = new LongArray(new byte[0]); + + private static final int LONG_SIZE = 8; // bytes + + private final byte[] data; + + private final int size; + + static LongArray from(InputStream in, int longs) throws IOException { + byte[] data = in.readNBytes(longs * LONG_SIZE); + if (data.length < longs * LONG_SIZE) { + throw new IOException(MessageFormat + .format(JGitText.get().unableToReadFullArray, longs)); } - return NB.decodeInt64(buffer, 0); + return new LongArray(data); } - long[] readLongArray(int longsCount) throws IOException { - if (longsCount == 0) { - return new long[0]; + private LongArray(byte[] data) { + this.data = data; + size = data.length / LONG_SIZE; + } + + long get(int position) { + if (position < 0 || position >= size) { + throw new IndexOutOfBoundsException(position); } + return NB.decodeInt64(data, position * LONG_SIZE); + } + } - long[] dest = new long[longsCount]; - for (int i = 0; i < longsCount; i++) { - dest[i] = readLong(); + private static class StreamHelper { + private final byte[] buffer = new byte[8]; + + int readInt(InputStream in) throws IOException { + int n = in.readNBytes(buffer, 0, 4); + if (n < 4) { + throw new IOException(JGitText.get().unableToReadFullInt); } - return dest; + return NB.decodeInt32(buffer, 0); } - byte readByte() throws IOException { + byte readByte(InputStream in) throws IOException { int n = in.readNBytes(buffer, 0, 1); if (n != 1) { throw new IOException(JGitText.get().cannotReadByte); } return buffer[0]; } - - byte[] readNBytes(int sz) throws IOException { - return in.readNBytes(sz); - } } private static class EmptyPackObjectSizeIndex -- cgit v1.2.3 From a2a5cdddd78a1e066aed7caf86ba9510450710c9 Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Fri, 7 Jun 2024 16:11:21 -0700 Subject: PackExtBlockCacheTable: spread extensions over multiple dfs tables The existing DfsBlockCache uses a single table for all extensions (idx, ridx, ...). This change introduces an implementation of the table interface that can keep extensions in different cache tables. This selects the appropriate cache to use for a specific PackExt or DfsStreamKey's PackExt type, allowing the separation of entries from different pack types to help limit churn in cache caused by entries of differing sizes. This is especially useful in fine-tuning caches and influencing interactions by extension type. For example, a table holding INDEX types only will not influence evictions of other PackExt types and vice versa. The PackExtBlockCacheTable allowing setting the underlying DfsBlockCacheTables and mappinh directly, letting users implement and use custom DfsBlockCacheTables. Change-Id: Icee7b644ef6b600aa473d35645469d6aa1bce345 --- .../storage/dfs/PackExtBlockCacheTableTest.java | 588 +++++++++++++++++++++ .../org/eclipse/jgit/internal/JGitText.properties | 2 + .../src/org/eclipse/jgit/internal/JGitText.java | 2 + .../internal/storage/dfs/DfsBlockCacheConfig.java | 26 +- .../storage/dfs/PackExtBlockCacheTable.java | 289 ++++++++++ 5 files changed, 905 insertions(+), 2 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java new file mode 100644 index 0000000000..d506bfba40 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java @@ -0,0 +1,588 @@ +/* + * Copyright (c) 2024, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.dfs; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.sameInstance; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.when; + +import java.util.EnumSet; +import java.util.List; +import java.util.Map; + +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCache.Ref; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCache.RefLoader; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.DfsBlockCachePackExtConfig; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheTable.DfsBlockCacheStats; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.junit.Test; +import org.mockito.Mockito; + +public class PackExtBlockCacheTableTest { + @Test + public void fromBlockCacheConfigs_createsDfsPackExtBlockCacheTables() { + DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig(); + cacheConfig.setPackExtCacheConfigurations( + List.of(new DfsBlockCachePackExtConfig(EnumSet.of(PackExt.PACK), + new DfsBlockCacheConfig()))); + assertNotNull( + PackExtBlockCacheTable.fromBlockCacheConfigs(cacheConfig)); + } + + @Test + public void fromBlockCacheConfigs_noPackExtConfigurationGiven_packExtCacheConfigurationsIsEmpty_throws() { + DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig(); + cacheConfig.setPackExtCacheConfigurations(List.of()); + assertThrows(IllegalArgumentException.class, + () -> PackExtBlockCacheTable + .fromBlockCacheConfigs(cacheConfig)); + } + + @Test + public void hasBlock0_packExtMapsToCacheTable_callsBitmapIndexCacheTable() { + DfsStreamKey streamKey = new TestKey(PackExt.BITMAP_INDEX); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.hasBlock0(any(DfsStreamKey.class))) + .thenReturn(true); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertTrue(tables.hasBlock0(streamKey)); + } + + @Test + public void hasBlock0_packExtDoesNotMapToCacheTable_callsDefaultCache() { + DfsStreamKey streamKey = new TestKey(PackExt.PACK); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.hasBlock0(any(DfsStreamKey.class))) + .thenReturn(true); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertTrue(tables.hasBlock0(streamKey)); + } + + @Test + public void getOrLoad_packExtMapsToCacheTable_callsBitmapIndexCacheTable() + throws Exception { + BlockBasedFile blockBasedFile = new BlockBasedFile(null, + mock(DfsPackDescription.class), PackExt.BITMAP_INDEX) { + }; + DfsBlock dfsBlock = mock(DfsBlock.class); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.getOrLoad(any(BlockBasedFile.class), + anyLong(), any(DfsReader.class), + any(DfsBlockCache.ReadableChannelSupplier.class))) + .thenReturn(mock(DfsBlock.class)); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.getOrLoad(any(BlockBasedFile.class), + anyLong(), any(DfsReader.class), + any(DfsBlockCache.ReadableChannelSupplier.class))) + .thenReturn(dfsBlock); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat( + tables.getOrLoad(blockBasedFile, 0, mock(DfsReader.class), + mock(DfsBlockCache.ReadableChannelSupplier.class)), + sameInstance(dfsBlock)); + } + + @Test + public void getOrLoad_packExtDoesNotMapToCacheTable_callsDefaultCache() + throws Exception { + BlockBasedFile blockBasedFile = new BlockBasedFile(null, + mock(DfsPackDescription.class), PackExt.PACK) { + }; + DfsBlock dfsBlock = mock(DfsBlock.class); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.getOrLoad(any(BlockBasedFile.class), + anyLong(), any(DfsReader.class), + any(DfsBlockCache.ReadableChannelSupplier.class))) + .thenReturn(dfsBlock); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.getOrLoad(any(BlockBasedFile.class), + anyLong(), any(DfsReader.class), + any(DfsBlockCache.ReadableChannelSupplier.class))) + .thenReturn(mock(DfsBlock.class)); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat( + tables.getOrLoad(blockBasedFile, 0, mock(DfsReader.class), + mock(DfsBlockCache.ReadableChannelSupplier.class)), + sameInstance(dfsBlock)); + } + + @Test + public void getOrLoadRef_packExtMapsToCacheTable_callsBitmapIndexCacheTable() + throws Exception { + Ref ref = mock(Ref.class); + DfsStreamKey dfsStreamKey = new TestKey(PackExt.BITMAP_INDEX); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.getOrLoadRef(any(DfsStreamKey.class), + anyLong(), any(RefLoader.class))).thenReturn(mock(Ref.class)); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.getOrLoadRef(any(DfsStreamKey.class), + anyLong(), any(RefLoader.class))).thenReturn(ref); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat(tables.getOrLoadRef(dfsStreamKey, 0, mock(RefLoader.class)), + sameInstance(ref)); + } + + @Test + public void getOrLoadRef_packExtDoesNotMapToCacheTable_callsDefaultCache() + throws Exception { + Ref ref = mock(Ref.class); + DfsStreamKey dfsStreamKey = new TestKey(PackExt.PACK); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.getOrLoadRef(any(DfsStreamKey.class), + anyLong(), any(RefLoader.class))).thenReturn(ref); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.getOrLoadRef(any(DfsStreamKey.class), + anyLong(), any(RefLoader.class))).thenReturn(mock(Ref.class)); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat(tables.getOrLoadRef(dfsStreamKey, 0, mock(RefLoader.class)), + sameInstance(ref)); + } + + @Test + public void putDfsBlock_packExtMapsToCacheTable_callsBitmapIndexCacheTable() { + DfsStreamKey dfsStreamKey = new TestKey(PackExt.BITMAP_INDEX); + DfsBlock dfsBlock = new DfsBlock(dfsStreamKey, 0, new byte[0]); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + tables.put(dfsBlock); + Mockito.verify(bitmapIndexCacheTable, times(1)).put(dfsBlock); + } + + @Test + public void putDfsBlock_packExtDoesNotMapToCacheTable_callsDefaultCache() { + DfsStreamKey dfsStreamKey = new TestKey(PackExt.PACK); + DfsBlock dfsBlock = new DfsBlock(dfsStreamKey, 0, new byte[0]); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + tables.put(dfsBlock); + Mockito.verify(defaultBlockCacheTable, times(1)).put(dfsBlock); + } + + @Test + public void putDfsStreamKey_packExtMapsToCacheTable_callsBitmapIndexCacheTable() { + DfsStreamKey dfsStreamKey = new TestKey(PackExt.BITMAP_INDEX); + Ref ref = mock(Ref.class); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.put(any(DfsStreamKey.class), anyLong(), + anyLong(), anyInt())).thenReturn(mock(Ref.class)); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.put(any(DfsStreamKey.class), anyLong(), + anyLong(), anyInt())).thenReturn(ref); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat(tables.put(dfsStreamKey, 0, 0, 0), sameInstance(ref)); + } + + @Test + public void putDfsStreamKey_packExtDoesNotMapToCacheTable_callsDefaultCache() { + DfsStreamKey dfsStreamKey = new TestKey(PackExt.PACK); + Ref ref = mock(Ref.class); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.put(any(DfsStreamKey.class), anyLong(), + anyLong(), anyInt())).thenReturn(ref); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.put(any(DfsStreamKey.class), anyLong(), + anyLong(), anyInt())).thenReturn(mock(Ref.class)); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat(tables.put(dfsStreamKey, 0, 0, 0), sameInstance(ref)); + } + + @Test + public void putRef_packExtMapsToCacheTable_callsBitmapIndexCacheTable() { + DfsStreamKey dfsStreamKey = new TestKey(PackExt.BITMAP_INDEX); + Ref ref = mock(Ref.class); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.putRef(any(DfsStreamKey.class), anyLong(), + anyInt())).thenReturn(mock(Ref.class)); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.putRef(any(DfsStreamKey.class), anyLong(), + anyInt())).thenReturn(ref); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat(tables.putRef(dfsStreamKey, 0, 0), sameInstance(ref)); + } + + @Test + public void putRef_packExtDoesNotMapToCacheTable_callsDefaultCache() { + DfsStreamKey dfsStreamKey = new TestKey(PackExt.PACK); + Ref ref = mock(Ref.class); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.putRef(any(DfsStreamKey.class), anyLong(), + anyInt())).thenReturn(ref); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.putRef(any(DfsStreamKey.class), anyLong(), + anyInt())).thenReturn(mock(Ref.class)); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat(tables.putRef(dfsStreamKey, 0, 0), sameInstance(ref)); + } + + @Test + public void contains_packExtMapsToCacheTable_callsBitmapIndexCacheTable() { + DfsStreamKey streamKey = new TestKey(PackExt.BITMAP_INDEX); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.contains(any(DfsStreamKey.class), anyLong())) + .thenReturn(true); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertTrue(tables.contains(streamKey, 0)); + } + + @Test + public void contains_packExtDoesNotMapToCacheTable_callsDefaultCache() { + DfsStreamKey streamKey = new TestKey(PackExt.PACK); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.contains(any(DfsStreamKey.class), + anyLong())).thenReturn(true); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertTrue(tables.contains(streamKey, 0)); + } + + @Test + public void get_packExtMapsToCacheTable_callsBitmapIndexCacheTable() { + DfsStreamKey dfsStreamKey = new TestKey(PackExt.BITMAP_INDEX); + Ref ref = mock(Ref.class); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.get(any(DfsStreamKey.class), anyLong())) + .thenReturn(mock(Ref.class)); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.get(any(DfsStreamKey.class), anyLong())) + .thenReturn(ref); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat(tables.get(dfsStreamKey, 0), sameInstance(ref)); + } + + @Test + public void get_packExtDoesNotMapToCacheTable_callsDefaultCache() { + DfsStreamKey dfsStreamKey = new TestKey(PackExt.PACK); + Ref ref = mock(Ref.class); + DfsBlockCacheTable defaultBlockCacheTable = mock( + DfsBlockCacheTable.class); + when(defaultBlockCacheTable.get(any(DfsStreamKey.class), anyLong())) + .thenReturn(ref); + DfsBlockCacheTable bitmapIndexCacheTable = mock( + DfsBlockCacheTable.class); + when(bitmapIndexCacheTable.get(any(DfsStreamKey.class), anyLong())) + .thenReturn(mock(Ref.class)); + + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + defaultBlockCacheTable, + Map.of(PackExt.BITMAP_INDEX, bitmapIndexCacheTable)); + + assertThat(tables.get(dfsStreamKey, 0), sameInstance(ref)); + } + + @Test + public void getBlockCacheStats_getCurrentSize_consolidatesAllTableCurrentSizes() { + long[] currentSizes = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + packStats.addToLiveBytes(new TestKey(PackExt.PACK), 5); + currentSizes[PackExt.PACK.getPosition()] = 5; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + bitmapStats.addToLiveBytes(new TestKey(PackExt.BITMAP_INDEX), 6); + currentSizes[PackExt.BITMAP_INDEX.getPosition()] = 6; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + indexStats.addToLiveBytes(new TestKey(PackExt.INDEX), 7); + currentSizes[PackExt.INDEX.getPosition()] = 7; + + PackExtBlockCacheTable tables = PackExtBlockCacheTable + .fromCacheTables(cacheTableWithStats(packStats), + Map.of(PackExt.BITMAP_INDEX, + cacheTableWithStats(bitmapStats), PackExt.INDEX, + cacheTableWithStats(indexStats))); + + assertArrayEquals(tables.getBlockCacheStats().getCurrentSize(), + currentSizes); + } + + @Test + public void getBlockCacheStats_GetHitCount_consolidatesAllTableHitCounts() { + long[] hitCounts = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, + () -> packStats.incrementHit(new TestKey(PackExt.PACK))); + hitCounts[PackExt.PACK.getPosition()] = 5; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> bitmapStats + .incrementHit(new TestKey(PackExt.BITMAP_INDEX))); + hitCounts[PackExt.BITMAP_INDEX.getPosition()] = 6; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, + () -> indexStats.incrementHit(new TestKey(PackExt.INDEX))); + hitCounts[PackExt.INDEX.getPosition()] = 7; + + PackExtBlockCacheTable tables = PackExtBlockCacheTable + .fromCacheTables(cacheTableWithStats(packStats), + Map.of(PackExt.BITMAP_INDEX, + cacheTableWithStats(bitmapStats), PackExt.INDEX, + cacheTableWithStats(indexStats))); + + assertArrayEquals(tables.getBlockCacheStats().getHitCount(), hitCounts); + } + + @Test + public void getBlockCacheStats_getMissCount_consolidatesAllTableMissCounts() { + long[] missCounts = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, + () -> packStats.incrementMiss(new TestKey(PackExt.PACK))); + missCounts[PackExt.PACK.getPosition()] = 5; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> bitmapStats + .incrementMiss(new TestKey(PackExt.BITMAP_INDEX))); + missCounts[PackExt.BITMAP_INDEX.getPosition()] = 6; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, + () -> indexStats.incrementMiss(new TestKey(PackExt.INDEX))); + missCounts[PackExt.INDEX.getPosition()] = 7; + + PackExtBlockCacheTable tables = PackExtBlockCacheTable + .fromCacheTables(cacheTableWithStats(packStats), + Map.of(PackExt.BITMAP_INDEX, + cacheTableWithStats(bitmapStats), PackExt.INDEX, + cacheTableWithStats(indexStats))); + + assertArrayEquals(tables.getBlockCacheStats().getMissCount(), + missCounts); + } + + @Test + public void getBlockCacheStats_getTotalRequestCount_consolidatesAllTableTotalRequestCounts() { + long[] totalRequestCounts = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, () -> { + packStats.incrementHit(new TestKey(PackExt.PACK)); + packStats.incrementMiss(new TestKey(PackExt.PACK)); + }); + totalRequestCounts[PackExt.PACK.getPosition()] = 10; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> { + bitmapStats.incrementHit(new TestKey(PackExt.BITMAP_INDEX)); + bitmapStats.incrementMiss(new TestKey(PackExt.BITMAP_INDEX)); + }); + totalRequestCounts[PackExt.BITMAP_INDEX.getPosition()] = 12; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, () -> { + indexStats.incrementHit(new TestKey(PackExt.INDEX)); + indexStats.incrementMiss(new TestKey(PackExt.INDEX)); + }); + totalRequestCounts[PackExt.INDEX.getPosition()] = 14; + + PackExtBlockCacheTable tables = PackExtBlockCacheTable + .fromCacheTables(cacheTableWithStats(packStats), + Map.of(PackExt.BITMAP_INDEX, + cacheTableWithStats(bitmapStats), PackExt.INDEX, + cacheTableWithStats(indexStats))); + + assertArrayEquals(tables.getBlockCacheStats().getTotalRequestCount(), + totalRequestCounts); + } + + @Test + public void getBlockCacheStats_getHitRatio_consolidatesAllTableHitRatios() { + long[] hitRatios = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, + () -> packStats.incrementHit(new TestKey(PackExt.PACK))); + hitRatios[PackExt.PACK.getPosition()] = 100; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> { + bitmapStats.incrementHit(new TestKey(PackExt.BITMAP_INDEX)); + bitmapStats.incrementMiss(new TestKey(PackExt.BITMAP_INDEX)); + }); + hitRatios[PackExt.BITMAP_INDEX.getPosition()] = 50; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, + () -> indexStats.incrementMiss(new TestKey(PackExt.INDEX))); + hitRatios[PackExt.INDEX.getPosition()] = 0; + + PackExtBlockCacheTable tables = PackExtBlockCacheTable + .fromCacheTables(cacheTableWithStats(packStats), + Map.of(PackExt.BITMAP_INDEX, + cacheTableWithStats(bitmapStats), PackExt.INDEX, + cacheTableWithStats(indexStats))); + + assertArrayEquals(tables.getBlockCacheStats().getHitRatio(), hitRatios); + } + + @Test + public void getBlockCacheStats_getEvictions_consolidatesAllTableEvictions() { + long[] evictions = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, + () -> packStats.incrementEvict(new TestKey(PackExt.PACK))); + evictions[PackExt.PACK.getPosition()] = 5; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> bitmapStats + .incrementEvict(new TestKey(PackExt.BITMAP_INDEX))); + evictions[PackExt.BITMAP_INDEX.getPosition()] = 6; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, + () -> indexStats.incrementEvict(new TestKey(PackExt.INDEX))); + evictions[PackExt.INDEX.getPosition()] = 7; + + PackExtBlockCacheTable tables = PackExtBlockCacheTable + .fromCacheTables(cacheTableWithStats(packStats), + Map.of(PackExt.BITMAP_INDEX, + cacheTableWithStats(bitmapStats), PackExt.INDEX, + cacheTableWithStats(indexStats))); + + assertArrayEquals(tables.getBlockCacheStats().getEvictions(), + evictions); + } + + private static void incrementCounter(int amount, Runnable fn) { + for (int i = 0; i < amount; i++) { + fn.run(); + } + } + + private static long[] createEmptyStatsArray() { + return new long[PackExt.values().length]; + } + + private static DfsBlockCacheTable cacheTableWithStats( + DfsBlockCacheStats dfsBlockCacheStats) { + DfsBlockCacheTable cacheTable = mock(DfsBlockCacheTable.class); + when(cacheTable.getBlockCacheStats()).thenReturn(dfsBlockCacheStats); + return cacheTable; + } + + private static class TestKey extends DfsStreamKey { + TestKey(PackExt packExt) { + super(0, packExt); + } + + @Override + public boolean equals(Object o) { + return false; + } + } +} diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 9d12facb33..a15fe1f372 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -285,6 +285,8 @@ DIRCUnrecognizedExtendedFlags=Unrecognized extended flags: {0} downloadCancelled=Download cancelled downloadCancelledDuringIndexing=Download cancelled during indexing duplicateAdvertisementsOf=duplicate advertisements of {0} +duplicateCacheTablesGiven=Duplicate cache tables given +duplicatePackExtensionsForCacheTables=Duplicate pack extension {0} in cache tables duplicatePackExtensionsSet=Attempting to configure duplicate pack extensions: {0}.{1}.{2} contains {3} duplicateRef=Duplicate ref: {0} duplicateRefAttribute=Duplicate ref attribute: {0} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 311d9c22aa..e31533aaa2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -315,6 +315,8 @@ public class JGitText extends TranslationBundle { /***/ public String downloadCancelled; /***/ public String downloadCancelledDuringIndexing; /***/ public String duplicateAdvertisementsOf; + /***/ public String duplicateCacheTablesGiven; + /***/ public String duplicatePackExtensionsForCacheTables; /***/ public String duplicatePackExtensionsSet; /***/ public String duplicateRef; /***/ public String duplicateRefAttribute; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index fa86701de8..20f4666373 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -263,6 +263,21 @@ public class DfsBlockCacheConfig { return packExtCacheConfigurations; } + /** + * Set the list of pack ext cache configs. + * + * Made visible for testing. + * + * @param packExtCacheConfigurations + * the list of pack ext cache configs to set. + * @return {@code this} + */ + DfsBlockCacheConfig setPackExtCacheConfigurations( + List packExtCacheConfigurations) { + this.packExtCacheConfigurations = packExtCacheConfigurations; + return this; + } + /** * Update properties by setting fields from the configuration. *

@@ -435,7 +450,15 @@ public class DfsBlockCacheConfig { // Configuration for the cache instance. private final DfsBlockCacheConfig packExtCacheConfiguration; - private DfsBlockCachePackExtConfig(EnumSet packExts, + /** + * Made visible for testing. + * + * @param packExts + * Set of {@link PackExt}s associated to this cache config. + * @param packExtCacheConfiguration + * {@link DfsBlockCacheConfig} for this cache config. + */ + DfsBlockCachePackExtConfig(EnumSet packExts, DfsBlockCacheConfig packExtCacheConfiguration) { this.packExts = packExts; this.packExtCacheConfiguration = packExtCacheConfiguration; @@ -475,6 +498,5 @@ public class DfsBlockCacheConfig { return new DfsBlockCachePackExtConfig(EnumSet.copyOf(packExts), dfsBlockCacheConfig); } - } } \ No newline at end of file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java new file mode 100644 index 0000000000..858f731b70 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java @@ -0,0 +1,289 @@ +/* + * Copyright (c) 2024, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.dfs; + +import java.io.IOException; +import java.text.MessageFormat; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCache.ReadableChannelSupplier; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCache.Ref; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCache.RefLoader; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.DfsBlockCachePackExtConfig; +import org.eclipse.jgit.internal.storage.pack.PackExt; + +/** + * A table that holds multiple cache tables accessed by {@link PackExt} types. + * + *

+ * Allows the separation of entries from different {@link PackExt} types to + * limit churn in cache caused by entries of differing sizes. + *

+ * Separating these tables enables the fine-tuning of cache tables per extension + * type. + */ +class PackExtBlockCacheTable implements DfsBlockCacheTable { + private final DfsBlockCacheTable defaultBlockCacheTable; + + // Holds the unique tables backing the extBlockCacheTables values. + private final List blockCacheTableList; + + // Holds the mapping of PackExt to DfsBlockCacheTables. + // The relation between the size of extBlockCacheTables entries and + // blockCacheTableList entries is: + // blockCacheTableList.size() <= extBlockCacheTables.size() + private final Map extBlockCacheTables; + + /** + * Builds the PackExtBlockCacheTable from a list of + * {@link DfsBlockCachePackExtConfig}s. + * + * @param cacheConfig + * {@link DfsBlockCacheConfig} containing + * {@link DfsBlockCachePackExtConfig}s used to configure + * PackExtBlockCacheTable. The {@link DfsBlockCacheConfig} holds + * the configuration for the default cache table. + * @return the cache table built from the given configs. + * @throws IllegalArgumentException + * when no {@link DfsBlockCachePackExtConfig} exists in the + * {@link DfsBlockCacheConfig}. + */ + static PackExtBlockCacheTable fromBlockCacheConfigs( + DfsBlockCacheConfig cacheConfig) { + DfsBlockCacheTable defaultTable = new ClockBlockCacheTable(cacheConfig); + Map packExtBlockCacheTables = new HashMap<>(); + List packExtConfigs = cacheConfig + .getPackExtCacheConfigurations(); + if (packExtConfigs == null || packExtConfigs.size() == 0) { + throw new IllegalArgumentException( + JGitText.get().noPackExtConfigurationGiven); + } + for (DfsBlockCachePackExtConfig packExtCacheConfig : packExtConfigs) { + DfsBlockCacheTable table = new ClockBlockCacheTable( + packExtCacheConfig.getPackExtCacheConfiguration()); + for (PackExt packExt : packExtCacheConfig.getPackExts()) { + if (packExtBlockCacheTables.containsKey(packExt)) { + throw new IllegalArgumentException(MessageFormat.format( + JGitText.get().duplicatePackExtensionsForCacheTables, + packExt)); + } + packExtBlockCacheTables.put(packExt, table); + } + } + return fromCacheTables(defaultTable, packExtBlockCacheTables); + } + + /** + * Creates a new PackExtBlockCacheTable from the combination of a default + * {@link DfsBlockCacheTable} and a map of {@link PackExt}s to + * {@link DfsBlockCacheTable}s. + *

+ * This method allows for the PackExtBlockCacheTable to handle a mapping of + * {@link PackExt}s to arbitrarily defined {@link DfsBlockCacheTable} + * implementations. This is especially useful for users wishing to implement + * custom cache tables. + *

+ * This is currently made visible for testing. + * + * @param defaultBlockCacheTable + * the default table used when a handling a {@link PackExt} type + * that does not map to a {@link DfsBlockCacheTable} mapped by + * packExtsCacheTablePairs. + * @param packExtBlockCacheTables + * the mapping of {@link PackExt}s to + * {@link DfsBlockCacheTable}s. A single + * {@link DfsBlockCacheTable} can be defined for multiple + * {@link PackExt}s in a many-to-one relationship. + * @return the PackExtBlockCacheTable created from the + * defaultBlockCacheTable and packExtsCacheTablePairs mapping. + * @throws IllegalArgumentException + * when a {@link PackExt} is defined for multiple + * {@link DfsBlockCacheTable}s. + */ + static PackExtBlockCacheTable fromCacheTables( + DfsBlockCacheTable defaultBlockCacheTable, + Map packExtBlockCacheTables) { + Set blockCacheTables = new HashSet<>(); + blockCacheTables.add(defaultBlockCacheTable); + blockCacheTables.addAll(packExtBlockCacheTables.values()); + return new PackExtBlockCacheTable(defaultBlockCacheTable, + List.copyOf(blockCacheTables), packExtBlockCacheTables); + } + + private PackExtBlockCacheTable(DfsBlockCacheTable defaultBlockCacheTable, + List blockCacheTableList, + Map extBlockCacheTables) { + this.defaultBlockCacheTable = defaultBlockCacheTable; + this.blockCacheTableList = blockCacheTableList; + this.extBlockCacheTables = extBlockCacheTables; + } + + @Override + public boolean hasBlock0(DfsStreamKey key) { + return getTable(key).hasBlock0(key); + } + + @Override + public DfsBlock getOrLoad(BlockBasedFile file, long position, + DfsReader dfsReader, ReadableChannelSupplier fileChannel) + throws IOException { + return getTable(file.ext).getOrLoad(file, position, dfsReader, + fileChannel); + } + + @Override + public Ref getOrLoadRef(DfsStreamKey key, long position, + RefLoader loader) throws IOException { + return getTable(key).getOrLoadRef(key, position, loader); + } + + @Override + public void put(DfsBlock v) { + getTable(v.stream).put(v); + } + + @Override + public Ref put(DfsStreamKey key, long pos, long size, T v) { + return getTable(key).put(key, pos, size, v); + } + + @Override + public Ref putRef(DfsStreamKey key, long size, T v) { + return getTable(key).putRef(key, size, v); + } + + @Override + public boolean contains(DfsStreamKey key, long position) { + return getTable(key).contains(key, position); + } + + @Override + public T get(DfsStreamKey key, long position) { + return getTable(key).get(key, position); + } + + @Override + public BlockCacheStats getBlockCacheStats() { + return new CacheStats(blockCacheTableList.stream() + .map(DfsBlockCacheTable::getBlockCacheStats) + .collect(Collectors.toList())); + } + + private DfsBlockCacheTable getTable(PackExt packExt) { + return extBlockCacheTables.getOrDefault(packExt, + defaultBlockCacheTable); + } + + private DfsBlockCacheTable getTable(DfsStreamKey key) { + return extBlockCacheTables.getOrDefault(getPackExt(key), + defaultBlockCacheTable); + } + + private static PackExt getPackExt(DfsStreamKey key) { + return PackExt.values()[key.packExtPos]; + } + + private static class CacheStats implements BlockCacheStats { + private final List blockCacheStats; + + private CacheStats(List blockCacheStats) { + this.blockCacheStats = blockCacheStats; + } + + @Override + public long[] getCurrentSize() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getCurrentSize()); + } + return sums; + } + + @Override + public long[] getHitCount() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getHitCount()); + } + return sums; + } + + @Override + public long[] getMissCount() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getMissCount()); + } + return sums; + } + + @Override + public long[] getTotalRequestCount() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getTotalRequestCount()); + } + return sums; + } + + @Override + public long[] getHitRatio() { + long[] hit = getHitCount(); + long[] miss = getMissCount(); + long[] ratio = new long[Math.max(hit.length, miss.length)]; + for (int i = 0; i < ratio.length; i++) { + if (i >= hit.length) { + ratio[i] = 0; + } else if (i >= miss.length) { + ratio[i] = 100; + } else { + long total = hit[i] + miss[i]; + ratio[i] = total == 0 ? 0 : hit[i] * 100 / total; + } + } + return ratio; + } + + @Override + public long[] getEvictions() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getEvictions()); + } + return sums; + } + + private static long[] emptyPackStats() { + return new long[PackExt.values().length]; + } + + private static long[] add(long[] first, long[] second) { + long[] sums = new long[Integer.max(first.length, second.length)]; + int i; + for (i = 0; i < Integer.min(first.length, second.length); i++) { + sums[i] = first[i] + second[i]; + } + for (int j = i; j < first.length; j++) { + sums[j] = first[i]; + } + for (int j = i; j < second.length; j++) { + sums[j] = second[i]; + } + return sums; + } + } +} -- cgit v1.2.3 From 31e534193ff531e3aad1f115b16d8bda97bfc9e9 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 10 Apr 2024 13:52:56 -0700 Subject: DfsPackFile: Abstract the loading of pack indexes DfsPackFile assumes that the indexes are stored in file streams and their references need to be cached in DFS. This doesn't allow us to experiment other storage options, like key-value databases. In these experiments not all indexes are together in the same storage. Define an interface per index to load it, so implementors can focus on the specifics of their index. Put them together in the IndexFactory interface. The implementation of the IndexFactory chooses the right combination of storages. At the moment we do this only for primary and reverse indexes. Following changes can do the same for other indexes. Change-Id: Icf790d8ba64b34dbe984759f1c6d8ec702554149 --- .../jgit/internal/storage/dfs/DfsPackFile.java | 253 +++++++++++++++------ 1 file changed, 183 insertions(+), 70 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java index cdd10618e0..845feab5ac 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java @@ -107,6 +107,53 @@ public final class DfsPackFile extends BlockBasedFile { /** Lock for {@link #corruptObjects}. */ private final Object corruptObjectsLock = new Object(); + private final IndexFactory indexFactory; + + /** + * Returns the indexes for this pack. + *

+ * We define indexes in different sub interfaces to allow implementing the + * indexes over different combinations of backends. + *

+ * Implementations decide if/how to cache the indexes. The calling + * DfsPackFile will keep the reference to the index as long as it needs it. + */ + public interface IndexFactory { + /** + * Take care of loading the primary and reverse indexes for this pack. + */ + interface PackIndexes { + /** + * Load the primary index for the pack. + * + * @param ctx + * reader to find the raw bytes + * @return a primary index + * @throws IOException + * a problem finding/parsing the index + */ + PackIndex index(DfsReader ctx) throws IOException; + + /** + * Load the reverse index of the pack + * + * @param ctx + * reader to find the raw bytes + * @return the reverse index of the pack + * @throws IOException + * a problem finding/parsing the reverse index + */ + PackReverseIndex reverseIndex(DfsReader ctx) throws IOException; + } + + /** + * Returns a provider of the primary and reverse indexes of this pack + * + * @return an implementation of the {@link PackIndexes} interface + */ + PackIndexes getPackIndexes(); + } + /** * Construct a reader for an existing, packfile. * @@ -116,7 +163,8 @@ public final class DfsPackFile extends BlockBasedFile { * description of the pack within the DFS. */ DfsPackFile(DfsBlockCache cache, DfsPackDescription desc) { - this(cache, desc, DEFAULT_BITMAP_LOADER); + this(cache, desc, DEFAULT_BITMAP_LOADER, + new CachedStreamIndexFactory(cache, desc)); } /** @@ -128,9 +176,11 @@ public final class DfsPackFile extends BlockBasedFile { * description of the pack within the DFS * @param bitmapLoader * loader to get the bitmaps of this pack (if any) + * @param indexFactory + * an IndexFactory to get references to the indexes of this pack */ public DfsPackFile(DfsBlockCache cache, DfsPackDescription desc, - PackBitmapIndexLoader bitmapLoader) { + PackBitmapIndexLoader bitmapLoader, IndexFactory indexFactory) { super(cache, desc, PACK); int bs = desc.getBlockSize(PACK); @@ -142,6 +192,7 @@ public final class DfsPackFile extends BlockBasedFile { length = sz > 0 ? sz : -1; this.bitmapLoader = bitmapLoader; + this.indexFactory = indexFactory; } /** @@ -196,22 +247,7 @@ public final class DfsPackFile extends BlockBasedFile { Repository.getGlobalListenerList() .dispatch(new BeforeDfsPackIndexLoadedEvent(this)); try { - DfsStreamKey idxKey = desc.getStreamKey(INDEX); - // Keep the value parsed in the loader, in case the Ref<> is - // nullified in ClockBlockCacheTable#reserveSpace - // before we read its value. - AtomicReference loadedRef = new AtomicReference<>(null); - DfsBlockCache.Ref cachedRef = cache.getOrLoadRef(idxKey, - REF_POSITION, () -> { - RefWithSize idx = loadPackIndex(ctx); - loadedRef.set(idx.ref); - return new DfsBlockCache.Ref<>(idxKey, REF_POSITION, - idx.size, idx.ref); - }); - if (loadedRef.get() == null) { - ctx.stats.idxCacheHit++; - } - index = cachedRef.get() != null ? cachedRef.get() : loadedRef.get(); + index = indexFactory.getPackIndexes().index(ctx); if (index == null) { throw new IOException( "Couldn't get a reference to the primary index"); //$NON-NLS-1$ @@ -328,26 +364,7 @@ public final class DfsPackFile extends BlockBasedFile { return reverseIndex; } - PackIndex idx = idx(ctx); - DfsStreamKey revKey = desc.getStreamKey(REVERSE_INDEX); - // Keep the value parsed in the loader, in case the Ref<> is - // nullified in ClockBlockCacheTable#reserveSpace - // before we read its value. - AtomicReference loadedRef = new AtomicReference<>( - null); - DfsBlockCache.Ref cachedRef = cache - .getOrLoadRef(revKey, REF_POSITION, () -> { - RefWithSize ridx = loadReverseIdx(ctx, - idx); - loadedRef.set(ridx.ref); - return new DfsBlockCache.Ref<>(revKey, REF_POSITION, - ridx.size, ridx.ref); - }); - if (loadedRef.get() == null) { - ctx.stats.ridxCacheHit++; - } - reverseIndex = cachedRef.get() != null ? cachedRef.get() - : loadedRef.get(); + reverseIndex = indexFactory.getPackIndexes().reverseIndex(ctx); if (reverseIndex == null) { throw new IOException( "Couldn't get a reference to the reverse index"); //$NON-NLS-1$ @@ -1227,38 +1244,6 @@ public final class DfsPackFile extends BlockBasedFile { } } - private RefWithSize loadPackIndex(DfsReader ctx) - throws IOException { - try { - ctx.stats.readIdx++; - long start = System.nanoTime(); - try (ReadableChannel rc = ctx.db.openFile(desc, INDEX)) { - PackIndex idx = PackIndex.read(alignTo8kBlocks(rc)); - ctx.stats.readIdxBytes += rc.position(); - return new RefWithSize<>(idx, idx.getObjectCount() * REC_SIZE); - } finally { - ctx.stats.readIdxMicros += elapsedMicros(start); - } - } catch (EOFException e) { - throw new IOException(MessageFormat.format( - DfsText.get().shortReadOfIndex, - desc.getFileName(INDEX)), e); - } catch (IOException e) { - throw new IOException(MessageFormat.format( - DfsText.get().cannotReadIndex, - desc.getFileName(INDEX)), e); - } - } - - private static RefWithSize loadReverseIdx(DfsReader ctx, - PackIndex idx) { - ctx.stats.readReverseIdx++; - long start = System.nanoTime(); - PackReverseIndex revidx = PackReverseIndexFactory.computeFromIndex(idx); - ctx.stats.readReverseIdxMicros += elapsedMicros(start); - return new RefWithSize<>(revidx, idx.getObjectCount() * 8); - } - private DfsBlockCache.Ref loadObjectSizeIndex( DfsReader ctx, DfsStreamKey objectSizeIndexKey) throws IOException { ctx.stats.readObjectSizeIndex++; @@ -1457,6 +1442,134 @@ public final class DfsPackFile extends BlockBasedFile { } } + /** + * An index factory backed by Dfs streams and references cached in + * DfsBlockCache + */ + public static final class CachedStreamIndexFactory implements IndexFactory { + private final CachedStreamPackIndexes indexes; + + /** + * An index factory + * + * @param cache + * DFS block cache to use for the references + * @param desc + * This factory loads indexes for this package + */ + public CachedStreamIndexFactory(DfsBlockCache cache, + DfsPackDescription desc) { + this.indexes = new CachedStreamPackIndexes(cache, desc); + } + + @Override + public PackIndexes getPackIndexes() { + return indexes; + } + } + + /** + * Load primary and reverse index from Dfs streams and cache the references + * in DfsBlockCache. + */ + public static final class CachedStreamPackIndexes implements IndexFactory.PackIndexes { + private final DfsBlockCache cache; + + private final DfsPackDescription desc; + + /** + * An index factory + * + * @param cache + * DFS block cache to use for the references + * @param desc This factory loads indexes for this package + */ + public CachedStreamPackIndexes(DfsBlockCache cache, + DfsPackDescription desc) { + this.cache = cache; + this.desc = desc; + } + + @Override + public PackIndex index(DfsReader ctx) throws IOException { + DfsStreamKey idxKey = desc.getStreamKey(INDEX); + // Keep the value parsed in the loader, in case the Ref<> is + // nullified in ClockBlockCacheTable#reserveSpace + // before we read its value. + AtomicReference loadedRef = new AtomicReference<>(null); + DfsBlockCache.Ref cachedRef = cache.getOrLoadRef(idxKey, + REF_POSITION, () -> { + RefWithSize idx = loadPackIndex(ctx, desc); + loadedRef.set(idx.ref); + return new DfsBlockCache.Ref<>(idxKey, REF_POSITION, + idx.size, idx.ref); + }); + if (loadedRef.get() == null) { + ctx.stats.idxCacheHit++; + } + return cachedRef.get() != null ? cachedRef.get() : loadedRef.get(); + } + + private static RefWithSize loadPackIndex(DfsReader ctx, + DfsPackDescription desc) throws IOException { + try { + ctx.stats.readIdx++; + long start = System.nanoTime(); + try (ReadableChannel rc = ctx.db.openFile(desc, INDEX)) { + PackIndex idx = PackIndex.read(alignTo8kBlocks(rc)); + ctx.stats.readIdxBytes += rc.position(); + return new RefWithSize<>(idx, + idx.getObjectCount() * REC_SIZE); + } finally { + ctx.stats.readIdxMicros += elapsedMicros(start); + } + } catch (EOFException e) { + throw new IOException( + MessageFormat.format(DfsText.get().shortReadOfIndex, + desc.getFileName(INDEX)), + e); + } catch (IOException e) { + throw new IOException( + MessageFormat.format(DfsText.get().cannotReadIndex, + desc.getFileName(INDEX)), + e); + } + } + + @Override + public PackReverseIndex reverseIndex(DfsReader ctx) throws IOException { + PackIndex idx = index(ctx); + DfsStreamKey revKey = desc.getStreamKey(REVERSE_INDEX); + // Keep the value parsed in the loader, in case the Ref<> is + // nullified in ClockBlockCacheTable#reserveSpace + // before we read its value. + AtomicReference loadedRef = new AtomicReference<>( + null); + DfsBlockCache.Ref cachedRef = cache + .getOrLoadRef(revKey, REF_POSITION, () -> { + RefWithSize ridx = loadReverseIdx(ctx, + idx); + loadedRef.set(ridx.ref); + return new DfsBlockCache.Ref<>(revKey, REF_POSITION, + ridx.size, ridx.ref); + }); + if (loadedRef.get() == null) { + ctx.stats.ridxCacheHit++; + } + return cachedRef.get() != null ? cachedRef.get() : loadedRef.get(); + } + + private static RefWithSize loadReverseIdx( + DfsReader ctx, PackIndex idx) { + ctx.stats.readReverseIdx++; + long start = System.nanoTime(); + PackReverseIndex revidx = PackReverseIndexFactory + .computeFromIndex(idx); + ctx.stats.readReverseIdxMicros += elapsedMicros(start); + return new RefWithSize<>(revidx, idx.getObjectCount() * 8); + } + } + private static final class RefWithSize { final V ref; final long size; -- cgit v1.2.3 From 81199f02fb49f79ef17b2daa3efac00d16040766 Mon Sep 17 00:00:00 2001 From: granny Date: Tue, 2 Jul 2024 15:15:37 -0700 Subject: Lib: Fix ssh value for gpg.format throwing an IllegalArgumentException Git version 2.34 and later supports signing commits and tags with SSH keys. This means gpg.format now supports "ssh" as a value. Change-Id: Iee1e5a68a816bec149a17a73a6916d2884a54163 --- .../tst/org/eclipse/jgit/lib/GpgConfigTest.java | 10 ++++++++++ org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/GpgConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/GpgConfigTest.java index 32f6766d47..5c2b190777 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/GpgConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/GpgConfigTest.java @@ -95,6 +95,16 @@ public class GpgConfigTest { assertEquals(GpgConfig.GpgFormat.X509, new GpgConfig(c).getKeyFormat()); } + @Test + public void testGetKeyFormat_ssh() throws Exception { + Config c = parse("" // + + "[gpg]\n" // + + " format = ssh\n" // + ); + + assertEquals(GpgConfig.GpgFormat.SSH, new GpgConfig(c).getKeyFormat()); + } + @Test public void testGetSigningKey() throws Exception { Config c = parse("" // diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java index 427a235f3b..4b0c07983f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java @@ -24,7 +24,9 @@ public class GpgConfig { /** Value for openpgp */ OPENPGP("openpgp"), //$NON-NLS-1$ /** Value for x509 */ - X509("x509"); //$NON-NLS-1$ + X509("x509"), //$NON-NLS-1$ + /** Value for ssh */ + SSH("ssh"); //$NON-NLS-1$ private final String configValue; -- cgit v1.2.3 From b44894870440da82ee392e884a7b1fce327bc809 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 31 Jul 2024 15:04:38 +0200 Subject: JGit v7.0.0.202407311305-m2 Signed-off-by: Matthias Sohn Change-Id: If51ca5e1949fc825146145e45271207d07169474 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7c079a5899..59e77cb50a 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index be954bd8e0..ca18a93a0a 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index b6b52e595e..e94732e76e 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 22f8aff82c..2cff54ff14 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7c3edf475c..de4d18417d 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index e1a3671819..5bb40e58b7 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 322f52f9f4..45f1bcb574 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 054aa59429..09cfdb46eb 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index d8a616f09e..8261882729 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 1fe5318660..72e7d34235 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.test - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 27510e2095..8a7ae53ac1 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index d865b13901..4cda16fca5 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 9749ac1111..2005daa718 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 0733a68ba0..8db61d7dc6 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f4dce68fab..cb7ee60412 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c1ec7ae7c8..54e4f5d85b 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index d29d3879d5..79bac002ba 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51a79d61ef..9c3d7d4c97 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 124129d73d..4115046576 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index bbb29cd846..32551b49f5 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 7645dd1418..48bc9c6dc4 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index edce2d8d27..9257d81fb0 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 01ee7824ca..0d406a247c 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3e983511d5..a6bb165c8e 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index cfeb426385..c98b9da33a 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 67c82652cb..98c05bffb4 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index a3777ffdda..a0d6690141 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index a7ca6336b8..621276471d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2a885f204e..94c2ed53cd 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index af1cbf256a..d2277f0535 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 149ad00121..f89d3da26c 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c33cb29b66..375fda9124 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 8e41ee3d28..5387e38f5b 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 49c1023ef0..2a26b272df 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index a59c82ed1a..513cfdfd1f 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 2cf86bc942..fffa7a844d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index befaa367de..30cd3c340d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 96c8953398..e9c387a370 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2c109c90ee..0f49607790 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f4c1e566a4..0cb88afbb6 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index a048aa1738..137e2ed63d 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 62508e245f..f0db17245b 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 3dd7b10079..4d2f15df53 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index ea66a2383c..51b2e249c2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 23fdd235cb..02fc641a65 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index fc1bf49989..0bd0ca3e30 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 92262a00be..62e62b07c4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 3344dcbb1b..471dc7c9c0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 6f03419cb7..2176a56adc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 45162c97a7..0db4d8525d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8eacae1fe7..cf386e4f13 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 287a723b9c..1f903e5051 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 179eab8a6b..1146a6f824 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index cbb8e4fafc..93acdb5b56 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 61b5dd6031..cc5b302137 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 4c0068bfab..21d90ebae3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 12ab06937a..4e52ae5b03 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 209274feeb..d76f8b561a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 1d82d4a1cc..379692cf79 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index ff46d9e65d..58293d2270 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index c4d4fcf825..aafaa73acc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 4274c94ac3..18774cc434 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 955c5c04b5..3275d99a70 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 90090d6958..927851a1bb 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index bb0c23dd72..8cbabc2e4c 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 8bb1b64622..00e61b440d 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 7cd76c3011..e348475002 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index ad0164086a..c2d06ef973 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 684ab70f86..13e2c6c092 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index f407ce11bf..586948ebb5 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 1ac232a306..81540a5f60 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 967b781d10..beed8dbb42 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index aa50fdd8ce..2428569c33 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index bb0d79b3d5..06bcb7c265 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 7cc3a55b26..805cdb49d1 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 3bf4edd65f..65e0942c26 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 761b6c4aef..e11093d64b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 9da7452428..4dd474be13 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 1dc0e01964..26123644fe 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index a3db63ca23..2be8909006 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index ab70d68a3f..95856bb017 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 05f7c08bd2..e6eb1a2df4 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 04bda44748..0c3fbe8887 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 8170fc6bd2..a29e5a999c 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 6d1e2676af..8c9eeee3b4 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d6c0ba5dcc..988fdc7433 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202407311305-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 7531018bc3..85aa9f3a0f 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202407311305-m2 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202407311305-m2";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 3c6c38992c..01c7ce5f14 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 7a07a3c8a6..85b3c93f53 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0-SNAPSHOT + 7.0.0.202407311305-m2 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 10ffec6a565af75ce9084ed867cad8ac25672e5d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 1 Aug 2024 14:19:32 +0200 Subject: Prepare 7.0.0-SNAPSHOT builds Change-Id: Ic84217b6e8fb43e78b622883eb670ee135c75bbb --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 59e77cb50a..7c079a5899 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index ca18a93a0a..be954bd8e0 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index e94732e76e..b6b52e595e 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 2cff54ff14..22f8aff82c 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index de4d18417d..7c3edf475c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 5bb40e58b7..e1a3671819 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 45f1bcb574..322f52f9f4 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 09cfdb46eb..054aa59429 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 8261882729..d8a616f09e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 72e7d34235..1fe5318660 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 8a7ae53ac1..27510e2095 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 4cda16fca5..d865b13901 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 2005daa718..9749ac1111 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 8db61d7dc6..0733a68ba0 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index cb7ee60412..f4dce68fab 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 54e4f5d85b..c1ec7ae7c8 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 79bac002ba..d29d3879d5 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 9c3d7d4c97..51a79d61ef 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 4115046576..124129d73d 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 32551b49f5..bbb29cd846 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 48bc9c6dc4..7645dd1418 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 9257d81fb0..edce2d8d27 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 0d406a247c..01ee7824ca 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index a6bb165c8e..3e983511d5 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index c98b9da33a..cfeb426385 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 98c05bffb4..67c82652cb 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index a0d6690141..a3777ffdda 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 621276471d..a7ca6336b8 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 94c2ed53cd..2a885f204e 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index d2277f0535..af1cbf256a 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index f89d3da26c..149ad00121 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 375fda9124..c33cb29b66 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 5387e38f5b..8e41ee3d28 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 2a26b272df..49c1023ef0 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 513cfdfd1f..a59c82ed1a 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index fffa7a844d..2cf86bc942 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 30cd3c340d..befaa367de 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index e9c387a370..96c8953398 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 0f49607790..2c109c90ee 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 0cb88afbb6..f4c1e566a4 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 137e2ed63d..a048aa1738 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index f0db17245b..62508e245f 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 4d2f15df53..3dd7b10079 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 51b2e249c2..ea66a2383c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 02fc641a65..23fdd235cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 0bd0ca3e30..fc1bf49989 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 62e62b07c4..92262a00be 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 471dc7c9c0..3344dcbb1b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 2176a56adc..6f03419cb7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 0db4d8525d..45162c97a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index cf386e4f13..8eacae1fe7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 1f903e5051..287a723b9c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 1146a6f824..179eab8a6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 93acdb5b56..cbb8e4fafc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index cc5b302137..61b5dd6031 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 21d90ebae3..4c0068bfab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 4e52ae5b03..12ab06937a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index d76f8b561a..209274feeb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 379692cf79..1d82d4a1cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 58293d2270..ff46d9e65d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index aafaa73acc..c4d4fcf825 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 18774cc434..4274c94ac3 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 3275d99a70..955c5c04b5 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 927851a1bb..90090d6958 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 8cbabc2e4c..bb0c23dd72 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 00e61b440d..8bb1b64622 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index e348475002..7cd76c3011 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index c2d06ef973..ad0164086a 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 13e2c6c092..684ab70f86 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 586948ebb5..f407ce11bf 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 81540a5f60..1ac232a306 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index beed8dbb42..967b781d10 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 2428569c33..aa50fdd8ce 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 06bcb7c265..bb0d79b3d5 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 805cdb49d1..7cc3a55b26 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 65e0942c26..3bf4edd65f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e11093d64b..761b6c4aef 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 4dd474be13..9da7452428 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 26123644fe..1dc0e01964 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 2be8909006..a3db63ca23 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 95856bb017..ab70d68a3f 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index e6eb1a2df4..05f7c08bd2 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 0c3fbe8887..04bda44748 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index a29e5a999c..8170fc6bd2 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 8c9eeee3b4..6d1e2676af 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 988fdc7433..d6c0ba5dcc 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.202407311305-m2 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 85aa9f3a0f..7531018bc3 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202407311305-m2 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202407311305-m2";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 01c7ce5f14..3c6c38992c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 85b3c93f53..7a07a3c8a6 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0.202407311305-m2 + 7.0.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From d82bea9d8bbcb438459f756f3d57068997aeb782 Mon Sep 17 00:00:00 2001 From: Sergey Zakharov Date: Sun, 21 Jul 2024 16:06:19 +0300 Subject: ObjectWalk: Remove duplicated word "the" in class documentation Change-Id: I0ca0b5fc65b5cafc768a053b1de40aea9f14231c --- org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java index 82671d9abb..385f073a77 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java @@ -43,7 +43,7 @@ import org.eclipse.jgit.util.RawParseUtils; * Tree and blob objects reachable from interesting commits are automatically * scheduled for inclusion in the results of {@link #nextObject()}, returning * each object exactly once. Objects are sorted and returned according to the - * the commits that reference them and the order they appear within a tree. + * commits that reference them and the order they appear within a tree. * Ordering can be affected by changing the * {@link org.eclipse.jgit.revwalk.RevSort} used to order the commits that are * returned first. -- cgit v1.2.3 From 9b73ec4d12d65f3366e7cc5c3533d84d8c442a67 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 9 Aug 2024 11:53:01 +0200 Subject: Fix "Comparison of narrow type with wide type in loop condition" This issue was detected by a GitHub CodeQL security scan run on JGit source code. Description of the error raised by the security scan: "In a loop condition, comparison of a value of a narrow type with a value of a wide type may always evaluate to true if the wider value is sufficiently large (or small). This is because the narrower value may overflow. This can lead to an infinite loop." Fix this by using type `long` for the local variable `done`. Change-Id: Ibd4f71299e3f2e40d4331227bd143569a4264d8c --- org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java index 715cbb48fb..cfceed00e8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PackParser.java @@ -531,7 +531,7 @@ public abstract class PackParser { receiving.beginTask(JGitText.get().receivingObjects, (int) expectedObjectCount); try { - for (int done = 0; done < expectedObjectCount; done++) { + for (long done = 0; done < expectedObjectCount; done++) { indexOneObject(); receiving.update(1); if (receiving.isCancelled()) -- cgit v1.2.3 From a5e123349c921bd6850e8d11d00ea142422dddba Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 10 Aug 2024 19:27:07 +0200 Subject: ConfigConstants: Add missing @since 7.0 Change-Id: I1ea31c1f0735b7c8fd09fbedc413d613e4baa803 Signed-off-by: Thomas Wolf --- org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index f4e43c9f53..4be0cceedc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -77,7 +77,11 @@ public final class ConfigConstants { /** The "dfs" section */ public static final String CONFIG_DFS_SECTION = "dfs"; - /** The dfs cache subsection prefix */ + /** + * The dfs cache subsection prefix. + * + * @since 7.0 + */ public static final String CONFIG_DFS_CACHE_PREFIX = "dfs."; /** -- cgit v1.2.3 From 299a7348eb318a0199226c1e633cc46c659d76d3 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 10 Aug 2024 19:36:50 +0200 Subject: [ssh] Bump Apache MINA sshd 2.13.1 -> 2.13.2 Apache MINA 2.13.[01] had a bug in the new sntrup761x25519-sha256 KEX exchange that was fixed in 2.13.2.[1] This is the only upstream code change. Bump the lower bound in the MANIFEST.MFs to 2.13.2 to avoid we ever use the broken 2.13.[01]. [1] https://github.com/apache/mina-sshd/issues/525 Change-Id: I5904f9826f99c46b50abc634153f90035646ce50 Signed-off-by: Thomas Wolf --- WORKSPACE | 6 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 50 +-- .../org.eclipse.jgit.target/jgit-4.17.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.18.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.19.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.20.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.21.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.22.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.23.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.24.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.25.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.26.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.27.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.28.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.29.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.30.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.31.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.32.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.33.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 28 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 104 ++--- pom.xml | 2 +- 23 files changed, 3956 insertions(+), 3956 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index b1a802a3af..4ed6879735 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -108,18 +108,18 @@ maven_jar( sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", ) -SSHD_VERS = "2.13.1" +SSHD_VERS = "2.13.2" maven_jar( name = "sshd-osgi", artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, - sha1 = "50958cc44076749e790d7332021cff546707624c", + sha1 = "34914a5bef9ba3d04971fdec1273b47df835b038", ) maven_jar( name = "sshd-sftp", artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, - sha1 = "e1b6da4ef604718e32cad59ef32618610da7a170", + sha1 = "334f42d5bbc8afb7f1149a37d10f8718cf59cc06", ) JNA_VERS = "5.14.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index a3777ffdda..ee65b851a2 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -8,31 +8,31 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.apache.sshd.common;version="[2.13.0,2.14.0)", - org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", - org.apache.sshd.common.file.virtualfs;version="[2.13.0,2.14.0)", - org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", - org.apache.sshd.common.io;version="[2.13.0,2.14.0)", - org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", - org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", - org.apache.sshd.common.session;version="[2.13.0,2.14.0)", - org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.threads;version="[2.13.0,2.14.0)", - org.apache.sshd.core;version="[2.13.0,2.14.0)", - org.apache.sshd.server;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.gss;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.keyboard;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth.password;version="[2.13.0,2.14.0)", - org.apache.sshd.server.command;version="[2.13.0,2.14.0)", - org.apache.sshd.server.session;version="[2.13.0,2.14.0)", - org.apache.sshd.server.shell;version="[2.13.0,2.14.0)", - org.apache.sshd.server.subsystem;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp.server;version="[2.13.0,2.14.0)", +Import-Package: org.apache.sshd.common;version="[2.13.2,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)", + org.apache.sshd.common.file.virtualfs;version="[2.13.2,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)", + org.apache.sshd.common.io;version="[2.13.2,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.2,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)", + org.apache.sshd.common.session;version="[2.13.2,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.buffer;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.logging;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.threads;version="[2.13.2,2.14.0)", + org.apache.sshd.core;version="[2.13.2,2.14.0)", + org.apache.sshd.server;version="[2.13.2,2.14.0)", + org.apache.sshd.server.auth;version="[2.13.2,2.14.0)", + org.apache.sshd.server.auth.gss;version="[2.13.2,2.14.0)", + org.apache.sshd.server.auth.keyboard;version="[2.13.2,2.14.0)", + org.apache.sshd.server.auth.password;version="[2.13.2,2.14.0)", + org.apache.sshd.server.command;version="[2.13.2,2.14.0)", + org.apache.sshd.server.session;version="[2.13.2,2.14.0)", + org.apache.sshd.server.shell;version="[2.13.2,2.14.0)", + org.apache.sshd.server.subsystem;version="[2.13.2,2.14.0)", + org.apache.sshd.sftp;version="[2.13.2,2.14.0)", + org.apache.sshd.sftp.server;version="[2.13.2,2.14.0)", org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", org.eclipse.jgit.api;version="[7.0.0,7.1.0)", org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", 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 16fba84b6e..dff4e29e61 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 a86c21b4c6..5a37936a72 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 bf2cba12a0..15d8932bbd 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 b46b31b1bb..675292076f 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 2d09438904..7c5fe25159 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 70669a85a9..dc57a43400 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 ddd7675c4c..913389ffd0 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 9e96b38204..e5f8fedd76 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 c5405aa40a..c2e439283a 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 c60aa9ef50..a09f0fc412 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 8de5ac0ae0..b38f17caf5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index ac8dabc037..8dd743d1d0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index e89c063c25..acf5191c20 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 078a8054b7..9773f2b020 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 643228856b..a496c04f92 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 58e495b9fe..33fe7e8c64 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index fac43dc922..b84727ad48 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.1 - jar - - - org.apache.sshd - sshd-sftp - 2.13.1 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.10 + jar + + + org.eclipse.jetty + jetty-io + 12.0.10 + jar + + + org.eclipse.jetty + jetty-security + 12.0.10 + jar + + + org.eclipse.jetty + jetty-server + 12.0.10 + jar + + + org.eclipse.jetty + jetty-session + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util + 12.0.10 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.10 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 fc20d20414..202eda6055 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 @@ -238,12 +238,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.13.1" + version = "2.13.2" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.13.1" + version = "2.13.2" } } diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 1ac232a306..9c6df6b79a 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,20 +8,20 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.0,2.14.0)", - org.apache.sshd.common;version="[2.13.0,2.14.0)", - org.apache.sshd.common.auth;version="[2.13.0,2.14.0)", - org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", - org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", - org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", - org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", - org.apache.sshd.common.session;version="[2.13.0,2.14.0)", - org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.net;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", - org.apache.sshd.core;version="[2.13.0,2.14.0)", - org.apache.sshd.server;version="[2.13.0,2.14.0)", - org.apache.sshd.server.forward;version="[2.13.0,2.14.0)", +Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)", + org.apache.sshd.common;version="[2.13.2,2.14.0)", + org.apache.sshd.common.auth;version="[2.13.2,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.2,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)", + org.apache.sshd.common.session;version="[2.13.2,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.net;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)", + org.apache.sshd.core;version="[2.13.2,2.14.0)", + org.apache.sshd.server;version="[2.13.2,2.14.0)", + org.apache.sshd.server.forward;version="[2.13.2,2.14.0)", org.eclipse.jgit.api;version="[7.0.0,7.1.0)", org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.0,7.1.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index aa50fdd8ce..114582af22 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -37,58 +37,58 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-inter org.eclipse.jgit.transport.sshd.agent;version="7.0.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.13.0,2.14.0)", - org.apache.sshd.client;version="[2.13.0,2.14.0)", - org.apache.sshd.client.auth;version="[2.13.0,2.14.0)", - org.apache.sshd.client.auth.keyboard;version="[2.13.0,2.14.0)", - org.apache.sshd.client.auth.password;version="[2.13.0,2.14.0)", - org.apache.sshd.client.auth.pubkey;version="[2.13.0,2.14.0)", - org.apache.sshd.client.channel;version="[2.13.0,2.14.0)", - org.apache.sshd.client.config.hosts;version="[2.13.0,2.14.0)", - org.apache.sshd.client.config.keys;version="[2.13.0,2.14.0)", - org.apache.sshd.client.future;version="[2.13.0,2.14.0)", - org.apache.sshd.client.keyverifier;version="[2.13.0,2.14.0)", - org.apache.sshd.client.session;version="[2.13.0,2.14.0)", - org.apache.sshd.client.session.forward;version="[2.13.0,2.14.0)", - org.apache.sshd.common;version="[2.13.0,2.14.0)", - org.apache.sshd.common.auth;version="[2.13.0,2.14.0)", - org.apache.sshd.common.channel;version="[2.13.0,2.14.0)", - org.apache.sshd.common.cipher;version="[2.13.0,2.14.0)", - org.apache.sshd.common.compression;version="[2.13.0,2.14.0)", - org.apache.sshd.common.config.keys;version="[2.13.0,2.14.0)", - org.apache.sshd.common.config.keys.loader;version="[2.13.0,2.14.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.13.0,2.14.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.13.0,2.14.0)", - org.apache.sshd.common.digest;version="[2.13.0,2.14.0)", - org.apache.sshd.common.forward;version="[2.13.0,2.14.0)", - org.apache.sshd.common.future;version="[2.13.0,2.14.0)", - org.apache.sshd.common.helpers;version="[2.13.0,2.14.0)", - org.apache.sshd.common.io;version="[2.13.0,2.14.0)", - org.apache.sshd.common.kex;version="[2.13.0,2.14.0)", - org.apache.sshd.common.kex.extension;version="[2.13.0,2.14.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.13.0,2.14.0)", - org.apache.sshd.common.keyprovider;version="[2.13.0,2.14.0)", - org.apache.sshd.common.mac;version="[2.13.0,2.14.0)", - org.apache.sshd.common.random;version="[2.13.0,2.14.0)", - org.apache.sshd.common.session;version="[2.13.0,2.14.0)", - org.apache.sshd.common.session.helpers;version="[2.13.0,2.14.0)", - org.apache.sshd.common.signature;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.buffer;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.closeable;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.io;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.io.der;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.io.functors;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.io.resource;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.logging;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.net;version="[2.13.0,2.14.0)", - org.apache.sshd.common.util.security;version="[2.13.0,2.14.0)", - org.apache.sshd.core;version="[2.13.0,2.14.0)", - org.apache.sshd.server.auth;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp.client;version="[2.13.0,2.14.0)", - org.apache.sshd.sftp.common;version="[2.13.0,2.14.0)", + org.apache.sshd.agent;version="[2.13.2,2.14.0)", + org.apache.sshd.client;version="[2.13.2,2.14.0)", + org.apache.sshd.client.auth;version="[2.13.2,2.14.0)", + org.apache.sshd.client.auth.keyboard;version="[2.13.2,2.14.0)", + org.apache.sshd.client.auth.password;version="[2.13.2,2.14.0)", + org.apache.sshd.client.auth.pubkey;version="[2.13.2,2.14.0)", + org.apache.sshd.client.channel;version="[2.13.2,2.14.0)", + org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)", + org.apache.sshd.client.config.keys;version="[2.13.2,2.14.0)", + org.apache.sshd.client.future;version="[2.13.2,2.14.0)", + org.apache.sshd.client.keyverifier;version="[2.13.2,2.14.0)", + org.apache.sshd.client.session;version="[2.13.2,2.14.0)", + org.apache.sshd.client.session.forward;version="[2.13.2,2.14.0)", + org.apache.sshd.common;version="[2.13.2,2.14.0)", + org.apache.sshd.common.auth;version="[2.13.2,2.14.0)", + org.apache.sshd.common.channel;version="[2.13.2,2.14.0)", + org.apache.sshd.common.cipher;version="[2.13.2,2.14.0)", + org.apache.sshd.common.compression;version="[2.13.2,2.14.0)", + org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)", + org.apache.sshd.common.config.keys.loader;version="[2.13.2,2.14.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.13.2,2.14.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.13.2,2.14.0)", + org.apache.sshd.common.digest;version="[2.13.2,2.14.0)", + org.apache.sshd.common.forward;version="[2.13.2,2.14.0)", + org.apache.sshd.common.future;version="[2.13.2,2.14.0)", + org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)", + org.apache.sshd.common.io;version="[2.13.2,2.14.0)", + org.apache.sshd.common.kex;version="[2.13.2,2.14.0)", + org.apache.sshd.common.kex.extension;version="[2.13.2,2.14.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.13.2,2.14.0)", + org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)", + org.apache.sshd.common.mac;version="[2.13.2,2.14.0)", + org.apache.sshd.common.random;version="[2.13.2,2.14.0)", + org.apache.sshd.common.session;version="[2.13.2,2.14.0)", + org.apache.sshd.common.session.helpers;version="[2.13.2,2.14.0)", + org.apache.sshd.common.signature;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.buffer;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.closeable;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.io;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.io.der;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.io.functors;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.io.resource;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.logging;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.net;version="[2.13.2,2.14.0)", + org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)", + org.apache.sshd.core;version="[2.13.2,2.14.0)", + org.apache.sshd.server.auth;version="[2.13.2,2.14.0)", + org.apache.sshd.sftp;version="[2.13.2,2.14.0)", + org.apache.sshd.sftp.client;version="[2.13.2,2.14.0)", + org.apache.sshd.sftp.common;version="[2.13.2,2.14.0)", org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)", diff --git a/pom.xml b/pom.xml index 7a07a3c8a6..e8116fb011 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 6.10.0.202406032230-r 1.10.14 - 2.13.1 + 2.13.2 0.1.55 1.1.3 1.2.3 -- cgit v1.2.3 From 92c190d3ef33ffb412ed122d119f27dedb1cffd1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 14 Aug 2024 23:17:13 +0200 Subject: Update org.eclipse.dash:license-tool-plugin to 1.1.0 Change-Id: Idb5c74f75110edc35e8a89de52aca8392acb297f --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d271641afe..cf51eba7ae 100644 --- a/pom.xml +++ b/pom.xml @@ -397,7 +397,7 @@ org.eclipse.dash license-tool-plugin - 0.0.1-SNAPSHOT + 1.1.0 -- cgit v1.2.3 From cc353f97be313ecc531ee44111caa910daffdfd7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 20 Aug 2024 14:25:31 +0200 Subject: Update tycho to 4.0.8 Change-Id: I0d6b99c07734bed166a16d7ce489c34286f29c82 --- org.eclipse.jgit.packaging/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 1e4d0520df..b5f5605407 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -23,7 +23,7 @@ 11 - 4.0.1 + 4.0.8 jgit-4.17 -- cgit v1.2.3 From 870492526f661a89a507206bb8e47dfb54979a25 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 20 Aug 2024 16:13:24 +0200 Subject: JGit v7.0.0.202409201410-m3 Signed-off-by: Matthias Sohn Change-Id: If35e97f9fb415669bac6dfa10ac35b509b3ee921 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7c079a5899..7c79dcde9c 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index be954bd8e0..d5b396b215 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index b6b52e595e..b1fcce1bd7 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 22f8aff82c..243d0bd58c 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7c3edf475c..fd1068ab10 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index e1a3671819..5f82ebcfc5 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 322f52f9f4..51b05afa54 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 054aa59429..7c80aeecb7 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index d8a616f09e..0d9519e5a4 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 1fe5318660..e9eed8d268 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.test - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 27510e2095..181cd566ee 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index d865b13901..65c5603aa1 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 9749ac1111..86710ce34a 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 0733a68ba0..2148b30aca 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f4dce68fab..74b0abe57c 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c1ec7ae7c8..d6103c665d 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index d29d3879d5..052418de5d 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51a79d61ef..a94868e452 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 124129d73d..52808518a7 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index bbb29cd846..e6ecaedfad 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 7645dd1418..6074f5b9c6 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index edce2d8d27..06d28ae035 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 01ee7824ca..94648119ff 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3e983511d5..a18fe4f657 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index cfeb426385..7c7a61dcb6 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 67c82652cb..b5d9e84f24 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index ee65b851a2..65d4653a5e 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index a7ca6336b8..39a95c0071 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2a885f204e..d1f175f640 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index af1cbf256a..f2961bad93 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 149ad00121..3590a349a9 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c33cb29b66..abe185f110 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 8e41ee3d28..74c4951ec8 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 49c1023ef0..d16430348a 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index a59c82ed1a..e11b72a654 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 2cf86bc942..ab2fb14660 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index befaa367de..466ffef30c 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 96c8953398..cc5c3fb619 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2c109c90ee..4d951df1e7 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f4c1e566a4..e49812c856 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index a048aa1738..b44e4450e5 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 62508e245f..e5d1192a7a 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 3dd7b10079..dbb82f1b25 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index ea66a2383c..ae52435f71 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 23fdd235cb..39432b5568 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index fc1bf49989..36bb0a8f39 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 92262a00be..6d2512d6ed 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 3344dcbb1b..863f18c9ce 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 6f03419cb7..5cd4c1a027 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 45162c97a7..11fb684c8d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8eacae1fe7..f60c17fa89 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 287a723b9c..13b60c6091 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 179eab8a6b..520c0eb67d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index cbb8e4fafc..05f309a963 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 61b5dd6031..b399b503e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 4c0068bfab..13cf597754 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 12ab06937a..37993c5c7b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 209274feeb..82067ecdfb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 1d82d4a1cc..d164150402 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index ff46d9e65d..171ff2f199 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index c4d4fcf825..a3f9516b85 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 657b90f0cf..443a58db6c 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 955c5c04b5..2bf8536b33 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 90090d6958..f11f3da153 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index bb0c23dd72..06f9db4f54 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 8bb1b64622..82ea626f90 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 7cd76c3011..40d525b628 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index ad0164086a..770bb18727 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 684ab70f86..9fa6bc1db2 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index f407ce11bf..4659344420 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 9c6df6b79a..87fd80060d 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 967b781d10..b813c7307a 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 114582af22..bc6365ef0b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index bb0d79b3d5..b7a3e95edb 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 7cc3a55b26..fc4d260d79 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 3bf4edd65f..d22da5b406 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 761b6c4aef..a813212fc4 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 9da7452428..21c093618f 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 1dc0e01964..ce95508d03 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index a3db63ca23..59c9b51adb 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index ab70d68a3f..3699264f9d 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 05f7c08bd2..6b65af4d1e 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 04bda44748..b98e876f80 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 8170fc6bd2..b676616c61 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 6d1e2676af..dcc0d2c3a5 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d6c0ba5dcc..d3ec459000 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409201410-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 7531018bc3..07375b9440 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409201410-m3 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202409201410-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 3c6c38992c..9bf48c6185 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index e8116fb011..35f898e959 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0-SNAPSHOT + 7.0.0.202409201410-m3 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 3b53e8d8b0a6a0867d50a44cd3f92518220a2b09 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 20 Aug 2024 17:47:36 +0200 Subject: JGit v7.0.0.202408201547-m3 Signed-off-by: Matthias Sohn Change-Id: Ic04bf96a04e38da82a7ff41334db44891f02419b --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7c79dcde9c..322a0c39e4 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index d5b396b215..24b90b125c 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index b1fcce1bd7..1b816a563e 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 243d0bd58c..a29c2cd95f 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index fd1068ab10..e8fe8077c2 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 5f82ebcfc5..f99edd990e 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 51b05afa54..494e683afb 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 7c80aeecb7..abfbd12e21 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 0d9519e5a4..4279ce37e3 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index e9eed8d268..630bac0657 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.test - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 181cd566ee..6c9897a5e7 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 65c5603aa1..a8c95d8b9b 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 86710ce34a..fef4c0e2e8 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 2148b30aca..285de8355c 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 74b0abe57c..d521c04a5b 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d6103c665d..2250f49ed0 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 052418de5d..87dcbf8fe1 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index a94868e452..9d007a671c 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 52808518a7..2d06952ce8 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index e6ecaedfad..45dbfd614c 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 6074f5b9c6..d3c8504f2f 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 06d28ae035..ec3430415f 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 94648119ff..419a6c2a55 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index a18fe4f657..a2f9cb220b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 7c7a61dcb6..eab60927f0 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index b5d9e84f24..93ce68527f 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 65d4653a5e..188e90a32e 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 39a95c0071..9de16e3512 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d1f175f640..783e719e70 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index f2961bad93..8ad41b5b5f 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 3590a349a9..58c859359b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index abe185f110..3b73c2ab8e 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 74c4951ec8..eaffc71b69 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index d16430348a..4e6ac043f0 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index e11b72a654..196b6bd4ff 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index ab2fb14660..fdaa5faeb2 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 466ffef30c..5dd56e8f49 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index cc5c3fb619..cd1c9d2c54 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 4d951df1e7..faa2b2f1c3 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index e49812c856..0525e47e60 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index b44e4450e5..7332dc6a29 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index e5d1192a7a..82ac442b6a 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index dbb82f1b25..dba3ea9eb4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index ae52435f71..3ce8e5270b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 39432b5568..87a323e8de 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 36bb0a8f39..8d1b1cc854 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 6d2512d6ed..dfee645b96 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 863f18c9ce..5873adfee8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 5cd4c1a027..25590d0194 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 11fb684c8d..91af39e3c5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index f60c17fa89..66a38cd20d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 13b60c6091..c72d6e59a1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 520c0eb67d..434a1b934b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 05f309a963..f73f78dea4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index b399b503e5..6a0d4d4fa7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 13cf597754..3d6148d86e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 37993c5c7b..6e5b29d5a8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 82067ecdfb..15885ccddb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index d164150402..523910c21b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 171ff2f199..1d22e57181 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index a3f9516b85..158abf94c6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 443a58db6c..dcdfd6acc7 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 2bf8536b33..db4db5c63b 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f11f3da153..b61dd73ce3 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 06f9db4f54..2ddf8a4b44 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 82ea626f90..d9895d58b1 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 40d525b628..fcfcb6bb3e 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 770bb18727..11983bef08 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 9fa6bc1db2..91d005e78b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 4659344420..4e024bed61 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 87fd80060d..b5756ec079 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index b813c7307a..db9d06034a 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index bc6365ef0b..bce8964df2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index b7a3e95edb..5f0403831a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index fc4d260d79..9437444631 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index d22da5b406..cd5ecaa853 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index a813212fc4..54da59aef7 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 21c093618f..308f27a069 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index ce95508d03..e32b2c4d0a 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 59c9b51adb..3db1c7bca6 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 3699264f9d..c1b19002ed 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 6b65af4d1e..8210a47b2b 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index b98e876f80..6265e32239 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index b676616c61..e26d1be7d8 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index dcc0d2c3a5..9d50b33601 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d3ec459000..8b424d88cd 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.202409201410-m3 +Bundle-Version: 7.0.0.202408201547-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 07375b9440..a4f421d08d 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409201410-m3 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202409201410-m3";roots="." +Bundle-Version: 7.0.0.202408201547-m3 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202408201547-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 9bf48c6185..dfb0e577ba 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 35f898e959..1611c08497 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0.202409201410-m3 + 7.0.0.202408201547-m3 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 888cd56583b23b88f714ac3f0596e23c690c1a74 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 20 Aug 2024 11:56:41 -0700 Subject: DfsReaderIoStats: Order fields and methods consistently As fields and getters were added, we didn't respect the (hard to see) existing order. Reorder with the following criteria: Methods: xCacheHits() (for all indexes in index order), xCount() (same), xBytes() (same), xMicros() (same). Index order: primary, reverse, bitmap, commit-graph, object-size Change-Id: I28f1d8121070d4357d566e3683947a26ceb3ba04 --- .../internal/storage/dfs/DfsReaderIoStats.java | 68 +++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java index adb4673ae4..1e5e439598 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java @@ -40,12 +40,12 @@ public class DfsReaderIoStats { /** Total number of complete pack indexes read into memory. */ long readIdx; - /** Total number of complete bitmap indexes read into memory. */ - long readBitmap; - /** Total number of reverse indexes added into memory. */ long readReverseIdx; + /** Total number of complete bitmap indexes read into memory. */ + long readBitmap; + /** Total number of complete commit graphs read into memory. */ long readCommitGraph; @@ -55,6 +55,9 @@ public class DfsReaderIoStats { /** Total number of bytes read from pack indexes. */ long readIdxBytes; + /** Total number of bytes read from bitmap indexes. */ + long readBitmapIdxBytes; + /** Total number of bytes read from commit graphs. */ long readCommitGraphBytes; @@ -67,18 +70,15 @@ public class DfsReaderIoStats { /** Total microseconds spent creating reverse indexes. */ long readReverseIdxMicros; + /** Total microseconds spent reading bitmap indexes. */ + long readBitmapIdxMicros; + /** Total microseconds spent creating commit graphs. */ long readCommitGraphMicros; /** Total microseconds spent creating object size indexes */ long readObjectSizeIndexMicros; - /** Total number of bytes read from bitmap indexes. */ - long readBitmapIdxBytes; - - /** Total microseconds spent reading bitmap indexes. */ - long readBitmapIdxMicros; - /** Total number of block cache hits. */ long blockCacheHit; @@ -195,21 +195,21 @@ public class DfsReaderIoStats { } /** - * Get total number of times the commit graph read into memory. + * Get total number of complete bitmap indexes read into memory. * - * @return total number of commit graph read into memory. + * @return total number of complete bitmap indexes read into memory. */ - public long getReadCommitGraphCount() { - return stats.readCommitGraph; + public long getReadBitmapIndexCount() { + return stats.readBitmap; } /** - * Get total number of complete bitmap indexes read into memory. + * Get total number of times the commit graph read into memory. * - * @return total number of complete bitmap indexes read into memory. + * @return total number of commit graph read into memory. */ - public long getReadBitmapIndexCount() { - return stats.readBitmap; + public long getReadCommitGraphCount() { + return stats.readCommitGraph; } /** @@ -230,6 +230,15 @@ public class DfsReaderIoStats { return stats.readIdxBytes; } + /** + * Get total number of bytes read from bitmap indexes. + * + * @return total number of bytes read from bitmap indexes. + */ + public long getReadBitmapIndexBytes() { + return stats.readBitmapIdxBytes; + } + /** * Get total number of bytes read from commit graphs. * @@ -258,30 +267,21 @@ public class DfsReaderIoStats { } /** - * Get total microseconds spent reading commit graphs. - * - * @return total microseconds spent reading commit graphs. - */ - public long getReadCommitGraphMicros() { - return stats.readCommitGraphMicros; - } - - /** - * Get total number of bytes read from bitmap indexes. + * Get total microseconds spent reading bitmap indexes. * - * @return total number of bytes read from bitmap indexes. + * @return total microseconds spent reading bitmap indexes. */ - public long getReadBitmapIndexBytes() { - return stats.readBitmapIdxBytes; + public long getReadBitmapIndexMicros() { + return stats.readBitmapIdxMicros; } /** - * Get total microseconds spent reading bitmap indexes. + * Get total microseconds spent reading commit graphs. * - * @return total microseconds spent reading bitmap indexes. + * @return total microseconds spent reading commit graphs. */ - public long getReadBitmapIndexMicros() { - return stats.readBitmapIdxMicros; + public long getReadCommitGraphMicros() { + return stats.readCommitGraphMicros; } /** -- cgit v1.2.3 From 04de16fd9c52e328dbe884dc8b5daef6d1903a39 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 20 Aug 2024 22:51:02 +0200 Subject: JGit v7.0.0.202408202050-m3 Signed-off-by: Matthias Sohn Change-Id: I44280658582c23ca0d9b85c4c24a1c2e7b82c6d8 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 322a0c39e4..ab05a06465 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 24b90b125c..514447709b 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 1b816a563e..149b014b22 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index a29c2cd95f..5e887a342f 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index e8fe8077c2..01f2a277f4 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index f99edd990e..e9f6558ec3 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 494e683afb..2aa237d709 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index abfbd12e21..64bb16c09b 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 4279ce37e3..bfaf060fc3 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 630bac0657..f3be9aba90 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.test - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 6c9897a5e7..9237d99b6d 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index a8c95d8b9b..27ac678fa9 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index fef4c0e2e8..10f8a5afa5 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 285de8355c..8924a6b1cb 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index d521c04a5b..dadb29a9cf 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 2250f49ed0..d83342d2fa 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 87dcbf8fe1..e227ad77cf 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 9d007a671c..d91a756441 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 2d06952ce8..ca99763453 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 45dbfd614c..490592faf3 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index d3c8504f2f..208db91791 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index ec3430415f..ee9f02f48a 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 419a6c2a55..faea256f35 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index a2f9cb220b..8b28a93af3 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index eab60927f0..abe02c19de 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 93ce68527f..15c8896c9b 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 188e90a32e..e8252ef4e3 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 9de16e3512..348b63e23f 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 783e719e70..41c89c22a1 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 8ad41b5b5f..c4e6759fe8 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 58c859359b..1d073d136c 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 3b73c2ab8e..709a7ddcef 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index eaffc71b69..c2188b48e3 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 4e6ac043f0..a5e337c971 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 196b6bd4ff..592ee33d53 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index fdaa5faeb2..8f33a86382 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 5dd56e8f49..ee096f277a 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index cd1c9d2c54..421ebb5eb1 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index faa2b2f1c3..8f2c7ac25a 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 0525e47e60..444d2445c6 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 7332dc6a29..7da13adc96 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 82ac442b6a..fa682d806d 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index dba3ea9eb4..dfc26d9644 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 3ce8e5270b..1b2cc7b7c3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 87a323e8de..4e1dc88df9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 8d1b1cc854..27893acd6e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index dfee645b96..eec4963101 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 5873adfee8..35e05e4492 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 25590d0194..b8aeea6a95 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 91af39e3c5..4725e0aa1b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 66a38cd20d..48be159756 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index c72d6e59a1..671b44e56b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 434a1b934b..f3a46dc18a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index f73f78dea4..8ee91cde95 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 6a0d4d4fa7..6a9169ac8b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 3d6148d86e..06ace8e6e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 6e5b29d5a8..949639bf31 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 15885ccddb..0229904aa5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 523910c21b..fceffe18d8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 1d22e57181..f922e4bc5f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 158abf94c6..df14550dc6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index dcdfd6acc7..a584a51cb1 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index db4db5c63b..495fe8de8e 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index b61dd73ce3..9e27921a0a 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 2ddf8a4b44..d56ce3da58 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index d9895d58b1..7800038ac5 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index fcfcb6bb3e..81421b6d12 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 11983bef08..bce0476f75 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 91d005e78b..76bc86fa6e 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 4e024bed61..a9795060ca 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index b5756ec079..f5c855eb88 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index db9d06034a..2699fa2533 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index bce8964df2..60dc63a181 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 5f0403831a..85976815b1 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 9437444631..0b9cf125a7 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index cd5ecaa853..95acfdd9bd 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 54da59aef7..7e3fdd3b13 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 308f27a069..3860fed4cf 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index e32b2c4d0a..3348059cee 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 3db1c7bca6..b0bd575e1b 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index c1b19002ed..c3df4c9313 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 8210a47b2b..8680221772 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 6265e32239..6771957674 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index e26d1be7d8..0d4d08a779 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 9d50b33601..61a476aca9 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 8b424d88cd..e6c9c1f953 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.202408201547-m3 +Bundle-Version: 7.0.0.202408202050-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index a4f421d08d..f3c491681a 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408201547-m3 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202408201547-m3";roots="." +Bundle-Version: 7.0.0.202408202050-m3 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202408202050-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index dfb0e577ba..6ecbddd0a8 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 1611c08497..29da6a7d1f 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0.202408201547-m3 + 7.0.0.202408202050-m3 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 1c2d79e9fff176e696b7fbb652bfcfb8e6b39618 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 21 Aug 2024 16:37:28 +0200 Subject: Prepare 7.0.0-SNAPSHOT builds Change-Id: I07b258a9f94823c9c390daf6e1d3034ca5ace81f --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index ab05a06465..7c079a5899 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 514447709b..be954bd8e0 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 149b014b22..b6b52e595e 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 5e887a342f..22f8aff82c 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 01f2a277f4..7c3edf475c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index e9f6558ec3..e1a3671819 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 2aa237d709..322f52f9f4 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 64bb16c09b..054aa59429 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index bfaf060fc3..d8a616f09e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index f3be9aba90..1fe5318660 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 9237d99b6d..27510e2095 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 27ac678fa9..d865b13901 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 10f8a5afa5..9749ac1111 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 8924a6b1cb..0733a68ba0 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index dadb29a9cf..f4dce68fab 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d83342d2fa..c1ec7ae7c8 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index e227ad77cf..d29d3879d5 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index d91a756441..51a79d61ef 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index ca99763453..124129d73d 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 490592faf3..bbb29cd846 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 208db91791..7645dd1418 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index ee9f02f48a..edce2d8d27 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index faea256f35..01ee7824ca 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 8b28a93af3..3e983511d5 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index abe02c19de..cfeb426385 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 15c8896c9b..67c82652cb 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index e8252ef4e3..ee65b851a2 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 348b63e23f..a7ca6336b8 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 41c89c22a1..2a885f204e 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index c4e6759fe8..af1cbf256a 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 1d073d136c..149ad00121 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 709a7ddcef..c33cb29b66 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index c2188b48e3..8e41ee3d28 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index a5e337c971..49c1023ef0 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 592ee33d53..a59c82ed1a 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 8f33a86382..2cf86bc942 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index ee096f277a..befaa367de 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 421ebb5eb1..96c8953398 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 8f2c7ac25a..2c109c90ee 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 444d2445c6..f4c1e566a4 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 7da13adc96..a048aa1738 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index fa682d806d..62508e245f 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index dfc26d9644..3dd7b10079 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 1b2cc7b7c3..ea66a2383c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 4e1dc88df9..23fdd235cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 27893acd6e..fc1bf49989 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index eec4963101..92262a00be 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 35e05e4492..3344dcbb1b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index b8aeea6a95..6f03419cb7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 4725e0aa1b..45162c97a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 48be159756..8eacae1fe7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 671b44e56b..287a723b9c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index f3a46dc18a..179eab8a6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 8ee91cde95..cbb8e4fafc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 6a9169ac8b..61b5dd6031 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 06ace8e6e9..4c0068bfab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 949639bf31..12ab06937a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 0229904aa5..209274feeb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index fceffe18d8..1d82d4a1cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index f922e4bc5f..ff46d9e65d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index df14550dc6..c4d4fcf825 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index a584a51cb1..657b90f0cf 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 495fe8de8e..955c5c04b5 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 9e27921a0a..90090d6958 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index d56ce3da58..bb0c23dd72 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 7800038ac5..8bb1b64622 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 81421b6d12..7cd76c3011 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index bce0476f75..ad0164086a 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 76bc86fa6e..684ab70f86 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index a9795060ca..f407ce11bf 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index f5c855eb88..9c6df6b79a 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2699fa2533..967b781d10 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 60dc63a181..114582af22 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 85976815b1..bb0d79b3d5 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 0b9cf125a7..7cc3a55b26 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 95acfdd9bd..3bf4edd65f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 7e3fdd3b13..761b6c4aef 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 3860fed4cf..9da7452428 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 3348059cee..1dc0e01964 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index b0bd575e1b..a3db63ca23 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index c3df4c9313..ab70d68a3f 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 8680221772..05f7c08bd2 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 6771957674..04bda44748 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 0d4d08a779..8170fc6bd2 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 61a476aca9..6d1e2676af 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index e6c9c1f953..d6c0ba5dcc 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.202408202050-m3 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index f3c491681a..7531018bc3 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408202050-m3 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202408202050-m3";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 6ecbddd0a8..3c6c38992c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 29da6a7d1f..e8116fb011 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0.202408202050-m3 + 7.0.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 81067f18e6ee9ac36602926ac0e47945a18e8e3c Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Tue, 20 Aug 2024 22:40:10 +0200 Subject: GpgConfig: Add missing @since Change-Id: Ie56e7d8f2defe10a87565056a1763288d5b1e1a6 Signed-off-by: Thomas Wolf --- org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java index 4b0c07983f..f5064df061 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java @@ -25,7 +25,11 @@ public class GpgConfig { OPENPGP("openpgp"), //$NON-NLS-1$ /** Value for x509 */ X509("x509"), //$NON-NLS-1$ - /** Value for ssh */ + /** + * Value for ssh. + * + * @since 7.0 + */ SSH("ssh"); //$NON-NLS-1$ private final String configValue; -- cgit v1.2.3 From d66175d7dca30be7ab96af0e3998f795a174b891 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Tue, 20 Aug 2024 15:50:20 -0700 Subject: LockFile: Retry lock creation if parent dirs were removed In the small window between creation of the lock file's parent dirs and the lock file itself, the parent dirs may be cleaned by an external process packing refs in the repository. When this scenario occurs, retry creating the lock file (along with its parent dirs). Change-Id: Id7ec60c3f7f373b59f1dc8de6b8fa6df6bdf2570 Signed-off-by: Kaushik Lingarkar --- .../eclipse/jgit/internal/storage/file/LockFile.java | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java index a2d8bd0140..1983541e4a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java @@ -24,6 +24,7 @@ import java.nio.ByteBuffer; import java.nio.channels.Channels; import java.nio.channels.FileChannel; import java.nio.file.Files; +import java.nio.file.NoSuchFileException; import java.nio.file.StandardCopyOption; import java.nio.file.attribute.FileTime; import java.text.MessageFormat; @@ -141,9 +142,8 @@ public class LockFile { throw new IllegalStateException( MessageFormat.format(JGitText.get().lockAlreadyHeld, ref)); } - FileUtils.mkdirs(lck.getParentFile(), true); try { - token = FS.DETECTED.createNewFileAtomic(lck); + token = createLockFileWithRetry(); } catch (IOException e) { LOG.error(JGitText.get().failedCreateLockFile, lck, e); throw e; @@ -160,6 +160,19 @@ public class LockFile { return obtainedLock; } + private FS.LockToken createLockFileWithRetry() throws IOException { + try { + return createLockFile(); + } catch (NoSuchFileException e) { + return createLockFile(); + } + } + + private FS.LockToken createLockFile() throws IOException { + FileUtils.mkdirs(lck.getParentFile(), true); + return FS.DETECTED.createNewFileAtomic(lck); + } + /** * Try to establish the lock for appending. * -- cgit v1.2.3 From 14519091301f545a21bcd71af3f2a34d7c020b47 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Thu, 22 Aug 2024 23:11:39 +0200 Subject: Add a missing license header Change-Id: Iccb922ea73b0bfd6360ea2182b88c520a951a0a2 Signed-off-by: Thomas Wolf --- .../eclipse/jgit/gpg/bc/internal/BouncyCastleGpgPublicKey.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgPublicKey.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgPublicKey.java index d736536fd7..9ec5b45530 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgPublicKey.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgPublicKey.java @@ -1,3 +1,12 @@ +/* + * Copyright (C) 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ package org.eclipse.jgit.gpg.bc.internal; import java.util.List; -- cgit v1.2.3 From a78e6eaef63754902f46dffe657a783403c44bfe Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Tue, 20 Aug 2024 22:41:45 +0200 Subject: Signing: refactor interfaces This is a big API-breaking change cleaning up the signing interfaces. Initially, these interfaces were GPG/OpenPGP-specific. When EGit added new signers and signature verifiers that called an external GPG executable, they were found inadequate and were extended to be able to pass in the GpgConfig to get access to the "gpg.program" setting. With the introduction of X.509 S/MIME signing, it was discovered that the interfaces were still not quite adequate, and the "Gpg" prefix on the class names were confusing. Since 7.0 is a major version bump, I'm taking this chance to overhaul these interfaces from ground up. For signing, there is a new Signer interface. With it goes a SignerFactory SPI interface, and a final Signers class managing the currently set signers. By default, signers for the different signature types are created from the signer factories, which are discovered via the ServiceLoader. External code can install its own signers, overriding the default factories. For signature verification, exactly the same mechanism is used. This simplifies the setup of signers and signature verifiers, and makes it all more regular. Signer instances just get a byte[] to sign and don't have to worry about ObjectBuilders at all. SignatureVerifier instances also just get the data and signature as byte[] and don't have to worry about extracting the signature from a commit or tag, or about what kind of signature it is. Both Signers and SignatureVerifiers always get passed the Repository and the GpgConfig. The repository will be needed in an implementation for SSH signatures because gpg.ssh.* configs may need to be loaded explicitly, and some of those values need the current workspace location. For signature verification, there is exactly one place in core JGit in SignatureVerifiers that extracts signatures, determines the signature type, and then calls the right signature verifier. Change RevTag to recognize all signature types known in git (GPG, X509, and SSH). Change-Id: I26d2731e7baebb38976c87b7f328b63a239760d5 Signed-off-by: Thomas Wolf --- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 5 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- ...rg.eclipse.jgit.lib.GpgSignatureVerifierFactory | 1 - .../services/org.eclipse.jgit.lib.GpgSigner | 1 - .../org.eclipse.jgit.lib.SignatureVerifierFactory | 1 + .../services/org.eclipse.jgit.lib.SignerFactory | 1 + .../jgit/gpg/bc/BouncyCastleGpgSignerFactory.java | 34 --- .../internal/BouncyCastleGpgSignatureVerifier.java | 138 ++---------- .../BouncyCastleGpgSignatureVerifierFactory.java | 23 +- .../gpg/bc/internal/BouncyCastleGpgSigner.java | 127 ++++------- .../bc/internal/BouncyCastleGpgSignerFactory.java | 31 +++ .../src/org/eclipse/jgit/pgm/Log.java | 24 +-- .../src/org/eclipse/jgit/pgm/Show.java | 27 +-- .../src/org/eclipse/jgit/pgm/Tag.java | 5 +- .../jgit/pgm/internal/VerificationUtils.java | 2 +- .../org/eclipse/jgit/api/CommitCommandTest.java | 73 +++++-- .../org/eclipse/jgit/internal/JGitText.properties | 3 +- .../src/org/eclipse/jgit/api/CommitCommand.java | 47 ++-- .../src/org/eclipse/jgit/api/TagCommand.java | 45 ++-- .../org/eclipse/jgit/api/VerificationResult.java | 5 +- .../eclipse/jgit/api/VerifySignatureCommand.java | 57 +---- .../src/org/eclipse/jgit/internal/JGitText.java | 3 +- .../jgit/lib/AbstractGpgSignatureVerifier.java | 71 ------ .../src/org/eclipse/jgit/lib/Constants.java | 14 ++ .../src/org/eclipse/jgit/lib/GpgConfig.java | 24 +-- .../src/org/eclipse/jgit/lib/GpgObjectSigner.java | 95 -------- .../org/eclipse/jgit/lib/GpgSignatureVerifier.java | 184 ---------------- .../jgit/lib/GpgSignatureVerifierFactory.java | 92 -------- .../src/org/eclipse/jgit/lib/GpgSigner.java | 141 ------------ .../org/eclipse/jgit/lib/SignatureVerifier.java | 106 +++++++++ .../eclipse/jgit/lib/SignatureVerifierFactory.java | 37 ++++ .../org/eclipse/jgit/lib/SignatureVerifiers.java | 239 +++++++++++++++++++++ .../src/org/eclipse/jgit/lib/Signer.java | 139 ++++++++++++ .../src/org/eclipse/jgit/lib/SignerFactory.java | 37 ++++ .../src/org/eclipse/jgit/lib/Signers.java | 101 +++++++++ .../src/org/eclipse/jgit/revwalk/RevTag.java | 27 ++- .../src/org/eclipse/jgit/util/SignatureUtils.java | 26 +-- 37 files changed, 944 insertions(+), 1044 deletions(-) delete mode 100644 org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.GpgSignatureVerifierFactory delete mode 100644 org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.GpgSigner create mode 100644 org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.SignatureVerifierFactory create mode 100644 org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.SignerFactory delete mode 100644 org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/BouncyCastleGpgSignerFactory.java create mode 100644 org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignerFactory.java delete mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/AbstractGpgSignatureVerifier.java delete mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgObjectSigner.java delete mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSignatureVerifier.java delete mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSignatureVerifierFactory.java delete mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSigner.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifier.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifierFactory.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifiers.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/Signer.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/SignerFactory.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/lib/Signers.java diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 9749ac1111..7a62d1d232 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -28,9 +28,6 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc;version="7.0.0", - org.eclipse.jgit.gpg.bc.internal;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test", +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test", org.eclipse.jgit.gpg.bc.internal.keys;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f4dce68fab..ad907d3809 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -160,7 +160,7 @@ false false false - false + true true false diff --git a/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.GpgSignatureVerifierFactory b/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.GpgSignatureVerifierFactory deleted file mode 100644 index 17ab30fba7..0000000000 --- a/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.GpgSignatureVerifierFactory +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jgit.gpg.bc.internal.BouncyCastleGpgSignatureVerifierFactory \ No newline at end of file diff --git a/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.GpgSigner b/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.GpgSigner deleted file mode 100644 index 6752b64ddf..0000000000 --- a/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.GpgSigner +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.jgit.gpg.bc.internal.BouncyCastleGpgSigner diff --git a/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.SignatureVerifierFactory b/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.SignatureVerifierFactory new file mode 100644 index 0000000000..17ab30fba7 --- /dev/null +++ b/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.SignatureVerifierFactory @@ -0,0 +1 @@ +org.eclipse.jgit.gpg.bc.internal.BouncyCastleGpgSignatureVerifierFactory \ No newline at end of file diff --git a/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.SignerFactory b/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.SignerFactory new file mode 100644 index 0000000000..c0b214db39 --- /dev/null +++ b/org.eclipse.jgit.gpg.bc/resources/META-INF/services/org.eclipse.jgit.lib.SignerFactory @@ -0,0 +1 @@ +org.eclipse.jgit.gpg.bc.internal.BouncyCastleGpgSignerFactory diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/BouncyCastleGpgSignerFactory.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/BouncyCastleGpgSignerFactory.java deleted file mode 100644 index fdd1a2b11a..0000000000 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/BouncyCastleGpgSignerFactory.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2021 Thomas Wolf and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -package org.eclipse.jgit.gpg.bc; - -import org.eclipse.jgit.gpg.bc.internal.BouncyCastleGpgSigner; -import org.eclipse.jgit.lib.GpgSigner; - -/** - * Factory for creating a {@link GpgSigner} based on Bouncy Castle. - * - * @since 5.11 - */ -public final class BouncyCastleGpgSignerFactory { - - private BouncyCastleGpgSignerFactory() { - // No instantiation - } - - /** - * Creates a new {@link GpgSigner}. - * - * @return the {@link GpgSigner} - */ - public static GpgSigner create() { - return new BouncyCastleGpgSigner(); - } -} diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignatureVerifier.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignatureVerifier.java index 3378bb3969..5a3d43ba54 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignatureVerifier.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignatureVerifier.java @@ -12,7 +12,6 @@ package org.eclipse.jgit.gpg.bc.internal; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.security.Security; import java.text.MessageFormat; import java.time.Instant; import java.util.Date; @@ -20,7 +19,6 @@ import java.util.List; import java.util.Locale; import org.bouncycastle.bcpg.sig.IssuerFingerprint; -import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; @@ -31,33 +29,20 @@ import org.bouncycastle.openpgp.PGPUtil; import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider; import org.bouncycastle.util.encoders.Hex; -import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.api.errors.JGitInternalException; -import org.eclipse.jgit.lib.AbstractGpgSignatureVerifier; import org.eclipse.jgit.lib.GpgConfig; -import org.eclipse.jgit.lib.GpgSignatureVerifier; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.SignatureVerifier; import org.eclipse.jgit.util.LRUMap; import org.eclipse.jgit.util.StringUtils; /** - * A {@link GpgSignatureVerifier} to verify GPG signatures using BouncyCastle. + * A {@link SignatureVerifier} to verify GPG signatures using BouncyCastle. */ public class BouncyCastleGpgSignatureVerifier - extends AbstractGpgSignatureVerifier { + implements SignatureVerifier { - private static void registerBouncyCastleProviderIfNecessary() { - if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) { - Security.addProvider(new BouncyCastleProvider()); - } - } - - /** - * Creates a new instance and registers the BouncyCastle security provider - * if needed. - */ - public BouncyCastleGpgSignatureVerifier() { - registerBouncyCastleProviderIfNecessary(); - } + private static final String NAME = "bc"; //$NON-NLS-1$ // To support more efficient signature verification of multiple objects we // cache public keys once found in a LRU cache. @@ -70,7 +55,7 @@ public class BouncyCastleGpgSignatureVerifier @Override public String getName() { - return "bc"; //$NON-NLS-1$ + return NAME; } static PGPSignature parseSignature(InputStream in) @@ -90,9 +75,8 @@ public class BouncyCastleGpgSignatureVerifier } @Override - public SignatureVerification verify(@NonNull GpgConfig config, byte[] data, - byte[] signatureData) - throws IOException { + public SignatureVerification verify(Repository repository, GpgConfig config, + byte[] data, byte[] signatureData) throws IOException { PGPSignature signature = null; String fingerprint = null; String signer = null; @@ -127,14 +111,15 @@ public class BouncyCastleGpgSignatureVerifier } Date signatureCreatedAt = signature.getCreationTime(); if (fingerprint == null && signer == null && keyId == null) { - return new VerificationResult(signatureCreatedAt, null, null, null, - false, false, TrustLevel.UNKNOWN, + return new SignatureVerification(NAME, signatureCreatedAt, + null, null, null, false, false, TrustLevel.UNKNOWN, BCText.get().signatureNoKeyInfo); } if (fingerprint != null && keyId != null && !fingerprint.endsWith(keyId)) { - return new VerificationResult(signatureCreatedAt, signer, fingerprint, - signer, false, false, TrustLevel.UNKNOWN, + return new SignatureVerification(NAME, signatureCreatedAt, + signer, fingerprint, signer, false, false, + TrustLevel.UNKNOWN, MessageFormat.format(BCText.get().signatureInconsistent, keyId, fingerprint)); } @@ -175,15 +160,16 @@ public class BouncyCastleGpgSignatureVerifier bySigner.put(signer, NO_KEY); } } - return new VerificationResult(signatureCreatedAt, signer, - fingerprint, signer, false, false, TrustLevel.UNKNOWN, - BCText.get().signatureNoPublicKey); + return new SignatureVerification(NAME, signatureCreatedAt, + signer, fingerprint, signer, false, false, + TrustLevel.UNKNOWN, BCText.get().signatureNoPublicKey); } if (fingerprint != null && !publicKey.isExactMatch()) { // We did find _some_ signing key for the signer, but it doesn't // match the given fingerprint. - return new VerificationResult(signatureCreatedAt, signer, - fingerprint, signer, false, false, TrustLevel.UNKNOWN, + return new SignatureVerification(NAME, signatureCreatedAt, + signer, fingerprint, signer, false, false, + TrustLevel.UNKNOWN, MessageFormat.format(BCText.get().signatureNoSigningKey, fingerprint)); } @@ -229,8 +215,7 @@ public class BouncyCastleGpgSignatureVerifier boolean verified = false; try { signature.init( - new JcaPGPContentVerifierBuilderProvider() - .setProvider(BouncyCastleProvider.PROVIDER_NAME), + new JcaPGPContentVerifierBuilderProvider(), pubKey); signature.update(data); verified = signature.verify(); @@ -238,15 +223,8 @@ public class BouncyCastleGpgSignatureVerifier throw new JGitInternalException( BCText.get().signatureVerificationError, e); } - return new VerificationResult(signatureCreatedAt, signer, fingerprint, user, - verified, expired, trust, null); - } - - @Override - public SignatureVerification verify(byte[] data, byte[] signatureData) - throws IOException { - throw new UnsupportedOperationException( - "Call verify(GpgConfig, byte[], byte[]) instead."); //$NON-NLS-1$ + return new SignatureVerification(NAME, signatureCreatedAt, signer, + fingerprint, user, verified, expired, trust, null); } private TrustLevel parseGpgTrustPacket(byte[] packet) { @@ -282,76 +260,4 @@ public class BouncyCastleGpgSignatureVerifier byFingerprint.clear(); bySigner.clear(); } - - private static class VerificationResult implements SignatureVerification { - - private final Date creationDate; - - private final String signer; - - private final String keyUser; - - private final String fingerprint; - - private final boolean verified; - - private final boolean expired; - - private final @NonNull TrustLevel trustLevel; - - private final String message; - - public VerificationResult(Date creationDate, String signer, - String fingerprint, String user, boolean verified, - boolean expired, @NonNull TrustLevel trust, String message) { - this.creationDate = creationDate; - this.signer = signer; - this.fingerprint = fingerprint; - this.keyUser = user; - this.verified = verified; - this.expired = expired; - this.trustLevel = trust; - this.message = message; - } - - @Override - public Date getCreationDate() { - return creationDate; - } - - @Override - public String getSigner() { - return signer; - } - - @Override - public String getKeyUser() { - return keyUser; - } - - @Override - public String getKeyFingerprint() { - return fingerprint; - } - - @Override - public boolean isExpired() { - return expired; - } - - @Override - public TrustLevel getTrustLevel() { - return trustLevel; - } - - @Override - public String getMessage() { - return message; - } - - @Override - public boolean getVerified() { - return verified; - } - } } diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignatureVerifierFactory.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignatureVerifierFactory.java index ae82b758a6..566ad1bf91 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignatureVerifierFactory.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignatureVerifierFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021, Thomas Wolf and others + * Copyright (C) 2021, 2024 Thomas Wolf and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -9,20 +9,27 @@ */ package org.eclipse.jgit.gpg.bc.internal; -import org.eclipse.jgit.lib.GpgSignatureVerifier; -import org.eclipse.jgit.lib.GpgSignatureVerifierFactory; +import org.eclipse.jgit.lib.GpgConfig.GpgFormat; +import org.eclipse.jgit.lib.SignatureVerifier; +import org.eclipse.jgit.lib.SignatureVerifierFactory; /** - * A {@link GpgSignatureVerifierFactory} that creates - * {@link GpgSignatureVerifier} instances that verify GPG signatures using - * BouncyCastle and that do cache public keys. + * A {@link SignatureVerifierFactory} that creates {@link SignatureVerifier} + * instances that verify GPG signatures using BouncyCastle and that do cache + * public keys. */ public final class BouncyCastleGpgSignatureVerifierFactory - extends GpgSignatureVerifierFactory { + implements SignatureVerifierFactory { @Override - public GpgSignatureVerifier getVerifier() { + public GpgFormat getType() { + return GpgFormat.OPENPGP; + } + + @Override + public SignatureVerifier create() { return new BouncyCastleGpgSignatureVerifier(); } + } diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java index 763b7f7526..1d187a5db2 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2021, Salesforce and others + * Copyright (C) 2018, 2024, Salesforce and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -14,13 +14,11 @@ import java.io.IOException; import java.net.URISyntaxException; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -import java.security.Security; import java.util.Iterator; import org.bouncycastle.bcpg.ArmoredOutputStream; import org.bouncycastle.bcpg.BCPGOutputStream; import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; @@ -30,79 +28,23 @@ import org.bouncycastle.openpgp.PGPSignatureGenerator; import org.bouncycastle.openpgp.PGPSignatureSubpacketGenerator; import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder; import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; -import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.errors.CanceledException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.UnsupportedSigningFormatException; import org.eclipse.jgit.errors.UnsupportedCredentialItem; -import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.lib.CommitBuilder; import org.eclipse.jgit.lib.GpgConfig; -import org.eclipse.jgit.lib.GpgObjectSigner; import org.eclipse.jgit.lib.GpgSignature; -import org.eclipse.jgit.lib.GpgSigner; -import org.eclipse.jgit.lib.ObjectBuilder; import org.eclipse.jgit.lib.PersonIdent; -import org.eclipse.jgit.lib.GpgConfig.GpgFormat; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.Signer; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.util.StringUtils; /** * GPG Signer using the BouncyCastle library. */ -public class BouncyCastleGpgSigner extends GpgSigner - implements GpgObjectSigner { - - private static void registerBouncyCastleProviderIfNecessary() { - if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) { - Security.addProvider(new BouncyCastleProvider()); - } - } - - /** - * Create a new instance. - *

- * The BounceCastleProvider will be registered if necessary. - *

- */ - public BouncyCastleGpgSigner() { - registerBouncyCastleProviderIfNecessary(); - } - - @Override - public boolean canLocateSigningKey(@Nullable String gpgSigningKey, - PersonIdent committer, CredentialsProvider credentialsProvider) - throws CanceledException { - try { - return canLocateSigningKey(gpgSigningKey, committer, - credentialsProvider, null); - } catch (UnsupportedSigningFormatException e) { - // Cannot occur with a null config - return false; - } - } - - @Override - public boolean canLocateSigningKey(@Nullable String gpgSigningKey, - PersonIdent committer, CredentialsProvider credentialsProvider, - GpgConfig config) - throws CanceledException, UnsupportedSigningFormatException { - if (config != null && config.getKeyFormat() != GpgFormat.OPENPGP) { - throw new UnsupportedSigningFormatException( - JGitText.get().onlyOpenPgpSupportedForSigning); - } - try (BouncyCastleGpgKeyPassphrasePrompt passphrasePrompt = new BouncyCastleGpgKeyPassphrasePrompt( - credentialsProvider)) { - BouncyCastleGpgKey gpgKey = locateSigningKey(gpgSigningKey, - committer, passphrasePrompt); - return gpgKey != null; - } catch (CanceledException e) { - throw e; - } catch (Exception e) { - return false; - } - } +public class BouncyCastleGpgSigner implements Signer { private BouncyCastleGpgKey locateSigningKey(@Nullable String gpgSigningKey, PersonIdent committer, @@ -121,38 +63,24 @@ public class BouncyCastleGpgSigner extends GpgSigner } @Override - public void sign(@NonNull CommitBuilder commit, - @Nullable String gpgSigningKey, @NonNull PersonIdent committer, - CredentialsProvider credentialsProvider) throws CanceledException { - try { - signObject(commit, gpgSigningKey, committer, credentialsProvider, - null); - } catch (UnsupportedSigningFormatException e) { - // Cannot occur with a null config - } - } - - @Override - public void signObject(@NonNull ObjectBuilder object, - @Nullable String gpgSigningKey, @NonNull PersonIdent committer, - CredentialsProvider credentialsProvider, GpgConfig config) - throws CanceledException, UnsupportedSigningFormatException { - if (config != null && config.getKeyFormat() != GpgFormat.OPENPGP) { - throw new UnsupportedSigningFormatException( - JGitText.get().onlyOpenPgpSupportedForSigning); + public GpgSignature sign(Repository repository, GpgConfig config, + byte[] data, PersonIdent committer, String signingKey, + CredentialsProvider credentialsProvider) throws CanceledException, + IOException, UnsupportedSigningFormatException { + String gpgSigningKey = signingKey; + if (gpgSigningKey == null) { + gpgSigningKey = config.getSigningKey(); } try (BouncyCastleGpgKeyPassphrasePrompt passphrasePrompt = new BouncyCastleGpgKeyPassphrasePrompt( credentialsProvider)) { BouncyCastleGpgKey gpgKey = locateSigningKey(gpgSigningKey, - committer, - passphrasePrompt); + committer, passphrasePrompt); PGPSecretKey secretKey = gpgKey.getSecretKey(); if (secretKey == null) { throw new JGitInternalException( BCText.get().unableToSignCommitNoSecretKey); } - JcePBESecretKeyDecryptorBuilder decryptorBuilder = new JcePBESecretKeyDecryptorBuilder() - .setProvider(BouncyCastleProvider.PROVIDER_NAME); + JcePBESecretKeyDecryptorBuilder decryptorBuilder = new JcePBESecretKeyDecryptorBuilder(); PGPPrivateKey privateKey = null; if (!passphrasePrompt.hasPassphrase()) { // Either the key is not encrypted, or it was read from the @@ -177,8 +105,7 @@ public class BouncyCastleGpgSigner extends GpgSigner PGPSignatureGenerator signatureGenerator = new PGPSignatureGenerator( new JcaPGPContentSignerBuilder( publicKey.getAlgorithm(), - HashAlgorithmTags.SHA256).setProvider( - BouncyCastleProvider.PROVIDER_NAME)); + HashAlgorithmTags.SHA256)); signatureGenerator.init(PGPSignature.BINARY_DOCUMENT, privateKey); PGPSignatureSubpacketGenerator subpackets = new PGPSignatureSubpacketGenerator(); subpackets.setIssuerFingerprint(false, publicKey); @@ -202,16 +129,36 @@ public class BouncyCastleGpgSigner extends GpgSigner ByteArrayOutputStream buffer = new ByteArrayOutputStream(); try (BCPGOutputStream out = new BCPGOutputStream( new ArmoredOutputStream(buffer))) { - signatureGenerator.update(object.build()); + signatureGenerator.update(data); signatureGenerator.generate().encode(out); } - object.setGpgSignature(new GpgSignature(buffer.toByteArray())); - } catch (PGPException | IOException | NoSuchAlgorithmException + return new GpgSignature(buffer.toByteArray()); + } catch (PGPException | NoSuchAlgorithmException | NoSuchProviderException | URISyntaxException e) { throw new JGitInternalException(e.getMessage(), e); } } + @Override + public boolean canLocateSigningKey(Repository repository, GpgConfig config, + PersonIdent committer, String signingKey, + CredentialsProvider credentialsProvider) throws CanceledException { + String gpgSigningKey = signingKey; + if (gpgSigningKey == null) { + gpgSigningKey = config.getSigningKey(); + } + try (BouncyCastleGpgKeyPassphrasePrompt passphrasePrompt = new BouncyCastleGpgKeyPassphrasePrompt( + credentialsProvider)) { + BouncyCastleGpgKey gpgKey = locateSigningKey(gpgSigningKey, + committer, passphrasePrompt); + return gpgKey != null; + } catch (CanceledException e) { + throw e; + } catch (Exception e) { + return false; + } + } + static String extractSignerId(String pgpUserId) { int from = pgpUserId.indexOf('<'); if (from >= 0) { diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignerFactory.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignerFactory.java new file mode 100644 index 0000000000..92ab65d7e4 --- /dev/null +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSignerFactory.java @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2021, 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.gpg.bc.internal; + +import org.eclipse.jgit.lib.GpgConfig.GpgFormat; +import org.eclipse.jgit.lib.Signer; +import org.eclipse.jgit.lib.SignerFactory; + +/** + * Factory for creating a {@link Signer} for OPENPGP signatures based on Bouncy + * Castle. + */ +public final class BouncyCastleGpgSignerFactory implements SignerFactory { + + @Override + public GpgFormat getType() { + return GpgFormat.OPENPGP; + } + + @Override + public Signer create() { + return new BouncyCastleGpgSigner(); + } +} diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java index 852a4b377b..958e566986 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Log.java @@ -32,13 +32,12 @@ import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.GpgConfig; -import org.eclipse.jgit.lib.GpgSignatureVerifier; -import org.eclipse.jgit.lib.GpgSignatureVerifier.SignatureVerification; -import org.eclipse.jgit.lib.GpgSignatureVerifierFactory; +import org.eclipse.jgit.lib.SignatureVerifier.SignatureVerification; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.SignatureVerifiers; import org.eclipse.jgit.notes.NoteMap; import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.internal.VerificationUtils; @@ -174,8 +173,6 @@ class Log extends RevWalkTextBuiltin { // END -- Options shared with Diff - private GpgSignatureVerifier verifier; - private GpgConfig config; Log() { @@ -227,9 +224,6 @@ class Log extends RevWalkTextBuiltin { throw die(e.getMessage(), e); } finally { diffFmt.close(); - if (verifier != null) { - verifier.clear(); - } } } @@ -293,21 +287,13 @@ class Log extends RevWalkTextBuiltin { if (c.getRawGpgSignature() == null) { return; } - if (verifier == null) { - GpgSignatureVerifierFactory factory = GpgSignatureVerifierFactory - .getDefault(); - if (factory == null) { - throw die(CLIText.get().logNoSignatureVerifier, null); - } - verifier = factory.getVerifier(); - } - SignatureVerification verification = verifier.verifySignature(c, - config); + SignatureVerification verification = SignatureVerifiers.verify(db, + config, c); if (verification == null) { return; } VerificationUtils.writeVerification(outw, verification, - verifier.getName(), c.getCommitterIdent()); + verification.verifierName(), c.getCommitterIdent()); } /** diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java index 4feb090032..1576792234 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java @@ -30,12 +30,11 @@ import org.eclipse.jgit.errors.RevisionSyntaxException; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.GpgConfig; -import org.eclipse.jgit.lib.GpgSignatureVerifier; -import org.eclipse.jgit.lib.GpgSignatureVerifierFactory; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.lib.GpgSignatureVerifier.SignatureVerification; +import org.eclipse.jgit.lib.SignatureVerifier.SignatureVerification; +import org.eclipse.jgit.lib.SignatureVerifiers; import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.internal.VerificationUtils; import org.eclipse.jgit.pgm.opt.PathTreeFilterHandler; @@ -335,23 +334,13 @@ class Show extends TextBuiltin { if (c.getRawGpgSignature() == null) { return; } - GpgSignatureVerifierFactory factory = GpgSignatureVerifierFactory - .getDefault(); - if (factory == null) { - throw die(CLIText.get().logNoSignatureVerifier, null); - } - GpgSignatureVerifier verifier = factory.getVerifier(); GpgConfig config = new GpgConfig(db.getConfig()); - try { - SignatureVerification verification = verifier.verifySignature(c, - config); - if (verification == null) { - return; - } - VerificationUtils.writeVerification(outw, verification, - verifier.getName(), c.getCommitterIdent()); - } finally { - verifier.clear(); + SignatureVerification verification = SignatureVerifiers.verify(db, + config, c); + if (verification == null) { + throw die(CLIText.get().logNoSignatureVerifier, null); } + VerificationUtils.writeVerification(outw, verification, + verification.verifierName(), c.getCommitterIdent()); } } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java index 4ea67ab92c..6be30c9447 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Tag.java @@ -27,10 +27,10 @@ import org.eclipse.jgit.api.VerifySignatureCommand; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.RefAlreadyExistsException; import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.GpgSignatureVerifier.SignatureVerification; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.SignatureVerifier.SignatureVerification; import org.eclipse.jgit.pgm.internal.CLIText; import org.eclipse.jgit.pgm.internal.VerificationUtils; import org.eclipse.jgit.revwalk.RevCommit; @@ -106,7 +106,8 @@ class Tag extends TextBuiltin { if (error != null) { throw die(error.getMessage(), error); } - writeVerification(verifySig.getVerifier().getName(), + writeVerification( + verification.getVerification().verifierName(), (RevTag) verification.getObject(), verification.getVerification()); } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/VerificationUtils.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/VerificationUtils.java index c1f8a86a8c..64ee602620 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/VerificationUtils.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/VerificationUtils.java @@ -11,7 +11,7 @@ package org.eclipse.jgit.pgm.internal; import java.io.IOException; -import org.eclipse.jgit.lib.GpgSignatureVerifier.SignatureVerification; +import org.eclipse.jgit.lib.SignatureVerifier.SignatureVerification; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.util.GitDateFormatter; import org.eclipse.jgit.util.SignatureUtils; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java index 35de73e204..e74e234297 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java @@ -27,6 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.eclipse.jgit.api.CherryPickResult.CherryPickStatus; import org.eclipse.jgit.api.errors.CanceledException; import org.eclipse.jgit.api.errors.EmptyCommitException; +import org.eclipse.jgit.api.errors.UnsupportedSigningFormatException; import org.eclipse.jgit.api.errors.WrongRepositoryStateException; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.dircache.DirCache; @@ -34,19 +35,23 @@ import org.eclipse.jgit.dircache.DirCacheBuilder; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.junit.time.TimeUtil; -import org.eclipse.jgit.lib.CommitBuilder; +import org.eclipse.jgit.lib.CommitConfig.CleanupMode; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; -import org.eclipse.jgit.lib.GpgSigner; +import org.eclipse.jgit.lib.GpgConfig; +import org.eclipse.jgit.lib.GpgConfig.GpgFormat; +import org.eclipse.jgit.lib.GpgSignature; +import org.eclipse.jgit.lib.ObjectBuilder; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefUpdate.Result; import org.eclipse.jgit.lib.ReflogEntry; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.Signer; +import org.eclipse.jgit.lib.Signers; import org.eclipse.jgit.lib.StoredConfig; -import org.eclipse.jgit.lib.CommitConfig.CleanupMode; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.submodule.SubmoduleWalk; @@ -839,21 +844,39 @@ public class CommitCommandTest extends RepositoryTestCase { String[] signingKey = new String[1]; PersonIdent[] signingCommitters = new PersonIdent[1]; AtomicInteger callCount = new AtomicInteger(); - GpgSigner.setDefault(new GpgSigner() { + // Since GpgFormat defaults to OpenPGP just set a new signer for + // that. + Signers.set(GpgFormat.OPENPGP, new Signer() { + @Override - public void sign(CommitBuilder commit, String gpgSigningKey, - PersonIdent signingCommitter, CredentialsProvider credentialsProvider) { - signingKey[0] = gpgSigningKey; + public void signObject(Repository repo, GpgConfig config, + ObjectBuilder builder, PersonIdent signingCommitter, + String signingKeySpec, + CredentialsProvider credentialsProvider) + throws CanceledException, + UnsupportedSigningFormatException { + signingKey[0] = signingKeySpec; signingCommitters[0] = signingCommitter; callCount.incrementAndGet(); } @Override - public boolean canLocateSigningKey(String gpgSigningKey, - PersonIdent signingCommitter, + public GpgSignature sign(Repository repo, GpgConfig config, + byte[] data, PersonIdent signingCommitter, + String signingKeySpec, + CredentialsProvider credentialsProvider) + throws CanceledException, + UnsupportedSigningFormatException { + throw new CanceledException("Unexpected call"); + } + + @Override + public boolean canLocateSigningKey(Repository repo, + GpgConfig config, PersonIdent signingCommitter, + String signingKeySpec, CredentialsProvider credentialsProvider) throws CanceledException { - return false; + throw new CanceledException("Unexpected call"); } }); @@ -904,19 +927,37 @@ public class CommitCommandTest extends RepositoryTestCase { git.add().addFilepattern("file1").call(); AtomicInteger callCount = new AtomicInteger(); - GpgSigner.setDefault(new GpgSigner() { + // Since GpgFormat defaults to OpenPGP just set a new signer for + // that. + Signers.set(GpgFormat.OPENPGP, new Signer() { + @Override - public void sign(CommitBuilder commit, String gpgSigningKey, - PersonIdent signingCommitter, CredentialsProvider credentialsProvider) { + public void signObject(Repository repo, GpgConfig config, + ObjectBuilder builder, PersonIdent signingCommitter, + String signingKeySpec, + CredentialsProvider credentialsProvider) + throws CanceledException, + UnsupportedSigningFormatException { callCount.incrementAndGet(); } @Override - public boolean canLocateSigningKey(String gpgSigningKey, - PersonIdent signingCommitter, + public GpgSignature sign(Repository repo, GpgConfig config, + byte[] data, PersonIdent signingCommitter, + String signingKeySpec, + CredentialsProvider credentialsProvider) + throws CanceledException, + UnsupportedSigningFormatException { + throw new CanceledException("Unexpected call"); + } + + @Override + public boolean canLocateSigningKey(Repository repo, + GpgConfig config, PersonIdent signingCommitter, + String signingKeySpec, CredentialsProvider credentialsProvider) throws CanceledException { - return false; + throw new CanceledException("Unexpected call"); } }); diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index c9f7336609..11435b8ce4 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -576,7 +576,6 @@ obtainingCommitsForCherryPick=Obtaining commits that need to be cherry-picked oldIdMustNotBeNull=Expected old ID must not be null onlyOneFetchSupported=Only one fetch supported onlyOneOperationCallPerConnectionIsSupported=Only one operation call per connection is supported. -onlyOpenPgpSupportedForSigning=OpenPGP is the only supported signing option with JGit at this time (gpg.format must be set to openpgp). openFilesMustBeAtLeast1=Open files must be >= 1 openingConnection=Opening connection operationCanceled=Operation {0} was canceled @@ -723,6 +722,8 @@ shortSkipOfBlock=Short skip of block. shutdownCleanup=Cleanup {} during JVM shutdown shutdownCleanupFailed=Cleanup during JVM shutdown failed shutdownCleanupListenerFailed=Cleanup of {0} during JVM shutdown failed +signatureServiceConflict={0} conflict for type {1}. Already registered is {2}; additional factory {3} is ignored. +signatureTypeUnknown=No signer for {0} signatures. Use another signature type for git config gpg.format, or do not sign. signatureVerificationError=Signature verification failed signatureVerificationUnavailable=No signature verifier registered signedTagMessageNoLf=A non-empty message of a signed tag must end in LF. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java index a1a2cc09d2..a7d409c3f5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CommitCommand.java @@ -51,9 +51,6 @@ import org.eclipse.jgit.lib.CommitConfig.CleanupMode; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.GpgConfig; -import org.eclipse.jgit.lib.GpgConfig.GpgFormat; -import org.eclipse.jgit.lib.GpgObjectSigner; -import org.eclipse.jgit.lib.GpgSigner; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.PersonIdent; @@ -62,6 +59,8 @@ import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefUpdate.Result; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryState; +import org.eclipse.jgit.lib.Signer; +import org.eclipse.jgit.lib.Signers; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevTag; @@ -129,7 +128,7 @@ public class CommitCommand extends GitCommand { private String signingKey; - private GpgSigner gpgSigner; + private Signer signer; private GpgConfig gpgConfig; @@ -319,30 +318,22 @@ public class CommitCommand extends GitCommand { } } - private void sign(CommitBuilder commit) throws ServiceUnavailableException, - CanceledException, UnsupportedSigningFormatException { - if (gpgSigner == null) { - gpgSigner = GpgSigner.getDefault(); - if (gpgSigner == null) { - throw new ServiceUnavailableException( - JGitText.get().signingServiceUnavailable); + private void sign(CommitBuilder commit) + throws CanceledException, IOException, + UnsupportedSigningFormatException { + if (signer == null) { + signer = Signers.get(gpgConfig.getKeyFormat()); + if (signer == null) { + throw new UnsupportedSigningFormatException(MessageFormat + .format(JGitText.get().signatureTypeUnknown, + gpgConfig.getKeyFormat().toConfigValue())); } } if (signingKey == null) { signingKey = gpgConfig.getSigningKey(); } - if (gpgSigner instanceof GpgObjectSigner) { - ((GpgObjectSigner) gpgSigner).signObject(commit, - signingKey, committer, credentialsProvider, - gpgConfig); - } else { - if (gpgConfig.getKeyFormat() != GpgFormat.OPENPGP) { - throw new UnsupportedSigningFormatException(JGitText - .get().onlyOpenPgpSupportedForSigning); - } - gpgSigner.sign(commit, signingKey, committer, - credentialsProvider); - } + signer.signObject(repo, gpgConfig, commit, committer, signingKey, + credentialsProvider); } private void updateRef(RepositoryState state, ObjectId headId, @@ -1097,22 +1088,22 @@ public class CommitCommand extends GitCommand { } /** - * Sets the {@link GpgSigner} to use if the commit is to be signed. + * Sets the {@link Signer} to use if the commit is to be signed. * * @param signer * to use; if {@code null}, the default signer will be used * @return {@code this} - * @since 5.11 + * @since 7.0 */ - public CommitCommand setGpgSigner(GpgSigner signer) { + public CommitCommand setSigner(Signer signer) { checkCallable(); - this.gpgSigner = signer; + this.signer = signer; return this; } /** * Sets an external {@link GpgConfig} to use. Whether it will be used is at - * the discretion of the {@link #setGpgSigner(GpgSigner)}. + * the discretion of the {@link #setSigner(Signer)}. * * @param config * to set; if {@code null}, the config will be loaded from the diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java index 3edaf5e748..cc8589fa1c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/TagCommand.java @@ -18,14 +18,11 @@ import org.eclipse.jgit.api.errors.InvalidTagNameException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.api.errors.NoHeadException; import org.eclipse.jgit.api.errors.RefAlreadyExistsException; -import org.eclipse.jgit.api.errors.ServiceUnavailableException; import org.eclipse.jgit.api.errors.UnsupportedSigningFormatException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.GpgConfig; import org.eclipse.jgit.lib.GpgConfig.GpgFormat; -import org.eclipse.jgit.lib.GpgObjectSigner; -import org.eclipse.jgit.lib.GpgSigner; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.PersonIdent; @@ -33,6 +30,8 @@ import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefUpdate.Result; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.Signer; +import org.eclipse.jgit.lib.Signers; import org.eclipse.jgit.lib.TagBuilder; import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevWalk; @@ -79,7 +78,7 @@ public class TagCommand extends GitCommand { private GpgConfig gpgConfig; - private GpgObjectSigner gpgSigner; + private Signer signer; private CredentialsProvider credentialsProvider; @@ -133,9 +132,9 @@ public class TagCommand extends GitCommand { newTag.setTagger(tagger); newTag.setObjectId(id); - if (gpgSigner != null) { - gpgSigner.signObject(newTag, signingKey, tagger, - credentialsProvider, gpgConfig); + if (signer != null) { + signer.signObject(repo, gpgConfig, newTag, tagger, signingKey, + credentialsProvider); } // write the tag object @@ -196,15 +195,12 @@ public class TagCommand extends GitCommand { * * @throws InvalidTagNameException * if the tag name is null or invalid - * @throws ServiceUnavailableException - * if the tag should be signed but no signer can be found * @throws UnsupportedSigningFormatException * if the tag should be signed but {@code gpg.format} is not * {@link GpgFormat#OPENPGP} */ private void processOptions() - throws InvalidTagNameException, ServiceUnavailableException, - UnsupportedSigningFormatException { + throws InvalidTagNameException, UnsupportedSigningFormatException { if (name == null || !Repository.isValidRefName(Constants.R_TAGS + name)) { throw new InvalidTagNameException( @@ -230,16 +226,15 @@ public class TagCommand extends GitCommand { doSign = gpgConfig.isSignAnnotated(); } if (doSign) { - if (signingKey == null) { - signingKey = gpgConfig.getSigningKey(); - } - if (gpgSigner == null) { - GpgSigner signer = GpgSigner.getDefault(); - if (!(signer instanceof GpgObjectSigner)) { - throw new ServiceUnavailableException( - JGitText.get().signingServiceUnavailable); + if (signer == null) { + signer = Signers.get(gpgConfig.getKeyFormat()); + if (signer == null) { + throw new UnsupportedSigningFormatException( + MessageFormat.format( + JGitText.get().signatureTypeUnknown, + gpgConfig.getKeyFormat() + .toConfigValue())); } - gpgSigner = (GpgObjectSigner) signer; } // The message of a signed tag must end in a newline because // the signature will be appended. @@ -326,22 +321,22 @@ public class TagCommand extends GitCommand { } /** - * Sets the {@link GpgSigner} to use if the commit is to be signed. + * Sets the {@link Signer} to use if the commit is to be signed. * * @param signer * to use; if {@code null}, the default signer will be used * @return {@code this} - * @since 5.11 + * @since 7.0 */ - public TagCommand setGpgSigner(GpgObjectSigner signer) { + public TagCommand setSigner(Signer signer) { checkCallable(); - this.gpgSigner = signer; + this.signer = signer; return this; } /** * Sets an external {@link GpgConfig} to use. Whether it will be used is at - * the discretion of the {@link #setGpgSigner(GpgObjectSigner)}. + * the discretion of the {@link #setSigner(Signer)}. * * @param config * to set; if {@code null}, the config will be loaded from the diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/VerificationResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/VerificationResult.java index 21cddf75b7..f5f4b06e45 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/VerificationResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/VerificationResult.java @@ -9,7 +9,7 @@ */ package org.eclipse.jgit.api; -import org.eclipse.jgit.lib.GpgSignatureVerifier; +import org.eclipse.jgit.lib.SignatureVerifier; import org.eclipse.jgit.revwalk.RevObject; /** @@ -34,8 +34,9 @@ public interface VerificationResult { * Retrieves the signature verification result. * * @return the result, or {@code null} if none was computed + * @since 7.0 */ - GpgSignatureVerifier.SignatureVerification getVerification(); + SignatureVerifier.SignatureVerification getVerification(); /** * Retrieves the git object of which the signature was verified. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/VerifySignatureCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/VerifySignatureCommand.java index 6a2a44ea2d..487ff04323 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/VerifySignatureCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/VerifySignatureCommand.java @@ -25,11 +25,10 @@ import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.GpgConfig; -import org.eclipse.jgit.lib.GpgSignatureVerifier; -import org.eclipse.jgit.lib.GpgSignatureVerifier.SignatureVerification; -import org.eclipse.jgit.lib.GpgSignatureVerifierFactory; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.SignatureVerifier.SignatureVerification; +import org.eclipse.jgit.lib.SignatureVerifiers; import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevWalk; @@ -65,12 +64,8 @@ public class VerifySignatureCommand extends GitCommand result = new HashMap<>(); - if (verifier == null) { - GpgSignatureVerifierFactory factory = GpgSignatureVerifierFactory - .getDefault(); - if (factory == null) { - throw new ServiceUnavailableException( - JGitText.get().signatureVerificationUnavailable); - } - verifier = factory.getVerifier(); - ownVerifier = true; - } if (config == null) { config = new GpgConfig(repo.getConfig()); } @@ -239,10 +196,6 @@ public class VerifySignatureCommand extends GitCommand and others -* -* This program and the accompanying materials are made available under the -* terms of the Eclipse Distribution License v. 1.0 which is available at -* https://www.eclipse.org/org/documents/edl-v10.php. -* -* SPDX-License-Identifier: BSD-3-Clause -*/ -package org.eclipse.jgit.lib; - -import java.io.IOException; -import java.util.Arrays; - -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevObject; -import org.eclipse.jgit.revwalk.RevTag; -import org.eclipse.jgit.util.RawParseUtils; - -/** - * Provides a base implementation of - * {@link GpgSignatureVerifier#verifySignature(RevObject, GpgConfig)}. - * - * @since 6.9 - */ -public abstract class AbstractGpgSignatureVerifier - implements GpgSignatureVerifier { - - @Override - public SignatureVerification verifySignature(RevObject object, - GpgConfig config) throws IOException { - if (object instanceof RevCommit) { - RevCommit commit = (RevCommit) object; - byte[] signatureData = commit.getRawGpgSignature(); - if (signatureData == null) { - return null; - } - byte[] raw = commit.getRawBuffer(); - // Now remove the GPG signature - byte[] header = { 'g', 'p', 'g', 's', 'i', 'g' }; - int start = RawParseUtils.headerStart(header, raw, 0); - if (start < 0) { - return null; - } - int end = RawParseUtils.nextLfSkippingSplitLines(raw, start); - // start is at the beginning of the header's content - start -= header.length + 1; - // end is on the terminating LF; we need to skip that, too - if (end < raw.length) { - end++; - } - byte[] data = new byte[raw.length - (end - start)]; - System.arraycopy(raw, 0, data, 0, start); - System.arraycopy(raw, end, data, start, raw.length - end); - return verify(config, data, signatureData); - } else if (object instanceof RevTag) { - RevTag tag = (RevTag) object; - byte[] signatureData = tag.getRawGpgSignature(); - if (signatureData == null) { - return null; - } - byte[] raw = tag.getRawBuffer(); - // The signature is just tacked onto the end of the message, which - // is last in the buffer. - byte[] data = Arrays.copyOfRange(raw, 0, - raw.length - signatureData.length); - return verify(config, data, signatureData); - } - return null; - } -} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index b9c90bda30..8599bf7dbc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -552,6 +552,20 @@ public final class Constants { */ public static final String GPG_SIGNATURE_PREFIX = "-----BEGIN PGP SIGNATURE-----"; //$NON-NLS-1$ + /** + * Prefix of a CMS signature (X.509, S/MIME). + * + * @since 7.0 + */ + public static final String CMS_SIGNATURE_PREFIX = "-----BEGIN SIGNED MESSAGE-----"; //$NON-NLS-1$ + + /** + * Prefix of an SSH signature. + * + * @since 7.0 + */ + public static final String SSH_SIGNATURE_PREFIX = "-----BEGIN SSH SIGNATURE-----"; //$NON-NLS-1$ + /** * Create a new digest function for objects. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java index f5064df061..fb5c904215 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java @@ -61,27 +61,6 @@ public class GpgConfig { private final boolean forceAnnotated; - /** - * Create a {@link GpgConfig} with the given parameters and default - * {@code true} for signing commits and {@code false} for tags. - * - * @param keySpec - * to use - * @param format - * to use - * @param gpgProgram - * to use - * @since 5.11 - */ - public GpgConfig(String keySpec, GpgFormat format, String gpgProgram) { - keyFormat = format; - signingKey = keySpec; - program = gpgProgram; - signCommits = true; - signAllTags = false; - forceAnnotated = false; - } - /** * Create a new GPG config that reads the configuration from config. * @@ -97,10 +76,11 @@ public class GpgConfig { String exe = config.getString(ConfigConstants.CONFIG_GPG_SECTION, keyFormat.toConfigValue(), ConfigConstants.CONFIG_KEY_PROGRAM); - if (exe == null) { + if (exe == null && GpgFormat.OPENPGP.equals(keyFormat)) { exe = config.getString(ConfigConstants.CONFIG_GPG_SECTION, null, ConfigConstants.CONFIG_KEY_PROGRAM); } + program = exe; signCommits = config.getBoolean(ConfigConstants.CONFIG_COMMIT_SECTION, ConfigConstants.CONFIG_KEY_GPGSIGN, false); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgObjectSigner.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgObjectSigner.java deleted file mode 100644 index 074f46567b..0000000000 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgObjectSigner.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright (C) 2020 Thomas Wolf and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -package org.eclipse.jgit.lib; - -import org.eclipse.jgit.annotations.NonNull; -import org.eclipse.jgit.annotations.Nullable; -import org.eclipse.jgit.api.errors.CanceledException; -import org.eclipse.jgit.api.errors.UnsupportedSigningFormatException; -import org.eclipse.jgit.transport.CredentialsProvider; - -/** - * Creates GPG signatures for Git objects. - * - * @since 5.11 - */ -public interface GpgObjectSigner { - - /** - * Signs the specified object. - * - *

- * Implementors should obtain the payload for signing from the specified - * object via {@link ObjectBuilder#build()} and create a proper - * {@link GpgSignature}. The generated signature must be set on the - * specified {@code object} (see - * {@link ObjectBuilder#setGpgSignature(GpgSignature)}). - *

- *

- * Any existing signature on the object must be discarded prior obtaining - * the payload via {@link ObjectBuilder#build()}. - *

- * - * @param object - * the object to sign (must not be {@code null} and must be - * complete to allow proper calculation of payload) - * @param gpgSigningKey - * the signing key to locate (passed as is to the GPG signing - * tool as is; eg., value of user.signingkey) - * @param committer - * the signing identity (to help with key lookup in case signing - * key is not specified) - * @param credentialsProvider - * provider to use when querying for signing key credentials (eg. - * passphrase) - * @param config - * GPG settings from the git config - * @throws CanceledException - * when signing was canceled (eg., user aborted when entering - * passphrase) - * @throws UnsupportedSigningFormatException - * if a config is given and the wanted key format is not - * supported - */ - void signObject(@NonNull ObjectBuilder object, - @Nullable String gpgSigningKey, @NonNull PersonIdent committer, - CredentialsProvider credentialsProvider, GpgConfig config) - throws CanceledException, UnsupportedSigningFormatException; - - /** - * Indicates if a signing key is available for the specified committer - * and/or signing key. - * - * @param gpgSigningKey - * the signing key to locate (passed as is to the GPG signing - * tool as is; eg., value of user.signingkey) - * @param committer - * the signing identity (to help with key lookup in case signing - * key is not specified) - * @param credentialsProvider - * provider to use when querying for signing key credentials (eg. - * passphrase) - * @param config - * GPG settings from the git config - * @return true if a signing key is available, - * false otherwise - * @throws CanceledException - * when signing was canceled (eg., user aborted when entering - * passphrase) - * @throws UnsupportedSigningFormatException - * if a config is given and the wanted key format is not - * supported - */ - public abstract boolean canLocateSigningKey(@Nullable String gpgSigningKey, - @NonNull PersonIdent committer, - CredentialsProvider credentialsProvider, GpgConfig config) - throws CanceledException, UnsupportedSigningFormatException; - -} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSignatureVerifier.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSignatureVerifier.java deleted file mode 100644 index 91c9bab5a4..0000000000 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSignatureVerifier.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright (C) 2021, 2024 Thomas Wolf and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -package org.eclipse.jgit.lib; - -import java.io.IOException; -import java.util.Date; - -import org.eclipse.jgit.annotations.NonNull; -import org.eclipse.jgit.annotations.Nullable; -import org.eclipse.jgit.api.errors.JGitInternalException; -import org.eclipse.jgit.revwalk.RevObject; - -/** - * A {@code GpgSignatureVerifier} can verify GPG signatures on git commits and - * tags. - * - * @since 5.11 - */ -public interface GpgSignatureVerifier { - - /** - * Verifies the signature on a signed commit or tag. - * - * @param object - * to verify - * @param config - * the {@link GpgConfig} to use - * @return a {@link SignatureVerification} describing the outcome of the - * verification, or {@code null} if the object was not signed - * @throws IOException - * if an error occurs getting a public key - * @throws org.eclipse.jgit.api.errors.JGitInternalException - * if signature verification fails - */ - @Nullable - SignatureVerification verifySignature(@NonNull RevObject object, - @NonNull GpgConfig config) throws IOException; - - /** - * Verifies a given signature for given data. - * - * @param config - * the {@link GpgConfig} - * @param data - * the signature is for - * @param signatureData - * the ASCII-armored signature - * @return a {@link SignatureVerification} describing the outcome - * @throws IOException - * if the signature cannot be parsed - * @throws JGitInternalException - * if signature verification fails - * @since 6.9 - */ - default SignatureVerification verify(@NonNull GpgConfig config, byte[] data, - byte[] signatureData) throws IOException { - // Default implementation for backwards compatibility; override as - // appropriate - return verify(data, signatureData); - } - - /** - * Verifies a given signature for given data. - * - * @param data - * the signature is for - * @param signatureData - * the ASCII-armored signature - * @return a {@link SignatureVerification} describing the outcome - * @throws IOException - * if the signature cannot be parsed - * @throws JGitInternalException - * if signature verification fails - * @deprecated since 6.9, use {@link #verify(GpgConfig, byte[], byte[])} - * instead - */ - @Deprecated - public SignatureVerification verify(byte[] data, byte[] signatureData) - throws IOException; - - /** - * Retrieves the name of this verifier. This should be a short string - * identifying the engine that verified the signature, like "gpg" if GPG is - * used, or "bc" for a BouncyCastle implementation. - * - * @return the name - */ - @NonNull - String getName(); - - /** - * A {@link GpgSignatureVerifier} may cache public keys to speed up - * verifying signatures on multiple objects. This clears this cache, if any. - */ - void clear(); - - /** - * A {@code SignatureVerification} returns data about a (positively or - * negatively) verified signature. - */ - interface SignatureVerification { - - // Data about the signature. - - @NonNull - Date getCreationDate(); - - // Data from the signature used to find a public key. - - /** - * Obtains the signer as stored in the signature, if known. - * - * @return the signer, or {@code null} if unknown - */ - String getSigner(); - - /** - * Obtains the short or long fingerprint of the public key as stored in - * the signature, if known. - * - * @return the fingerprint, or {@code null} if unknown - */ - String getKeyFingerprint(); - - // Some information about the found public key. - - /** - * Obtains the OpenPGP user ID associated with the key. - * - * @return the user id, or {@code null} if unknown - */ - String getKeyUser(); - - /** - * Tells whether the public key used for this signature verification was - * expired when the signature was created. - * - * @return {@code true} if the key was expired already, {@code false} - * otherwise - */ - boolean isExpired(); - - /** - * Obtains the trust level of the public key used to verify the - * signature. - * - * @return the trust level - */ - @NonNull - TrustLevel getTrustLevel(); - - // The verification result. - - /** - * Tells whether the signature verification was successful. - * - * @return {@code true} if the signature was verified successfully; - * {@code false} if not. - */ - boolean getVerified(); - - /** - * Obtains a human-readable message giving additional information about - * the outcome of the verification. - * - * @return the message, or {@code null} if none set. - */ - String getMessage(); - } - - /** - * The owner's trust in a public key. - */ - enum TrustLevel { - UNKNOWN, NEVER, MARGINAL, FULL, ULTIMATE - } -} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSignatureVerifierFactory.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSignatureVerifierFactory.java deleted file mode 100644 index 59775c475b..0000000000 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSignatureVerifierFactory.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (C) 2021, 2022 Thomas Wolf and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -package org.eclipse.jgit.lib; - -import java.util.Iterator; -import java.util.ServiceConfigurationError; -import java.util.ServiceLoader; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A {@code GpgSignatureVerifierFactory} creates {@link GpgSignatureVerifier} instances. - * - * @since 5.11 - */ -public abstract class GpgSignatureVerifierFactory { - - private static final Logger LOG = LoggerFactory - .getLogger(GpgSignatureVerifierFactory.class); - - private static class DefaultFactory { - - private static volatile GpgSignatureVerifierFactory defaultFactory = loadDefault(); - - private static GpgSignatureVerifierFactory loadDefault() { - try { - ServiceLoader loader = ServiceLoader - .load(GpgSignatureVerifierFactory.class); - Iterator iter = loader.iterator(); - if (iter.hasNext()) { - return iter.next(); - } - } catch (ServiceConfigurationError e) { - LOG.error(e.getMessage(), e); - } - return null; - } - - private DefaultFactory() { - // No instantiation - } - - public static GpgSignatureVerifierFactory getDefault() { - return defaultFactory; - } - - /** - * Sets the default factory. - * - * @param factory - * the new default factory - */ - public static void setDefault(GpgSignatureVerifierFactory factory) { - defaultFactory = factory; - } - } - - /** - * Retrieves the default factory. - * - * @return the default factory or {@code null} if none set - */ - public static GpgSignatureVerifierFactory getDefault() { - return DefaultFactory.getDefault(); - } - - /** - * Sets the default factory. - * - * @param factory - * the new default factory - */ - public static void setDefault(GpgSignatureVerifierFactory factory) { - DefaultFactory.setDefault(factory); - } - - /** - * Creates a new {@link GpgSignatureVerifier}. - * - * @return the new {@link GpgSignatureVerifier} - */ - public abstract GpgSignatureVerifier getVerifier(); - -} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSigner.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSigner.java deleted file mode 100644 index b25a61b506..0000000000 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgSigner.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (C) 2018, 2022 Salesforce and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -package org.eclipse.jgit.lib; - -import java.util.Iterator; -import java.util.ServiceConfigurationError; -import java.util.ServiceLoader; - -import org.eclipse.jgit.annotations.NonNull; -import org.eclipse.jgit.annotations.Nullable; -import org.eclipse.jgit.api.errors.CanceledException; -import org.eclipse.jgit.transport.CredentialsProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Creates GPG signatures for Git objects. - * - * @since 5.3 - */ -public abstract class GpgSigner { - - private static final Logger LOG = LoggerFactory.getLogger(GpgSigner.class); - - private static class DefaultSigner { - - private static volatile GpgSigner defaultSigner = loadGpgSigner(); - - private static GpgSigner loadGpgSigner() { - try { - ServiceLoader loader = ServiceLoader - .load(GpgSigner.class); - Iterator iter = loader.iterator(); - if (iter.hasNext()) { - return iter.next(); - } - } catch (ServiceConfigurationError e) { - LOG.error(e.getMessage(), e); - } - return null; - } - - private DefaultSigner() { - // No instantiation - } - - public static GpgSigner getDefault() { - return defaultSigner; - } - - public static void setDefault(GpgSigner signer) { - defaultSigner = signer; - } - } - - /** - * Get the default signer, or null. - * - * @return the default signer, or null. - */ - public static GpgSigner getDefault() { - return DefaultSigner.getDefault(); - } - - /** - * Set the default signer. - * - * @param signer - * the new default signer, may be null to select no - * default. - */ - public static void setDefault(GpgSigner signer) { - DefaultSigner.setDefault(signer); - } - - /** - * Signs the specified commit. - * - *

- * Implementors should obtain the payload for signing from the specified - * commit via {@link CommitBuilder#build()} and create a proper - * {@link GpgSignature}. The generated signature must be set on the - * specified {@code commit} (see - * {@link CommitBuilder#setGpgSignature(GpgSignature)}). - *

- *

- * Any existing signature on the commit must be discarded prior obtaining - * the payload via {@link CommitBuilder#build()}. - *

- * - * @param commit - * the commit to sign (must not be null and must be - * complete to allow proper calculation of payload) - * @param gpgSigningKey - * the signing key to locate (passed as is to the GPG signing - * tool as is; eg., value of user.signingkey) - * @param committer - * the signing identity (to help with key lookup in case signing - * key is not specified) - * @param credentialsProvider - * provider to use when querying for signing key credentials (eg. - * passphrase) - * @throws CanceledException - * when signing was canceled (eg., user aborted when entering - * passphrase) - */ - public abstract void sign(@NonNull CommitBuilder commit, - @Nullable String gpgSigningKey, @NonNull PersonIdent committer, - CredentialsProvider credentialsProvider) throws CanceledException; - - /** - * Indicates if a signing key is available for the specified committer - * and/or signing key. - * - * @param gpgSigningKey - * the signing key to locate (passed as is to the GPG signing - * tool as is; eg., value of user.signingkey) - * @param committer - * the signing identity (to help with key lookup in case signing - * key is not specified) - * @param credentialsProvider - * provider to use when querying for signing key credentials (eg. - * passphrase) - * @return true if a signing key is available, - * false otherwise - * @throws CanceledException - * when signing was canceled (eg., user aborted when entering - * passphrase) - */ - public abstract boolean canLocateSigningKey(@Nullable String gpgSigningKey, - @NonNull PersonIdent committer, - CredentialsProvider credentialsProvider) throws CanceledException; - -} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifier.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifier.java new file mode 100644 index 0000000000..2ce2708cb9 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifier.java @@ -0,0 +1,106 @@ +/* + * Copyright (C) 2021, 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.lib; + +import java.io.IOException; +import java.util.Date; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.errors.JGitInternalException; + +/** + * A {@code SignatureVerifier} can verify signatures on git commits and tags. + * + * @since 7.0 + */ +public interface SignatureVerifier { + + /** + * Verifies a given signature for given data. + * + * @param repository + * the {@link Repository} the data comes from. + * @param config + * the {@link GpgConfig} + * @param data + * the signature is for + * @param signatureData + * the ASCII-armored signature + * @return a {@link SignatureVerification} describing the outcome + * @throws IOException + * if the signature cannot be parsed + * @throws JGitInternalException + * if signature verification fails + */ + SignatureVerification verify(@NonNull Repository repository, + @NonNull GpgConfig config, byte[] data, byte[] signatureData) + throws IOException; + + /** + * Retrieves the name of this verifier. This should be a short string + * identifying the engine that verified the signature, like "gpg" if GPG is + * used, or "bc" for a BouncyCastle implementation. + * + * @return the name + */ + @NonNull + String getName(); + + /** + * A {@link SignatureVerifier} may cache public keys to speed up + * verifying signatures on multiple objects. This clears this cache, if any. + */ + void clear(); + + /** + * A {@code SignatureVerification} returns data about a (positively or + * negatively) verified signature. + * + * @param verifierName + * the name of the verifier that created this verification result + * @param creationDate + * date and time the signature was created + * @param signer + * the signer as stored in the signature, or {@code null} if + * unknown + * @param keyFingerprint + * fingerprint of the public key, or {@code null} if unknown + * @param keyUser + * user associated with the key, or {@code null} if unknown + * @param verified + * whether the signature verification was successful + * @param expired + * whether the public key used for this signature verification + * was expired when the signature was created + * @param trustLevel + * the trust level of the public key used to verify the signature + * @param message + * human-readable message giving additional information about the + * outcome of the verification, possibly {@code null} + */ + record SignatureVerification( + String verifierName, + Date creationDate, + String signer, + String keyFingerprint, + String keyUser, + boolean verified, + boolean expired, + @NonNull TrustLevel trustLevel, + String message) { + } + + /** + * The owner's trust in a public key. + */ + enum TrustLevel { + UNKNOWN, NEVER, MARGINAL, FULL, ULTIMATE + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifierFactory.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifierFactory.java new file mode 100644 index 0000000000..7844aba3bd --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifierFactory.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.lib; + +import org.eclipse.jgit.annotations.NonNull; + +/** + * A factory for {@link SignatureVerifier}s. + * + * @since 7.0 + */ +public interface SignatureVerifierFactory { + + /** + * Tells what kind of {@link SignatureVerifier} this factory creates. + * + * @return the {@link GpgConfig.GpgFormat} of the signer + */ + @NonNull + GpgConfig.GpgFormat getType(); + + /** + * Creates a new instance of a {@link SignatureVerifier} that can produce + * signatures of type {@link #getType()}. + * + * @return a new {@link SignatureVerifier} + */ + @NonNull + SignatureVerifier create(); +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifiers.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifiers.java new file mode 100644 index 0000000000..01c8422b66 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignatureVerifiers.java @@ -0,0 +1,239 @@ +/* + * Copyright (C) 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.lib; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.text.MessageFormat; +import java.util.Arrays; +import java.util.EnumMap; +import java.util.Map; +import java.util.ServiceConfigurationError; +import java.util.ServiceLoader; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevObject; +import org.eclipse.jgit.revwalk.RevTag; +import org.eclipse.jgit.util.RawParseUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Manages the available signers. + * + * @since 7.0 + */ +public final class SignatureVerifiers { + + private static final Logger LOG = LoggerFactory.getLogger(SignatureVerifiers.class); + + private static final byte[] PGP_PREFIX = Constants.GPG_SIGNATURE_PREFIX + .getBytes(StandardCharsets.US_ASCII); + + private static final byte[] X509_PREFIX = Constants.CMS_SIGNATURE_PREFIX + .getBytes(StandardCharsets.US_ASCII); + + private static final byte[] SSH_PREFIX = Constants.SSH_SIGNATURE_PREFIX + .getBytes(StandardCharsets.US_ASCII); + + private static final Map FACTORIES = loadSignatureVerifiers(); + + private static final Map VERIFIERS = new ConcurrentHashMap<>(); + + private static Map loadSignatureVerifiers() { + Map result = new EnumMap<>( + GpgConfig.GpgFormat.class); + try { + for (SignatureVerifierFactory factory : ServiceLoader + .load(SignatureVerifierFactory.class)) { + GpgConfig.GpgFormat format = factory.getType(); + SignatureVerifierFactory existing = result.get(format); + if (existing != null) { + LOG.warn("{}", //$NON-NLS-1$ + MessageFormat.format( + JGitText.get().signatureServiceConflict, + "SignatureVerifierFactory", format, //$NON-NLS-1$ + existing.getClass().getCanonicalName(), + factory.getClass().getCanonicalName())); + } else { + result.put(format, factory); + } + } + } catch (ServiceConfigurationError e) { + LOG.error(e.getMessage(), e); + } + return result; + } + + private SignatureVerifiers() { + // No instantiation + } + + /** + * Retrieves a {@link Signer} that can produce signatures of the given type + * {@code format}. + * + * @param format + * {@link GpgConfig.GpgFormat} the signer must support + * @return a {@link Signer}, or {@code null} if none is available + */ + public static SignatureVerifier get(@NonNull GpgConfig.GpgFormat format) { + return VERIFIERS.computeIfAbsent(format, f -> { + SignatureVerifierFactory factory = FACTORIES.get(format); + if (factory == null) { + return null; + } + return factory.create(); + }); + } + + /** + * Sets a specific signature verifier to use for a specific signature type. + * + * @param format + * signature type to set the {@code verifier} for + * @param verifier + * the {@link SignatureVerifier} to use for signatures of type + * {@code format}; if {@code null}, a default implementation, if + * available, may be used. + */ + public static void set(@NonNull GpgConfig.GpgFormat format, + SignatureVerifier verifier) { + SignatureVerifier previous; + if (verifier == null) { + previous = VERIFIERS.remove(format); + } else { + previous = VERIFIERS.put(format, verifier); + } + if (previous != null) { + previous.clear(); + } + } + + /** + * Verifies the signature on a signed commit or tag. + * + * @param repository + * the {@link Repository} the object is from + * @param config + * the {@link GpgConfig} to use + * @param object + * to verify + * @return a {@link SignatureVerifier.SignatureVerification} describing the + * outcome of the verification, or {@code null} if the object does + * not have a signature of a known type + * @throws IOException + * if an error occurs getting a public key + * @throws org.eclipse.jgit.api.errors.JGitInternalException + * if signature verification fails + */ + @Nullable + public static SignatureVerifier.SignatureVerification verify( + @NonNull Repository repository, @NonNull GpgConfig config, + @NonNull RevObject object) throws IOException { + if (object instanceof RevCommit) { + RevCommit commit = (RevCommit) object; + byte[] signatureData = commit.getRawGpgSignature(); + if (signatureData == null) { + return null; + } + byte[] raw = commit.getRawBuffer(); + // Now remove the GPG signature + byte[] header = { 'g', 'p', 'g', 's', 'i', 'g' }; + int start = RawParseUtils.headerStart(header, raw, 0); + if (start < 0) { + return null; + } + int end = RawParseUtils.nextLfSkippingSplitLines(raw, start); + // start is at the beginning of the header's content + start -= header.length + 1; + // end is on the terminating LF; we need to skip that, too + if (end < raw.length) { + end++; + } + byte[] data = new byte[raw.length - (end - start)]; + System.arraycopy(raw, 0, data, 0, start); + System.arraycopy(raw, end, data, start, raw.length - end); + return verify(repository, config, data, signatureData); + } else if (object instanceof RevTag) { + RevTag tag = (RevTag) object; + byte[] signatureData = tag.getRawGpgSignature(); + if (signatureData == null) { + return null; + } + byte[] raw = tag.getRawBuffer(); + // The signature is just tacked onto the end of the message, which + // is last in the buffer. + byte[] data = Arrays.copyOfRange(raw, 0, + raw.length - signatureData.length); + return verify(repository, config, data, signatureData); + } + return null; + } + + /** + * Verifies a given signature for some give data. + * + * @param repository + * the {@link Repository} the object is from + * @param config + * the {@link GpgConfig} to use + * @param data + * to verify the signature of + * @param signature + * the given signature of the {@code data} + * @return a {@link SignatureVerifier.SignatureVerification} describing the + * outcome of the verification, or {@code null} if the signature + * type is unknown + * @throws IOException + * if an error occurs getting a public key + * @throws org.eclipse.jgit.api.errors.JGitInternalException + * if signature verification fails + */ + @Nullable + public static SignatureVerifier.SignatureVerification verify( + @NonNull Repository repository, @NonNull GpgConfig config, + byte[] data, byte[] signature) throws IOException { + GpgConfig.GpgFormat format = getFormat(signature); + if (format == null) { + return null; + } + SignatureVerifier verifier = get(format); + if (verifier == null) { + return null; + } + return verifier.verify(repository, config, data, signature); + } + + /** + * Determines the type of a given signature. + * + * @param signature + * to get the type of + * @return the signature type, or {@code null} if unknown + */ + @Nullable + public static GpgConfig.GpgFormat getFormat(byte[] signature) { + if (RawParseUtils.match(signature, 0, PGP_PREFIX) > 0) { + return GpgConfig.GpgFormat.OPENPGP; + } + if (RawParseUtils.match(signature, 0, X509_PREFIX) > 0) { + return GpgConfig.GpgFormat.X509; + } + if (RawParseUtils.match(signature, 0, SSH_PREFIX) > 0) { + return GpgConfig.GpgFormat.SSH; + } + return null; + } +} \ No newline at end of file diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Signer.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Signer.java new file mode 100644 index 0000000000..3bb7464d08 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Signer.java @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.lib; + +import java.io.IOException; +import java.io.UnsupportedEncodingException; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.errors.CanceledException; +import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.api.errors.UnsupportedSigningFormatException; +import org.eclipse.jgit.transport.CredentialsProvider; + +/** + * Creates signatures for Git objects. + * + * @since 7.0 + */ +public interface Signer { + + /** + * Signs the specified object. + * + *

+ * Implementors should obtain the payload for signing from the specified + * object via {@link ObjectBuilder#build()} and create a proper + * {@link GpgSignature}. The generated signature is set on the specified + * {@code object} (see {@link ObjectBuilder#setGpgSignature(GpgSignature)}). + *

+ *

+ * Any existing signature on the object must be discarded prior obtaining + * the payload via {@link ObjectBuilder#build()}. + *

+ * + * @param repository + * {@link Repository} the object belongs to + * @param config + * GPG settings from the git config + * @param object + * the object to sign (must not be {@code null} and must be + * complete to allow proper calculation of payload) + * @param committer + * the signing identity (to help with key lookup in case signing + * key is not specified) + * @param signingKey + * if non-{@code null} overrides the signing key from the config + * @param credentialsProvider + * provider to use when querying for signing key credentials (eg. + * passphrase) + * @throws CanceledException + * when signing was canceled (eg., user aborted when entering + * passphrase) + * @throws IOException + * if an I/O error occurs + * @throws UnsupportedSigningFormatException + * if a config is given and the wanted key format is not + * supported + */ + default void signObject(@NonNull Repository repository, + @NonNull GpgConfig config, @NonNull ObjectBuilder object, + @NonNull PersonIdent committer, String signingKey, + CredentialsProvider credentialsProvider) + throws CanceledException, IOException, + UnsupportedSigningFormatException { + try { + object.setGpgSignature(sign(repository, config, object.build(), + committer, signingKey, credentialsProvider)); + } catch (UnsupportedEncodingException e) { + throw new JGitInternalException(e.getMessage(), e); + } + } + + /** + * Signs arbitrary data. + * + * @param repository + * {@link Repository} the signature is created in + * @param config + * GPG settings from the git config + * @param data + * the data to sign + * @param committer + * the signing identity (to help with key lookup in case signing + * key is not specified) + * @param signingKey + * if non-{@code null} overrides the signing key from the config + * @param credentialsProvider + * provider to use when querying for signing key credentials (eg. + * passphrase) + * @return the signature for {@code data} + * @throws CanceledException + * when signing was canceled (eg., user aborted when entering + * passphrase) + * @throws IOException + * if an I/O error occurs + * @throws UnsupportedSigningFormatException + * if a config is given and the wanted key format is not + * supported + */ + GpgSignature sign(@NonNull Repository repository, @NonNull GpgConfig config, + byte[] data, @NonNull PersonIdent committer, String signingKey, + CredentialsProvider credentialsProvider) throws CanceledException, + IOException, UnsupportedSigningFormatException; + + /** + * Indicates if a signing key is available for the specified committer + * and/or signing key. + * + * @param repository + * the current {@link Repository} + * @param config + * GPG settings from the git config + * @param committer + * the signing identity (to help with key lookup in case signing + * key is not specified) + * @param signingKey + * if non-{@code null} overrides the signing key from the config + * @param credentialsProvider + * provider to use when querying for signing key credentials (eg. + * passphrase) + * @return {@code true} if a signing key is available, {@code false} + * otherwise + * @throws CanceledException + * when signing was canceled (eg., user aborted when entering + * passphrase) + */ + boolean canLocateSigningKey(@NonNull Repository repository, + @NonNull GpgConfig config, @NonNull PersonIdent committer, + String signingKey, CredentialsProvider credentialsProvider) + throws CanceledException; + +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignerFactory.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignerFactory.java new file mode 100644 index 0000000000..125d25e3b7 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/SignerFactory.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.lib; + +import org.eclipse.jgit.annotations.NonNull; + +/** + * A factory for {@link Signer}s. + * + * @since 7.0 + */ +public interface SignerFactory { + + /** + * Tells what kind of {@link Signer} this factory creates. + * + * @return the {@link GpgConfig.GpgFormat} of the signer + */ + @NonNull + GpgConfig.GpgFormat getType(); + + /** + * Creates a new instance of a {@link Signer} that can produce signatures of + * type {@link #getType()}. + * + * @return a new {@link Signer} + */ + @NonNull + Signer create(); +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Signers.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Signers.java new file mode 100644 index 0000000000..7771b07841 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Signers.java @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.lib; + +import java.text.MessageFormat; +import java.util.EnumMap; +import java.util.Map; +import java.util.ServiceConfigurationError; +import java.util.ServiceLoader; +import java.util.concurrent.ConcurrentHashMap; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.internal.JGitText; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Manages the available signers. + * + * @since 7.0 + */ +public final class Signers { + + private static final Logger LOG = LoggerFactory.getLogger(Signers.class); + + private static final Map SIGNER_FACTORIES = loadSigners(); + + private static final Map SIGNERS = new ConcurrentHashMap<>(); + + private static Map loadSigners() { + Map result = new EnumMap<>( + GpgConfig.GpgFormat.class); + try { + for (SignerFactory factory : ServiceLoader + .load(SignerFactory.class)) { + GpgConfig.GpgFormat format = factory.getType(); + SignerFactory existing = result.get(format); + if (existing != null) { + LOG.warn("{}", //$NON-NLS-1$ + MessageFormat.format( + JGitText.get().signatureServiceConflict, + "SignerFactory", format, //$NON-NLS-1$ + existing.getClass().getCanonicalName(), + factory.getClass().getCanonicalName())); + } else { + result.put(format, factory); + } + } + } catch (ServiceConfigurationError e) { + LOG.error(e.getMessage(), e); + } + return result; + } + + private Signers() { + // No instantiation + } + + /** + * Retrieves a {@link Signer} that can produce signatures of the given type + * {@code format}. + * + * @param format + * {@link GpgConfig.GpgFormat} the signer must support + * @return a {@link Signer}, or {@code null} if none is available + */ + public static Signer get(@NonNull GpgConfig.GpgFormat format) { + return SIGNERS.computeIfAbsent(format, f -> { + SignerFactory factory = SIGNER_FACTORIES.get(format); + if (factory == null) { + return null; + } + return factory.create(); + }); + } + + /** + * Sets a specific signer to use for a specific signature type. + * + * @param format + * signature type to set the {@code signer} for + * @param signer + * the {@link Signer} to use for signatures of type + * {@code format}; if {@code null}, a default implementation, if + * available, may be used. + */ + public static void set(@NonNull GpgConfig.GpgFormat format, Signer signer) { + if (signer == null) { + SIGNERS.remove(format); + } else { + SIGNERS.put(format, signer); + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java index 5b50c2afd7..0737a78085 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevTag.java @@ -13,7 +13,6 @@ package org.eclipse.jgit.revwalk; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.eclipse.jgit.lib.Constants.GPG_SIGNATURE_PREFIX; import java.io.IOException; import java.nio.charset.Charset; @@ -39,8 +38,17 @@ import org.eclipse.jgit.util.StringUtils; */ public class RevTag extends RevObject { - private static final byte[] hSignature = Constants - .encodeASCII(GPG_SIGNATURE_PREFIX); + private static final byte[] SIGNATURE_START = Constants + .encodeASCII("-----BEGIN"); //$NON-NLS-1$ + + private static final byte[] GPG_SIGNATURE_START = Constants + .encodeASCII(Constants.GPG_SIGNATURE_PREFIX); + + private static final byte[] CMS_SIGNATURE_START = Constants + .encodeASCII(Constants.CMS_SIGNATURE_PREFIX); + + private static final byte[] SSH_SIGNATURE_START = Constants + .encodeASCII(Constants.SSH_SIGNATURE_PREFIX); /** * Parse an annotated tag from its canonical format. @@ -209,20 +217,27 @@ public class RevTag extends RevObject { return msgB; } // Find the last signature start and return the rest - int start = nextStart(hSignature, raw, msgB); + int start = nextStart(SIGNATURE_START, raw, msgB); if (start < 0) { return start; } int next = RawParseUtils.nextLF(raw, start); while (next < raw.length) { - int newStart = nextStart(hSignature, raw, next); + int newStart = nextStart(SIGNATURE_START, raw, next); if (newStart < 0) { break; } start = newStart; next = RawParseUtils.nextLF(raw, start); } - return start; + // SIGNATURE_START is just a prefix. Check that it is one of the known + // full signature start tags. + if (RawParseUtils.match(raw, start, GPG_SIGNATURE_START) > 0 + || RawParseUtils.match(raw, start, CMS_SIGNATURE_START) > 0 + || RawParseUtils.match(raw, start, SSH_SIGNATURE_START) > 0) { + return start; + } + return -1; } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java index cf06172c17..90524db20a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java @@ -13,8 +13,8 @@ import java.text.MessageFormat; import java.util.Locale; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.lib.GpgSignatureVerifier.SignatureVerification; -import org.eclipse.jgit.lib.GpgSignatureVerifier.TrustLevel; +import org.eclipse.jgit.lib.SignatureVerifier.SignatureVerification; +import org.eclipse.jgit.lib.SignatureVerifier.TrustLevel; import org.eclipse.jgit.lib.PersonIdent; /** @@ -39,29 +39,31 @@ public final class SignatureUtils { * to use for dates * @return a textual representation of the {@link SignatureVerification}, * using LF as line separator + * + * @since 7.0 */ public static String toString(SignatureVerification verification, PersonIdent creator, GitDateFormatter formatter) { StringBuilder result = new StringBuilder(); // Use the creator's timezone for the signature date PersonIdent dateId = new PersonIdent(creator, - verification.getCreationDate()); + verification.creationDate()); result.append(MessageFormat.format(JGitText.get().verifySignatureMade, formatter.formatDate(dateId))); result.append('\n'); result.append(MessageFormat.format( JGitText.get().verifySignatureKey, - verification.getKeyFingerprint().toUpperCase(Locale.ROOT))); + verification.keyFingerprint().toUpperCase(Locale.ROOT))); result.append('\n'); - if (!StringUtils.isEmptyOrNull(verification.getSigner())) { + if (!StringUtils.isEmptyOrNull(verification.signer())) { result.append( MessageFormat.format(JGitText.get().verifySignatureIssuer, - verification.getSigner())); + verification.signer())); result.append('\n'); } String msg; - if (verification.getVerified()) { - if (verification.isExpired()) { + if (verification.verified()) { + if (verification.expired()) { msg = JGitText.get().verifySignatureExpired; } else { msg = JGitText.get().verifySignatureGood; @@ -69,14 +71,14 @@ public final class SignatureUtils { } else { msg = JGitText.get().verifySignatureBad; } - result.append(MessageFormat.format(msg, verification.getKeyUser())); - if (!TrustLevel.UNKNOWN.equals(verification.getTrustLevel())) { + result.append(MessageFormat.format(msg, verification.keyUser())); + if (!TrustLevel.UNKNOWN.equals(verification.trustLevel())) { result.append(' ' + MessageFormat .format(JGitText.get().verifySignatureTrust, verification - .getTrustLevel().name().toLowerCase(Locale.ROOT))); + .trustLevel().name().toLowerCase(Locale.ROOT))); } result.append('\n'); - msg = verification.getMessage(); + msg = verification.message(); if (!StringUtils.isEmptyOrNull(msg)) { result.append(msg); result.append('\n'); -- cgit v1.2.3 From 692ccfc0c29d53afc7a0b82f41efcd999ed217b0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 27 Aug 2024 01:31:44 +0200 Subject: AmazonS3: Ensure SAXParserFactory sets valid/expected input params Change Ie8a9d411fc19e8b7bf86c0b4df0b02153a0e9444 broke setting valid/expected input parameters for the XML parser. This can be fixed by calling SaxParserFactory#setNamespaceAware, see [1]. Also see earlier fix in [2]. [1] https://stackoverflow.com/questions/24891323/namespace-handling-with-sax-in-java [2] I05e993032ab3a6afb78634290b578ebc73cf1cbd Bug: jgit-87 Change-Id: Id4e9eebac8d9de81e5d48a608066db3cc862e15c --- org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java index b873925316..aaf9f8a08a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/AmazonS3.java @@ -757,8 +757,10 @@ public class AmazonS3 { final XMLReader xr; try { - xr = SAXParserFactory.newInstance().newSAXParser() - .getXMLReader(); + SAXParserFactory saxParserFactory = SAXParserFactory + .newInstance(); + saxParserFactory.setNamespaceAware(true); + xr = saxParserFactory.newSAXParser().getXMLReader(); } catch (SAXException | ParserConfigurationException e) { throw new IOException( JGitText.get().noXMLParserAvailable, e); -- cgit v1.2.3 From 9fec739702555e80bfe43f4839824ebfebf57a7e Mon Sep 17 00:00:00 2001 From: Max Haslbeck Date: Tue, 13 Aug 2024 13:16:53 +0200 Subject: Do not set headers if response is already committed This fixes issues when the response headers were already set and sent to the client. In all other cases this is a no-op. Change-Id: Ifb429e78f721cc514bb6eb1a3ef3412425cd2f1c Signed-off-by: Max Haslbeck --- .../src/org/eclipse/jgit/http/server/GitSmartHttpTools.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java index d2f0cd2731..bf3da4b5d0 100644 --- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java +++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/GitSmartHttpTools.java @@ -255,9 +255,11 @@ public class GitSmartHttpTools { private static void send(HttpServletRequest req, HttpServletResponse res, String type, byte[] buf, int httpStatus) throws IOException { ServletUtils.consumeRequestBody(req); - res.setStatus(httpStatus); - res.setContentType(type); - res.setContentLength(buf.length); + if (!res.isCommitted()) { + res.setStatus(httpStatus); + res.setContentType(type); + res.setContentLength(buf.length); + } try (OutputStream os = res.getOutputStream()) { os.write(buf); } -- cgit v1.2.3 From 6e15524470d9b822a10644cee47e8475eea9f049 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 20 Aug 2024 12:54:04 -0700 Subject: DfsReaderIoStats: getters to object size index micros/bytes These properties of the stats object don't have a getter and it is required to export those values in logs. Change-Id: I7f91a38ee4d02668aff1cbc8424ea669cdb1d2f7 --- .../jgit/internal/storage/dfs/DfsReaderIoStats.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java index 1e5e439598..fcfa3e0dee 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderIoStats.java @@ -248,6 +248,15 @@ public class DfsReaderIoStats { return stats.readCommitGraphBytes; } + /** + * Get total number of bytes read from object size indexes. + * + * @return total number of bytes read from object size indexes. + */ + public long getObjectSizeIndexBytes() { + return stats.readObjectSizeIndexBytes; + } + /** * Get total microseconds spent reading pack indexes. * @@ -284,6 +293,15 @@ public class DfsReaderIoStats { return stats.readCommitGraphMicros; } + /** + * Get total microseconds spent reading object size indexes. + * + * @return total microseconds spent reading object size indexes. + */ + public long getReadObjectSizeIndexMicros() { + return stats.readObjectSizeIndexMicros; + } + /** * Get total number of block cache hits. * -- cgit v1.2.3 From b9b7b506b79ec367c1f7363dd01a7e93105151ce Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 27 Aug 2024 16:15:14 +0200 Subject: JGit v7.0.0.202408271414-rc1 Signed-off-by: Matthias Sohn Change-Id: I969947a7c5fef72ed0c2f50e96a60787474f9906 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7c079a5899..80cde0ec84 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index be954bd8e0..d58105000f 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index b6b52e595e..533a079f61 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 22f8aff82c..32fc5d9588 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7c3edf475c..cace390e0a 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index e1a3671819..1ca8ca9e51 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 322f52f9f4..875ec111b9 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 054aa59429..7083376fdf 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index d8a616f09e..5f3044c40a 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 1fe5318660..f37e901128 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.test - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 27510e2095..b1fa911236 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index d865b13901..ba1f9755e8 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 7a62d1d232..736cdc06f7 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 0733a68ba0..9412e88eed 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index ad907d3809..0f444a173a 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c1ec7ae7c8..6fabe41167 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index d29d3879d5..0a438b9e40 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51a79d61ef..dd6432e0c0 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 124129d73d..3570df2cce 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index bbb29cd846..e8b1f2a2b2 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 7645dd1418..9834bc867e 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index edce2d8d27..703990f828 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 01ee7824ca..40d69ce0a7 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3e983511d5..46e3aa3835 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index cfeb426385..486b6755f3 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 67c82652cb..cd6f0c304d 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index ee65b851a2..4de94c5b48 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index a7ca6336b8..cde9898be3 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2a885f204e..ed081fb02d 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index af1cbf256a..04fb737f26 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 149ad00121..c184854c2d 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c33cb29b66..f6ad3f1104 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 8e41ee3d28..4ec9d128ae 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 49c1023ef0..db20344511 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index a59c82ed1a..10f0f456c7 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 2cf86bc942..ad5ede5466 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index befaa367de..eccac33662 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 96c8953398..e410fe838d 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2c109c90ee..7a1e7c58bc 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f4c1e566a4..108f53dfd3 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index a048aa1738..d200d701e0 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 62508e245f..e97f416d16 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 3dd7b10079..a7fcd990aa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index ea66a2383c..48647dc1a6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 23fdd235cb..aeb4aa210b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index fc1bf49989..8a0da7bf0e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 92262a00be..c2fc42ed13 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 3344dcbb1b..27eeeb20a9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 6f03419cb7..11ae64deb8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 45162c97a7..e294bebe57 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8eacae1fe7..1622d5066f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 287a723b9c..fc0864c147 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 179eab8a6b..c2ca334e32 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index cbb8e4fafc..0272bf8c2d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 61b5dd6031..9e7d0c474f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 4c0068bfab..81c11610a3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 12ab06937a..03e777e767 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 209274feeb..f13f5c4817 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 1d82d4a1cc..07a184c03f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index ff46d9e65d..9236f1a09e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index c4d4fcf825..bd7f4b7a55 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 657b90f0cf..3d2ec5cb91 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 955c5c04b5..dff09dbbe0 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 90090d6958..86ec204cc9 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index bb0c23dd72..1dd29e64af 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 8bb1b64622..4e9d412ada 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 7cd76c3011..ab11568afd 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index ad0164086a..161546489e 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 684ab70f86..743cfc1d47 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index f407ce11bf..0b98c62f05 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 9c6df6b79a..117be17fdb 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 967b781d10..8799e491a5 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 114582af22..7705c3ffc2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index bb0d79b3d5..bfc22730a0 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 7cc3a55b26..6875299ad0 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 3bf4edd65f..dc68a04ef5 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 761b6c4aef..907c0a9d30 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 9da7452428..292668089f 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 1dc0e01964..107f20eef9 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index a3db63ca23..dfb93e1769 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index ab70d68a3f..b7174d5b6f 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 05f7c08bd2..ea7d560ce0 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 04bda44748..7ffefcc513 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 8170fc6bd2..7f26b9db2e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 6d1e2676af..dc4934e65f 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d6c0ba5dcc..3ee1cadb62 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202408271414-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 7531018bc3..7447d9878d 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202408271414-rc1 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202408271414-rc1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 3c6c38992c..c0238abb0e 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index e8116fb011..0e6d298bc3 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0-SNAPSHOT + 7.0.0.202408271414-rc1 JGit - Parent ${jgit-url} -- cgit v1.2.3 From c318c8a435f584ac00d1cb24292da0f8a956707d Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Tue, 27 Aug 2024 13:27:35 -0700 Subject: DfsPackFile: re-add metrics for bitmap index loads The calculations for readBitmapIdxBytes and readBitmapIdxMicros metrics were unintentionally removed in https://gerrithub.io/c/eclipse-jgit/jgit/+/1177262, so this change adds those metrics back. Change-Id: I7ac7769acd092680933a27b2b3e70dd67690cfbf --- .../src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java index 845feab5ac..48ed47a77c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackFile.java @@ -1280,9 +1280,12 @@ public final class DfsPackFile extends BlockBasedFile { private DfsBlockCache.Ref loadBitmapIndex(DfsReader ctx, DfsStreamKey bitmapKey) throws IOException { ctx.stats.readBitmap++; + long start = System.nanoTime(); PackBitmapIndexLoader.LoadResult result = bitmapLoader .loadPackBitmapIndex(ctx, this); bitmapIndex = result.bitmapIndex; + ctx.stats.readBitmapIdxBytes += result.bytesRead; + ctx.stats.readBitmapIdxMicros += elapsedMicros(start); return new DfsBlockCache.Ref<>(bitmapKey, REF_POSITION, result.bytesRead, result.bitmapIndex); } -- cgit v1.2.3 From 7818c8abc54eb8472f4ac76e3fd6f35ba8c51d2d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 01:50:51 +0200 Subject: Prepare 7.0.0-SNAPSHOT builds Change-Id: Ifa0a549e9551a2016241169e1c1e9052174c49d1 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 80cde0ec84..7c079a5899 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index d58105000f..be954bd8e0 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 533a079f61..b6b52e595e 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 32fc5d9588..22f8aff82c 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index cace390e0a..7c3edf475c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 1ca8ca9e51..e1a3671819 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 875ec111b9..322f52f9f4 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 7083376fdf..054aa59429 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 5f3044c40a..d8a616f09e 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index f37e901128..1fe5318660 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index b1fa911236..27510e2095 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index ba1f9755e8..d865b13901 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 736cdc06f7..7a62d1d232 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 9412e88eed..0733a68ba0 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 0f444a173a..ad907d3809 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 6fabe41167..c1ec7ae7c8 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 0a438b9e40..d29d3879d5 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index dd6432e0c0..51a79d61ef 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 3570df2cce..124129d73d 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index e8b1f2a2b2..bbb29cd846 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 9834bc867e..7645dd1418 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 703990f828..edce2d8d27 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 40d69ce0a7..01ee7824ca 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 46e3aa3835..3e983511d5 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 486b6755f3..cfeb426385 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index cd6f0c304d..67c82652cb 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 4de94c5b48..ee65b851a2 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index cde9898be3..a7ca6336b8 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index ed081fb02d..2a885f204e 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 04fb737f26..af1cbf256a 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index c184854c2d..149ad00121 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index f6ad3f1104..c33cb29b66 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 4ec9d128ae..8e41ee3d28 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index db20344511..49c1023ef0 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 10f0f456c7..a59c82ed1a 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index ad5ede5466..2cf86bc942 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index eccac33662..befaa367de 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index e410fe838d..96c8953398 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 7a1e7c58bc..2c109c90ee 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 108f53dfd3..f4c1e566a4 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index d200d701e0..a048aa1738 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index e97f416d16..62508e245f 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index a7fcd990aa..3dd7b10079 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 48647dc1a6..ea66a2383c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index aeb4aa210b..23fdd235cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 8a0da7bf0e..fc1bf49989 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index c2fc42ed13..92262a00be 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 27eeeb20a9..3344dcbb1b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 11ae64deb8..6f03419cb7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index e294bebe57..45162c97a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 1622d5066f..8eacae1fe7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index fc0864c147..287a723b9c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index c2ca334e32..179eab8a6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 0272bf8c2d..cbb8e4fafc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 9e7d0c474f..61b5dd6031 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 81c11610a3..4c0068bfab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 03e777e767..12ab06937a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index f13f5c4817..209274feeb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 07a184c03f..1d82d4a1cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 9236f1a09e..ff46d9e65d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index bd7f4b7a55..c4d4fcf825 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 3d2ec5cb91..657b90f0cf 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index dff09dbbe0..955c5c04b5 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 86ec204cc9..90090d6958 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 1dd29e64af..bb0c23dd72 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 4e9d412ada..8bb1b64622 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index ab11568afd..7cd76c3011 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 161546489e..ad0164086a 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 743cfc1d47..684ab70f86 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 0b98c62f05..f407ce11bf 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 117be17fdb..9c6df6b79a 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 8799e491a5..967b781d10 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 7705c3ffc2..114582af22 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index bfc22730a0..bb0d79b3d5 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 6875299ad0..7cc3a55b26 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index dc68a04ef5..3bf4edd65f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 907c0a9d30..761b6c4aef 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 292668089f..9da7452428 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 107f20eef9..1dc0e01964 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index dfb93e1769..a3db63ca23 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index b7174d5b6f..ab70d68a3f 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index ea7d560ce0..05f7c08bd2 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 7ffefcc513..04bda44748 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 7f26b9db2e..8170fc6bd2 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index dc4934e65f..6d1e2676af 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 3ee1cadb62..d6c0ba5dcc 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.202408271414-rc1 +Bundle-Version: 7.0.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 7447d9878d..7531018bc3 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202408271414-rc1 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202408271414-rc1";roots="." +Bundle-Version: 7.0.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index c0238abb0e..3c6c38992c 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 0e6d298bc3..e8116fb011 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0.202408271414-rc1 + 7.0.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 19da1647c5da8161bf5bca20dc090b33e546f5d0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 08:49:51 +0200 Subject: Update jetty to 12.0.12 Change-Id: I8b4381fcd067280050f31d6b8526c9f409244b55 --- WORKSPACE | 34 +- .../org.eclipse.jgit.target/jgit-4.17.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.18.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.19.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.20.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.21.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.22.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.23.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.24.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.25.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.26.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.27.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.28.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.29.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.30.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.31.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.32.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/jgit-4.33.target | 454 ++++++++++----------- .../org.eclipse.jgit.target/maven/dependencies.tpd | 14 +- pom.xml | 2 +- 20 files changed, 3884 insertions(+), 3884 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 4ed6879735..562f1928b3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -246,62 +246,62 @@ maven_jar( sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", ) -JETTY_VER = "12.0.10" +JETTY_VER = "12.0.12" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, - sha1 = "a8d087bde78f231084901553bb6829663b4a22f1", - src_sha1 = "277a23875dd866b12ac09024656b90cb74d0d27f", + sha1 = "12f25f260a8f9fb519b6d3058260564277e618cd", + src_sha1 = "16a22f6ed585c6dcab07d111de290301373db1c7", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "a7bd8056fa84439411f60fedd8a94b1983880cf9", - src_sha1 = "027e27a757f2d23f28ac26f06e9bf2c49a885cfe", + sha1 = "962d2c5748f750aae667399481915bd02a9746e0", + src_sha1 = "e953d0e19e6e420f5e7c1f62424c4bbe0d385d15", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "0dcdef1c9ead5040e6b637512ab1794191058a22", - src_sha1 = "196fa1a06b65a3b6f549a8ac4523cafe59b1cbd6", + sha1 = "77591ab10113d7de7eb8a01bb4d9d23b234aebd1", + src_sha1 = "952873398a59bc5a964d9d2d130227af807559e9", ) maven_jar( name = "jetty-session", artifact = "org.eclipse.jetty:jetty-session:" + JETTY_VER, - sha1 = "96dd580a79d938b532e8cff47475efbcaa80ea58", - src_sha1 = "390d3c79b3b9ff14f8361f7235c6a20374ea9b7e", + sha1 = "fceae460fb4677a6cec80d3b70b1fc3ae2a114a7", + src_sha1 = "ba95d5e17a3d7f09ca908d4c0773e913f3612425", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "71f438b9cf1ba0b3411c5eddd386eeeeca25168a", - src_sha1 = "cd8b7d81dc839d40bf3dfd2dd2d82731b2a32a67", + sha1 = "549fe58ae50b9c061d09803fb0d2659a93ce0ecd", + src_sha1 = "c7afad980b9eade12b473172a9d069d96d016677", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "4d5ddfc6ad4d6504531861806fade68c7d477f1b", - src_sha1 = "36f008ab135171e5ebbee18351f16a4eca7a678e", + sha1 = "4e2cd5c23e8ba550238f35c361c22ffb1e7bf00c", + src_sha1 = "42397797c496a51520900a529ba7e1b315aba768", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "ec7c95b5a289560f4a7be57170f4fdbedde72b92", - src_sha1 = "d5c1d7e9723514f5dae9dd89231c4c68129e2a64", + sha1 = "f7b1e4f835c38d12668b426d327118e767d2f1d4", + src_sha1 = "0fdb95a123cc50f6adf4154edc5316cabca05f58", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "343c9c07e3ff461209a4eb7787dca665b5313818", - src_sha1 = "4f11df356220d181fd9a6dbb44f18a739d8418a1", + sha1 = "330e692032c82c305cd52c6a8e9bfba0f1da2555", + src_sha1 = "d6b9274b3ef0419a6ba869c828fd0c59c570cd9d", ) BOUNCYCASTLE_VER = "1.78.1" 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 dff4e29e61..2f0dc9c0bd 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 5a37936a72..c62fd097ee 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 15d8932bbd..a7ae3580c1 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 675292076f..1e4802dd07 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 7c5fe25159..352a5bfcb5 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 dc57a43400..57b19ec793 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 913389ffd0..f8364af1cd 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 e5f8fedd76..0762fc8da8 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 c2e439283a..e19bef9d03 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 a09f0fc412..3b325d780f 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 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index b38f17caf5..2817f56238 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 8dd743d1d0..5fc4ed7b4a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index acf5191c20..40e01cba48 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 9773f2b020..630db68f1d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index a496c04f92..94ac7afbe5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 33fe7e8c64..9a2a98b058 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index b84727ad48..b77bbd58b1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -33,258 +33,258 @@ - - - org.tukaani - xz - 1.9 - jar - - + + + org.tukaani + xz + 1.9 + jar + + - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + - - - org.apache.sshd - sshd-osgi - 2.13.2 - jar - - - org.apache.sshd - sshd-sftp - 2.13.2 - jar - - + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + - - - org.mockito - mockito-core - 5.12.0 - jar - - + + + org.mockito + mockito-core + 5.12.0 + jar + + - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + - - - org.eclipse.jetty.ee10 - jetty-ee10-servlet - 12.0.10 - jar - - - org.eclipse.jetty - jetty-http - 12.0.10 - jar - - - org.eclipse.jetty - jetty-io - 12.0.10 - jar - - - org.eclipse.jetty - jetty-security - 12.0.10 - jar - - - org.eclipse.jetty - jetty-server - 12.0.10 - jar - - - org.eclipse.jetty - jetty-session - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util - 12.0.10 - jar - - - org.eclipse.jetty - jetty-util-ajax - 12.0.10 - jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - jar - - + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + jar + + - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + - - - org.hamcrest - hamcrest - 2.2 - jar - - + + + org.hamcrest + hamcrest + 2.2 + jar + + - - - com.google.code.gson - gson - 2.11.0 - jar - - + + + com.google.code.gson + gson + 2.11.0 + jar + + - - - net.bytebuddy - byte-buddy - 1.14.17 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.17 - jar - - + + + net.bytebuddy + byte-buddy + 1.14.17 + jar + + + net.bytebuddy + byte-buddy-agent + 1.14.17 + jar + + - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + - - - org.assertj - assertj-core - 3.26.0 - jar - - + + + org.assertj + assertj-core + 3.26.0 + jar + + - - - args4j - args4j - 2.37 - jar - - + + + args4j + args4j + 2.37 + jar + + - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - + + + commons-codec + commons-codec + 1.17.0 + jar + + + org.apache.commons + commons-compress + 1.26.2 + jar + + + org.apache.commons + commons-lang3 + 3.14.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.2 + jar + + 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 202eda6055..9e366aa57f 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 @@ -159,37 +159,37 @@ maven jetty dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.10" + version = "12.0.12" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.10" + version = "12.0.12" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.10" + version = "12.0.12" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.10" + version = "12.0.12" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.10" + version = "12.0.12" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.10" + version = "12.0.12" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.10" + version = "12.0.12" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index e8116fb011..336e59acca 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.26.2 6.0.0 6.0.0 - 12.0.10 + 12.0.12 0.21.2 4.5.14 4.4.16 -- cgit v1.2.3 From 39dc6ffa8771768ea5d2bf94fdcfaa6c4be15873 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 01:47:45 +0200 Subject: Update commons-codec:commons-codec to 1.17.1 Change-Id: Ie78b1479ec95632981033342e65d546fc7bd905d --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 562f1928b3..499707ca7f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -138,8 +138,8 @@ maven_jar( maven_jar( name = "commons-codec", - artifact = "commons-codec:commons-codec:1.17.0", - sha1 = "0dbe8eef6e14460e73da07f7b11bf994d6626355", + artifact = "commons-codec:commons-codec:1.17.1", + sha1 = "973638b7149d333563584137ebf13a691bb60579", ) maven_jar( 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 2f0dc9c0bd..b9fb415041 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 c62fd097ee..2e0f063df4 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 a7ae3580c1..5808e8c247 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 1e4802dd07..1778fd266c 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 352a5bfcb5..988413341a 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 57b19ec793..db31c91378 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 f8364af1cd..562ea8dc57 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 0762fc8da8..6dbd201219 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 e19bef9d03..7706fc385f 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 3b325d780f..2cc0c3850e 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 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 2817f56238..432ca0d375 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 5fc4ed7b4a..315389f1ec 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 40e01cba48..57830b4e72 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 630db68f1d..dbd1ebc6df 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 94ac7afbe5..e8619828fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 9a2a98b058..d81b8db4fd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index b77bbd58b1..1a395c38d2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 jar 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 9e366aa57f..4c9d603b14 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 @@ -10,7 +10,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.17.0" + version = "1.17.1" } dependency { groupId = "org.apache.commons" diff --git a/pom.xml b/pom.xml index 336e59acca..a9544f8692 100644 --- a/pom.xml +++ b/pom.xml @@ -886,7 +886,7 @@ commons-codec commons-codec - 1.17.0 + 1.17.1 -- cgit v1.2.3 From 3f06dd9519a2283e68de73959a25b4aeb612f362 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 01:53:53 +0200 Subject: Update commons-logging:commons-logging to 1.3.4 Change-Id: I3dba27df9425484fdc630b067ddb19a2425aa891 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 499707ca7f..efa8b0d0d1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -144,8 +144,8 @@ maven_jar( maven_jar( name = "commons-logging", - artifact = "commons-logging:commons-logging:1.3.2", - sha1 = "3dc966156ef19d23c839715165435e582fafa753", + artifact = "commons-logging:commons-logging:1.3.4", + sha1 = "b9fc14968d63a8b8a8a2c1885fe3e90564239708", ) maven_jar( 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 b9fb415041..b729b997b9 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 2e0f063df4..63201eff4f 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 5808e8c247..533acacdce 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 1778fd266c..415e72d1c2 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 988413341a..3f1b38a789 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 db31c91378..b41660e964 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 562ea8dc57..0bc221b37a 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 6dbd201219..a89ec1aba6 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 7706fc385f..24edc8d747 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 2cc0c3850e..6bc0c2cc75 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 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 432ca0d375..0c48d4a239 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 315389f1ec..6e4817fff6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 57830b4e72..a16dac1ebd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index dbd1ebc6df..3634b4f802 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index e8619828fe..740a14a774 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index d81b8db4fd..2a4d096e33 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 1a395c38d2..81add119ee 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 jar 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 4c9d603b14..da8920ae38 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 @@ -30,7 +30,7 @@ maven apache dependency { groupId = "commons-logging" artifactId = "commons-logging" - version = "1.3.2" + version = "1.3.4" } } diff --git a/pom.xml b/pom.xml index a9544f8692..5195e80d79 100644 --- a/pom.xml +++ b/pom.xml @@ -904,7 +904,7 @@ commons-logging commons-logging - 1.3.2 + 1.3.4 -- cgit v1.2.3 From d66de619ad395d65be6ac38c01bba96606eb9e25 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 02:05:00 +0200 Subject: Update bytebuddy to 1.15.0 Change-Id: Idec6369bb5da997e532b912c2984b51e77a3ac0d --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 20 files changed, 57 insertions(+), 57 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index efa8b0d0d1..16e0c540ec 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "fc4a3d051da838946f9dffe725efbd06cd7d1eec", ) -BYTE_BUDDY_VERSION = "1.14.17" +BYTE_BUDDY_VERSION = "1.15.0" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "a8d08f3c1e75ecc7f38a8cfd7e9fa47919096373", + sha1 = "a5b1159b91c5334015de0f22ab4b1188cd42bbff", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "e3c251a39dc90badaf71c83427ba46840f219d8d", + sha1 = "e32740c43acebaac9d55b86399ecf6a5df3c17fb", ) maven_jar( 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 b729b997b9..fa9ee8f723 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 63201eff4f..8b15cf06be 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 533acacdce..4380e51194 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 415e72d1c2..5d5a882180 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 3f1b38a789..9deec0979f 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 b41660e964..f18ef1cf73 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 0bc221b37a..6e47256e36 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 a89ec1aba6..23d69c0c85 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 24edc8d747..45bca608b3 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 6bc0c2cc75..2f3f28e3c7 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 0c48d4a239..75ecc4990e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 6e4817fff6..af29de7f0a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index a16dac1ebd..3a9c230376 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 3634b4f802..b943ad0c77 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 740a14a774..4c2eef694b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 2a4d096e33..202b7f4a4b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 81add119ee..a10f0bf774 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.14.17 + 1.15.0 jar net.bytebuddy byte-buddy-agent - 1.14.17 + 1.15.0 jar 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 da8920ae38..c05785663c 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.14.17" + version = "1.15.0" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.14.17" + version = "1.15.0" } } diff --git a/pom.xml b/pom.xml index 5195e80d79..f38a770ade 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.26.0 5.14.0 - 1.14.17 + 1.15.0 jacoco -- cgit v1.2.3 From d749ed595e449f868a5ea3604eaebc7f58ce98dd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 11:40:37 +0200 Subject: Update org.apache.commons:commons-lang3 to 3.16.0 Change-Id: I7ec0cf1090aab26c1b1f70f816963fba63405034 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 16e0c540ec..fdcaff44f2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -174,8 +174,8 @@ maven_jar( maven_jar( name = "commons-lang3", - artifact = "org.apache.commons:commons-lang3:3.14.0", - sha1 = "1ed471194b02f2c6cb734a0cd6f6f107c673afae", + artifact = "org.apache.commons:commons-lang3:3.16.0", + sha1 = "3eb54effe40946dfb06dc5cd6c7ce4116cd51ea4", ) maven_jar( 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 fa9ee8f723..173556c85b 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 8b15cf06be..6d05500d22 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 4380e51194..3a3ff7c70b 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 5d5a882180..d12504c434 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 9deec0979f..48b6a8b9b9 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 f18ef1cf73..c6ba2ce247 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 6e47256e36..56b8dab8f3 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 23d69c0c85..a71a08c8f3 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 45bca608b3..b587b40d9d 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 2f3f28e3c7..f3059a5790 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 75ecc4990e..749ae95fe5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index af29de7f0a..d69e3f7206 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 3a9c230376..9657fe547b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index b943ad0c77..cb0ac65190 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 4c2eef694b..e319415e94 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 202b7f4a4b..390568efd9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index a10f0bf774..3790d3ccc6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.14.0 + 3.16.0 jar 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 c05785663c..d699c503b8 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 @@ -20,7 +20,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-lang3" - version = "3.14.0" + version = "3.16.0" } dependency { groupId = "commons-io" -- cgit v1.2.3 From 04b56fe760a1ed87fd32a316de45e200dedd37cc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 13:43:12 +0200 Subject: Update org.assertj:assertj-core to 3.26.3 Change-Id: I37816b1700bbcd102eb5b1b2591ba493edea4b36 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index fdcaff44f2..0f616a66bd 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -216,8 +216,8 @@ maven_jar( maven_jar( name = "assertj-core", - artifact = "org.assertj:assertj-core:3.26.0", - sha1 = "fc4a3d051da838946f9dffe725efbd06cd7d1eec", + artifact = "org.assertj:assertj-core:3.26.3", + sha1 = "0d26263eb7524252d98e602fc6942996a3195e29", ) BYTE_BUDDY_VERSION = "1.15.0" 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 173556c85b..9d895c23ac 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 6d05500d22..74ebc74de4 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 3a3ff7c70b..f9324cb9b0 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 d12504c434..38a8db7947 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 48b6a8b9b9..1e10f9050b 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 c6ba2ce247..53b63ee5e3 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 56b8dab8f3..accadb20d9 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 a71a08c8f3..659559c0f9 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 b587b40d9d..123c9d83e6 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 f3059a5790..dc19331df6 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 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 749ae95fe5..c5625ad894 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index d69e3f7206..677bb0d6ac 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 9657fe547b..ea9d43fe62 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index cb0ac65190..c597350d6d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index e319415e94..3b691f63fa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 390568efd9..3c4e3b7898 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 3790d3ccc6..5425ea6748 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.0 + 3.26.3 jar 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 d699c503b8..f1834db923 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 @@ -56,7 +56,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.26.0" + version = "3.26.3" } } diff --git a/pom.xml b/pom.xml index f38a770ade..8cc50f1a80 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 3.13.0 2.13.0 2.2 - 3.26.0 + 3.26.3 5.14.0 1.15.0 -- cgit v1.2.3 From 50f8511096401c2eb808160727ec7b653aa46ead Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 13:55:15 +0200 Subject: Update org.tukaani:xz to 1.10 Change-Id: Ibd565d4d4e5ef0dd32514fdc6d73b44c25aaa27f --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 0f616a66bd..40d41f3f57 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -186,8 +186,8 @@ maven_jar( maven_jar( name = "tukaani-xz", - artifact = "org.tukaani:xz:1.9", - sha1 = "1ea4bec1a921180164852c65006d928617bd2caf", + artifact = "org.tukaani:xz:1.10", + sha1 = "1be8166f89e035a56c6bfc67dbc423996fe577e2", ) maven_jar( 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 9d895c23ac..afa7b19aad 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 74ebc74de4..b5b7eb464c 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 f9324cb9b0..eb2d8be9af 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 38a8db7947..c3db8848c0 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 1e10f9050b..5daad91640 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 53b63ee5e3..211953dce8 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 accadb20d9..c7572fc89e 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 659559c0f9..5fd6064bcd 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 123c9d83e6..cfc3c06d6f 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 dc19331df6..e5bd8bc3c8 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 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index c5625ad894..4e616fde53 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 677bb0d6ac..fdc1b5861a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index ea9d43fe62..4b1305b093 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index c597350d6d..648f7c210f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 3b691f63fa..1b07422867 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 3c4e3b7898..cc485dcc19 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 5425ea6748..6448e402b9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -37,7 +37,7 @@ org.tukaani xz - 1.9 + 1.10 jar 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 f1834db923..7131393f63 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 @@ -274,6 +274,6 @@ maven xz dependency { groupId = "org.tukaani" artifactId = "xz" - version = "1.9" + version = "1.10" } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8cc50f1a80..9c4c1b62d7 100644 --- a/pom.xml +++ b/pom.xml @@ -910,7 +910,7 @@ org.tukaani xz - 1.9 + 1.10 true -- cgit v1.2.3 From 69f64a5ff73807d34a172be596c694a35bed4ac9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 14:59:04 +0200 Subject: Update org.apache.commons:commons-compress to 1.27.1 Change-Id: Ibd48bfe5ec3fdd3d52d755dc4881e013aae21d5d --- WORKSPACE | 4 ++-- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 9 +++++---- org.eclipse.jgit.archive/pom.xml | 5 +++++ .../org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- .../org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 22 files changed, 48 insertions(+), 42 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 40d41f3f57..2336095bd6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -168,8 +168,8 @@ maven_jar( maven_jar( name = "commons-compress", - artifact = "org.apache.commons:commons-compress:1.26.2", - sha1 = "eb1f823447af685208e684fce84783b43517960c", + artifact = "org.apache.commons:commons-compress:1.27.1", + sha1 = "a19151084758e2fbb6b41eddaa88e7b8ff4e6599", ) maven_jar( diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index e1a3671819..3e151f0b0c 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -18,12 +18,13 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.osgi.framework;version="[1.3.0,2.0.0)" + org.osgi.framework;version="[1.3.0,2.0.0)", + org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator Export-Package: org.eclipse.jgit.archive;version="7.0.0"; - uses:="org.eclipse.jgit.lib, + uses:="org.apache.commons.compress.archivers, + org.osgi.framework, org.eclipse.jgit.api, - org.apache.commons.compress.archivers, - org.osgi.framework", + org.eclipse.jgit.lib", org.eclipse.jgit.archive.internal;version="7.0.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 054aa59429..18b7fcff82 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -40,6 +40,11 @@ commons-compress + + org.tukaani + xz + + org.eclipse.jgit org.eclipse.jgit 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 afa7b19aad..8ac087426f 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 b5b7eb464c..733177913d 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 eb2d8be9af..9ef5749422 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 c3db8848c0..1b904dcac3 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 5daad91640..b4beaaefb3 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 211953dce8..b8f84348a3 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 c7572fc89e..fda989e7e9 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 5fd6064bcd..5d194a475f 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 cfc3c06d6f..561e84fe78 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 e5bd8bc3c8..d722b0a8ba 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 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 4e616fde53..5a6eb2ee88 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index fdc1b5861a..f3939cd7e8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 4b1305b093..af77719d51 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 648f7c210f..89909f767a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 1b07422867..b9a742c0c8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index cc485dcc19..4da84f720d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 6448e402b9..8e5ed1403a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -263,7 +263,7 @@ org.apache.commons commons-compress - 1.26.2 + 1.27.1 jar 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 7131393f63..6c766741c1 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 @@ -15,7 +15,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-compress" - version = "1.26.2" + version = "1.27.1" } dependency { groupId = "org.apache.commons" diff --git a/pom.xml b/pom.xml index 9c4c1b62d7..bd18ed247e 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ 4.13.2 1C 2.37 - 1.26.2 + 1.27.1 6.0.0 6.0.0 12.0.12 -- cgit v1.2.3 From f13a655c56a63a367d74e22e3f39f08a0f787b45 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 15:22:42 +0200 Subject: Update jakarta.servlet:jakarta.servlet-api to 6.1.0 Change-Id: Ie95e0247e6a23a16343e0f644d613dfe95fd2d1e --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 20 files changed, 38 insertions(+), 38 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 2336095bd6..1fb967fbc5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -162,8 +162,8 @@ maven_jar( maven_jar( name = "servlet-api", - artifact = "jakarta.servlet:jakarta.servlet-api:6.0.0", - sha1 = "abecc699286e65035ebba9844c03931357a6a963", + artifact = "jakarta.servlet:jakarta.servlet-api:6.1.0", + sha1 = "1169a246913fe3823782af7943e7a103634867c5", ) maven_jar( 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 8ac087426f..e996aebab1 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 733177913d..cd4f935941 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 9ef5749422..01e8071026 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 1b904dcac3..7dbb163db0 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 b4beaaefb3..985fee0dee 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 b8f84348a3..afd61cf717 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 fda989e7e9..0309d2f844 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 5d194a475f..0ed6d80ca9 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 561e84fe78..b081af4a10 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 d722b0a8ba..5874693f6b 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 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 5a6eb2ee88..e192b624b3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index f3939cd7e8..3875520cb4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index af77719d51..01ae4ac550 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 89909f767a..1651587a13 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index b9a742c0c8..9141303103 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 4da84f720d..26524a9aa2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 8e5ed1403a..8591802f38 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -153,7 +153,7 @@ jakarta.servlet jakarta.servlet-api - 6.0.0 + 6.1.0 jar 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 6c766741c1..8718535c78 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 @@ -194,7 +194,7 @@ maven jetty dependency { groupId = "jakarta.servlet" artifactId = "jakarta.servlet-api" - version = "6.0.0" + version = "6.1.0" } } diff --git a/pom.xml b/pom.xml index bd18ed247e..13c681a716 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 2.37 1.27.1 6.0.0 - 6.0.0 + 6.1.0 12.0.12 0.21.2 4.5.14 -- cgit v1.2.3 From 9627ee84ed4086cee51131cfd980aef0dbf33f9c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 16:08:04 +0200 Subject: Suppress non-externalized string warnings for texts which don't need to be translatable. Change-Id: Iacac5df9525ddbc9942b7c440450b6aad4864135 --- .../src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java | 2 +- org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java | 3 ++- .../org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java index d191e23399..e511a68d2e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/BareSuperprojectWriter.java @@ -157,7 +157,7 @@ class BareSuperprojectWriter { if (ObjectId.isId(proj.getRevision())) { objectId = ObjectId.fromString(proj.getRevision()); if (config.recordRemoteBranch && proj.getUpstream() != null) { - cfg.setString("submodule", name, "ref", proj.getUpstream()); + cfg.setString("submodule", name, "ref", proj.getUpstream()); //$NON-NLS-1$//$NON-NLS-2$ } } else { objectId = callback.sha1(url, proj.getRevision()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index 9979664ceb..d30e8d63fd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -255,7 +255,8 @@ public class RepoCommand extends GitCommand { @SuppressWarnings("serial") static class ManifestErrorException extends GitAPIException { ManifestErrorException(Throwable cause) { - super(RepoText.get().invalidManifest + " " + cause.getMessage(), cause); + super(RepoText.get().invalidManifest + " " + cause.getMessage(), //$NON-NLS-1$ + cause); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index 20f4666373..fa68b979fb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -344,7 +344,7 @@ public class DfsBlockCacheConfig { if (packExtsDuplicates.size() > 0) { String duplicatePackExts = packExtsDuplicates.stream() .map(PackExt::toString) - .collect(Collectors.joining(",")); + .collect(Collectors.joining(",")); //$NON-NLS-1$ throw new IllegalArgumentException(MessageFormat.format( JGitText.get().duplicatePackExtensionsSet, CONFIG_CORE_SECTION, subSection, @@ -480,7 +480,7 @@ public class DfsBlockCacheConfig { throw new IllegalArgumentException( JGitText.get().noPackExtGivenForConfiguration); } - String[] extensions = packExtensions.split(" ", -1); + String[] extensions = packExtensions.split(" ", -1); //$NON-NLS-1$ Set packExts = new HashSet<>(extensions.length); for (String extension : extensions) { try { -- cgit v1.2.3 From f5f19b7c25c06cff336c679ac36946d3f521980c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 16:09:38 +0200 Subject: DfsBlockCacheConfigTest: suppress boxing warning on test class Change-Id: Ibe7edc5e53c3d467e0e6144a3f8a32989f1ac6af --- .../eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java index 6ca0ff6a16..c93f48d79c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java @@ -61,6 +61,7 @@ import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.lib.Config; import org.junit.Test; +@SuppressWarnings("boxing") public class DfsBlockCacheConfigTest { @Test @@ -71,7 +72,6 @@ public class DfsBlockCacheConfigTest { } @Test - @SuppressWarnings("boxing") public void negativeBlockSizeIsConvertedToDefault() { DfsBlockCacheConfig config = new DfsBlockCacheConfig(); config.setBlockSize(-1); @@ -80,7 +80,6 @@ public class DfsBlockCacheConfigTest { } @Test - @SuppressWarnings("boxing") public void tooSmallBlockSizeIsConvertedToDefault() { DfsBlockCacheConfig config = new DfsBlockCacheConfig(); config.setBlockSize(10); @@ -89,7 +88,6 @@ public class DfsBlockCacheConfigTest { } @Test - @SuppressWarnings("boxing") public void validBlockSize() { DfsBlockCacheConfig config = new DfsBlockCacheConfig(); config.setBlockSize(65536); -- cgit v1.2.3 From 60f40a8e66c2f53d50426749bbb31d84d074baac Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 16:10:39 +0200 Subject: PackExtBlockCacheTableTest: suppress boxing warning on test class Change-Id: Ie9d5da0c065ba0118927d530ed589952fb3b2c2b --- .../eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java index d506bfba40..72abbf1120 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java @@ -35,6 +35,7 @@ import org.eclipse.jgit.internal.storage.pack.PackExt; import org.junit.Test; import org.mockito.Mockito; +@SuppressWarnings("boxing") public class PackExtBlockCacheTableTest { @Test public void fromBlockCacheConfigs_createsDfsPackExtBlockCacheTables() { -- cgit v1.2.3 From 07f5e817982cdfcb38db7c10f37c6e4964a0a666 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 16:13:42 +0200 Subject: PackObjectSizeIndexV1: fix boxing warnings Change-Id: I25e6194fb8bf09dcac1613cec8349c3893a4f81a --- .../eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java index e172f141f5..9957f54fbf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackObjectSizeIndexV1.java @@ -149,7 +149,8 @@ class PackObjectSizeIndexV1 implements PackObjectSizeIndex { byte[] data = in.readNBytes(expectedBytes); if (data.length < expectedBytes) { throw new IOException(MessageFormat - .format(JGitText.get().unableToReadFullArray, ints)); + .format(JGitText.get().unableToReadFullArray, + Integer.valueOf(ints))); } return new IntArray(data); } @@ -217,7 +218,8 @@ class PackObjectSizeIndexV1 implements PackObjectSizeIndex { byte[] data = in.readNBytes(longs * LONG_SIZE); if (data.length < longs * LONG_SIZE) { throw new IOException(MessageFormat - .format(JGitText.get().unableToReadFullArray, longs)); + .format(JGitText.get().unableToReadFullArray, + Integer.valueOf(longs))); } return new LongArray(data); } -- cgit v1.2.3 From 29fa0e5dee3c7e080ba028a9b4c3fe5d4a3c9aa5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 17:09:16 +0200 Subject: PackExtBlockCacheTableTest: suppress unchecked conversion warnings Change-Id: I5fcad7a824c4a320683d11da52c4e2035231f85d --- .../eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java index 72abbf1120..d904946226 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java @@ -35,7 +35,7 @@ import org.eclipse.jgit.internal.storage.pack.PackExt; import org.junit.Test; import org.mockito.Mockito; -@SuppressWarnings("boxing") +@SuppressWarnings({ "boxing", "unchecked" }) public class PackExtBlockCacheTableTest { @Test public void fromBlockCacheConfigs_createsDfsPackExtBlockCacheTables() { -- cgit v1.2.3 From 71eb7921485692e7520258a929b1b378c7a69691 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 17:10:04 +0200 Subject: PackExtBlockCacheTableTest: fix empty block warning Change-Id: I35e7527c6c555cd57fce14889412fa2fd6beab88 --- .../eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java index d904946226..8c003e0cb3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java @@ -95,6 +95,7 @@ public class PackExtBlockCacheTableTest { throws Exception { BlockBasedFile blockBasedFile = new BlockBasedFile(null, mock(DfsPackDescription.class), PackExt.BITMAP_INDEX) { + // empty }; DfsBlock dfsBlock = mock(DfsBlock.class); DfsBlockCacheTable defaultBlockCacheTable = mock( @@ -125,6 +126,7 @@ public class PackExtBlockCacheTableTest { throws Exception { BlockBasedFile blockBasedFile = new BlockBasedFile(null, mock(DfsPackDescription.class), PackExt.PACK) { + // empty }; DfsBlock dfsBlock = mock(DfsBlock.class); DfsBlockCacheTable defaultBlockCacheTable = mock( -- cgit v1.2.3 From 4785d621fbe741c8fef9a3b47ed74024af2801a4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 17:12:41 +0200 Subject: ObjectDirectoryTest: ensure WindowCursor is closed Change-Id: I75b7d36181a0d404d4e3dca17b9e436892d97b42 --- .../internal/storage/file/ObjectDirectoryTest.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java index 746a0a1ff3..d1342c0fbd 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java @@ -243,17 +243,18 @@ public class ObjectDirectoryTest extends RepositoryTestCase { db.getConfig().setBoolean(ConfigConstants.CONFIG_GC_SECTION, null, ConfigConstants.CONFIG_KEY_WRITE_COMMIT_GRAPH, true); - WindowCursor curs = new WindowCursor(db.getObjectDatabase()); - assertTrue(curs.getCommitGraph().isEmpty()); - commitFile("file.txt", "content", "master"); - GC gc = new GC(db); - gc.gc().get(); - assertTrue(curs.getCommitGraph().isPresent()); + try (WindowCursor curs = new WindowCursor(db.getObjectDatabase())) { + assertTrue(curs.getCommitGraph().isEmpty()); + commitFile("file.txt", "content", "master"); + GC gc = new GC(db); + gc.gc().get(); + assertTrue(curs.getCommitGraph().isPresent()); - db.getConfig().setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, - ConfigConstants.CONFIG_COMMIT_GRAPH, false); + db.getConfig().setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_COMMIT_GRAPH, false); - assertTrue(curs.getCommitGraph().isEmpty()); + assertTrue(curs.getCommitGraph().isEmpty()); + } } @Test -- cgit v1.2.3 From be33cd40b2dcae1aaee0d9adec9148e5783f2dba Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 28 Aug 2024 17:15:19 +0200 Subject: Remove unused API warning filters Change-Id: If5cfd8963db0699669be3594e844e14d38f97943 --- org.eclipse.jgit/.settings/.api_filters | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 org.eclipse.jgit/.settings/.api_filters diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters deleted file mode 100644 index 50a04d20f0..0000000000 --- a/org.eclipse.jgit/.settings/.api_filters +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From cef6e8a9affcdea0b2f628d1a5d94365ac528e2b Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 29 Aug 2024 15:13:47 -0700 Subject: ObjectId: Add method to read an ObjectId from a ByteBuffer Some storages return data in a convenient ByteBuffer wrapper, but there is no straigh-forward method to read ObjectIds from it. Add ObjectId#fromRaw(ByteBuffer) to read object ids from byte buffers. Change-Id: Ia3b244005e4d9a613294f5ad9dab3b8e7bc3d7df --- .../tst/org/eclipse/jgit/lib/ObjectIdTest.java | 13 +++++++++++++ org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java | 17 +++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectIdTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectIdTest.java index 21032c341f..d6f0b038d2 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectIdTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ObjectIdTest.java @@ -16,6 +16,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.nio.ByteBuffer; import java.util.Locale; import org.eclipse.jgit.errors.InvalidObjectIdException; @@ -153,4 +154,16 @@ public class ObjectIdTest { assertEquals(ObjectId.fromRaw(exp).name(), id.name()); } } + + @Test + public void test_toFromByteBuffer_raw() { + ObjectId oid = ObjectId + .fromString("ff00eedd003713bb1bb26b808ec9312548e73946"); + ByteBuffer anObject = ByteBuffer.allocate(Constants.OBJECT_ID_LENGTH); + oid.copyRawTo(anObject); + anObject.flip(); + + ObjectId actual = ObjectId.fromRaw(anObject); + assertEquals(oid.name(), actual.name()); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java index 1c31263e33..1b455b974d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ObjectId.java @@ -15,6 +15,7 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.Serializable; +import java.nio.ByteBuffer; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.InvalidObjectIdException; @@ -151,6 +152,22 @@ public class ObjectId extends AnyObjectId implements Serializable { return new ObjectId(a, b, c, d, e); } + /** + * Convert an ObjectId from raw binary representation + * + * @param bb + * a bytebuffer with the objectid encoded as 5 consecutive ints. + * This is the reverse of {@link ObjectId#copyRawTo(ByteBuffer)} + * + * @return the converted object id. + * + * @since 7.0 + */ + public static final ObjectId fromRaw(ByteBuffer bb) { + return new ObjectId(bb.getInt(), bb.getInt(), bb.getInt(), bb.getInt(), + bb.getInt()); + } + /** * Convert an ObjectId from raw binary representation. * -- cgit v1.2.3 From ff1592ef7b406d096b2fd822745a9a29d7831ef5 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 29 Aug 2024 15:40:49 -0700 Subject: UploadPack: Remove @Deprecated classes and methods The coming 7.0 release is a chance to clean up these deprecated classes and methods. Change-Id: I23d263c9244c1e0096eb7c96c290213c9e668a03 --- .../src/org/eclipse/jgit/transport/UploadPack.java | 61 +--------------------- 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 9318871520..ec51c885c6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -30,11 +30,11 @@ import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_MULTI_ACK_D import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_NO_DONE; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_NO_PROGRESS; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_OFS_DELTA; +import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SESSION_ID; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SHALLOW; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDEBAND_ALL; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SIDE_BAND_64K; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_SESSION_ID; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_THIN_PACK; import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_WAIT_FOR_DONE; import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_ACK; @@ -80,7 +80,6 @@ import org.eclipse.jgit.errors.PackProtocolException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.CachedPackUriProvider; import org.eclipse.jgit.internal.storage.pack.PackWriter; -import org.eclipse.jgit.internal.transport.parser.FirstWant; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; @@ -172,52 +171,6 @@ public class UploadPack implements Closeable { throws PackProtocolException, IOException; } - /** - * Data in the first line of a want-list, the line itself plus options. - * - * @deprecated Use {@link FirstWant} instead - */ - @Deprecated - public static class FirstLine { - - private final FirstWant firstWant; - - /** - * @param line - * line from the client. - */ - public FirstLine(String line) { - try { - firstWant = FirstWant.fromLine(line); - } catch (PackProtocolException e) { - throw new UncheckedIOException(e); - } - } - - /** - * Get non-capabilities part of the line - * - * @return non-capabilities part of the line. - */ - public String getLine() { - return firstWant.getLine(); - } - - /** - * Get capabilities parsed from the line - * - * @return capabilities parsed from the line. - */ - public Set getOptions() { - if (firstWant.getAgent() != null) { - Set caps = new HashSet<>(firstWant.getCapabilities()); - caps.add(OPTION_AGENT + '=' + firstWant.getAgent()); - return caps; - } - return firstWant.getCapabilities(); - } - } - /* * {@link java.util.function.Consumer} doesn't allow throwing checked * exceptions. Define our own to propagate IOExceptions. @@ -1692,18 +1645,6 @@ public class UploadPack implements Closeable { return currentRequest.getDepth(); } - /** - * Deprecated synonym for {@code getFilterSpec().getBlobLimit()}. - * - * @return filter blob limit requested by the client, or -1 if no limit - * @since 5.3 - * @deprecated Use {@link #getFilterSpec()} instead - */ - @Deprecated - public final long getFilterBlobLimit() { - return getFilterSpec().getBlobLimit(); - } - /** * Returns the filter spec for the current request. Valid only after * calling recvWants(). This may be a no-op filter spec, but it won't be -- cgit v1.2.3 From 8438808f9d98c90fcae10567405ade34d38319cf Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 29 Aug 2024 15:43:22 -0700 Subject: ReachabilityChecker: Remove @Deprecated method Cleaning up before 7.0 release. Change-Id: I620c3a485785b3d1efc950317fe552b8465a479e --- .../eclipse/jgit/revwalk/ReachabilityChecker.java | 34 ---------------------- 1 file changed, 34 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ReachabilityChecker.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ReachabilityChecker.java index 1a869a0703..5afb669a15 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ReachabilityChecker.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ReachabilityChecker.java @@ -26,40 +26,6 @@ import org.eclipse.jgit.errors.MissingObjectException; * @since 5.4 */ public interface ReachabilityChecker { - - /** - * Check if all targets are reachable from the {@code starters} commits. - *

- * Caller should parse the objectIds (preferably with - * {@code walk.parseCommit()} and handle missing/incorrect type objects - * before calling this method. - * - * @param targets - * commits to reach. - * @param starters - * known starting points. - * @return An unreachable target if at least one of the targets is - * unreachable. An empty optional if all targets are reachable from - * the starters. - * - * @throws MissingObjectException - * if any of the incoming objects doesn't exist in the - * repository. - * @throws IncorrectObjectTypeException - * if any of the incoming objects is not a commit or a tag. - * @throws IOException - * if any of the underlying indexes or readers can not be - * opened. - * - * @deprecated see {{@link #areAllReachable(Collection, Stream)} - */ - @Deprecated - default Optional areAllReachable(Collection targets, - Collection starters) throws MissingObjectException, - IncorrectObjectTypeException, IOException { - return areAllReachable(targets, starters.stream()); - } - /** * Check if all targets are reachable from the {@code starters} commits. *

-- cgit v1.2.3 From e5cc3151aea90d9af958c260fcb9a7a3cfc2ca6d Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 29 Aug 2024 15:45:15 -0700 Subject: RepoCommand.RemoteReader: Remove @Deprecated method Cleaning up before 7.0 release. Change-Id: I83db715a8170a54957dd5bcf38df5b0911a12107 --- .../src/org/eclipse/jgit/gitrepo/RepoCommand.java | 26 ---------------------- 1 file changed, 26 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java index 9979664ceb..c80a58a7c8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/gitrepo/RepoCommand.java @@ -110,32 +110,6 @@ public class RepoCommand extends GitCommand { @Nullable public ObjectId sha1(String uri, String ref) throws GitAPIException; - /** - * Read a file from a remote repository. - * - * @param uri - * The URI of the remote repository - * @param ref - * The ref (branch/tag/etc.) to read - * @param path - * The relative path (inside the repo) to the file to read - * @return the file content. - * @throws GitAPIException - * If the ref have an invalid or ambiguous name, or it does - * not exist in the repository, - * @throws IOException - * If the object does not exist or is too large - * @since 3.5 - * - * @deprecated Use {@link #readFileWithMode(String, String, String)} - * instead - */ - @Deprecated - public default byte[] readFile(String uri, String ref, String path) - throws GitAPIException, IOException { - return readFileWithMode(uri, ref, path).getContents(); - } - /** * Read contents and mode (i.e. permissions) of the file from a remote * repository. -- cgit v1.2.3 From 45e28716cbef951301a917f2a4019cc7c8ac041c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 29 Aug 2024 15:47:15 -0700 Subject: walks: Remove deprecated #createReachabilityChecker() method Change-Id: If9375ac49fa82e988e0708d89f0f929495e6e7cc --- .../src/org/eclipse/jgit/revwalk/ObjectWalk.java | 23 ---------------------- .../src/org/eclipse/jgit/revwalk/RevWalk.java | 19 +----------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java index 385f073a77..7c763bc9b8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/ObjectWalk.java @@ -163,29 +163,6 @@ public class ObjectWalk extends RevWalk { pathBuf = new byte[256]; } - /** - * Create an object reachability checker that will use bitmaps if possible. - * - * This reachability checker accepts any object as target. For checks - * exclusively between commits, see - * {@link RevWalk#createReachabilityChecker()}. - * - * @return an object reachability checker, using bitmaps if possible. - * - * @throws IOException - * when the index fails to load. - * - * @since 5.8 - * @deprecated use - * {@code ObjectReader#createObjectReachabilityChecker(ObjectWalk)} - * instead. - */ - @Deprecated - public final ObjectReachabilityChecker createObjectReachabilityChecker() - throws IOException { - return reader.createObjectReachabilityChecker(this); - } - /** * Mark an object or commit to start graph traversal from. *

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index 76c14e9c26..9f0e28d0ce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -31,9 +31,9 @@ import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.RevWalkException; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.AsyncObjectLoaderQueue; -import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.MutableObjectId; import org.eclipse.jgit.lib.NullProgressMonitor; @@ -278,23 +278,6 @@ public class RevWalk implements Iterable, AutoCloseable { return reader; } - /** - * Get a reachability checker for commits over this revwalk. - * - * @return the most efficient reachability checker for this repository. - * @throws IOException - * if it cannot open any of the underlying indices. - * - * @since 5.4 - * @deprecated use {@code ObjectReader#createReachabilityChecker(RevWalk)} - * instead. - */ - @Deprecated - public final ReachabilityChecker createReachabilityChecker() - throws IOException { - return reader.createReachabilityChecker(this); - } - /** * {@inheritDoc} *

-- cgit v1.2.3 From 3682611cef41ade46cf5ac194f0674b46367a395 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:32:30 +0200 Subject: Remove deprecated LocalDiskRepositoryTestCase#create(boolean,boolean) Change-Id: I9eff2d405b5302753ff2ec1d0eab431bdba69fe0 --- .../jgit/junit/LocalDiskRepositoryTestCase.java | 23 +--------------------- .../org/eclipse/jgit/lib/RepositoryCacheTest.java | 13 +++++------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java index 407290a399..98f69ed31c 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java @@ -422,32 +422,11 @@ public abstract class LocalDiskRepositoryTestCase { */ protected FileRepository createRepository(boolean bare) throws IOException { - return createRepository(bare, false /* auto close */); - } - - /** - * Creates a new empty repository. - * - * @param bare - * true to create a bare repository; false to make a repository - * within its working directory - * @param autoClose - * auto close the repository in {@link #tearDown()} - * @return the newly created repository, opened for access - * @throws IOException - * the repository could not be created in the temporary area - * @deprecated use {@link #createRepository(boolean)} instead - */ - @Deprecated - public FileRepository createRepository(boolean bare, boolean autoClose) - throws IOException { File gitdir = createUniqueTestGitDir(bare); FileRepository db = new FileRepository(gitdir); assertFalse(gitdir.exists()); db.create(bare); - if (autoClose) { - addRepoToClose(db); - } + addRepoToClose(db); return db; } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryCacheTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryCacheTest.java index cec69c4998..2a6551787f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryCacheTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryCacheTest.java @@ -159,8 +159,8 @@ public class RepositoryCacheTest extends RepositoryTestCase { @Test public void testRepositoryUsageCountWithRegisteredRepository() throws IOException { - @SuppressWarnings({"resource", "deprecation"}) // We are testing the close() method - Repository repo = createRepository(false, false); + @SuppressWarnings("resource") // We are testing the close() method + Repository repo = createRepository(false); assertEquals(1, repo.useCnt.get()); RepositoryCache.register(repo); assertEquals(1, repo.useCnt.get()); @@ -207,10 +207,8 @@ public class RepositoryCacheTest extends RepositoryTestCase { @Test public void testRepositoryUnregisteringWhenExpired() throws Exception { - @SuppressWarnings({"resource", "deprecation"}) // We are testing the close() method - Repository repoA = createRepository(true, false); - @SuppressWarnings({"resource", "deprecation"}) // We are testing the close() method - Repository repoB = createRepository(true, false); + Repository repoA = createRepository(true); + Repository repoB = createRepository(true); Repository repoC = createBareRepository(); RepositoryCache.register(repoA); RepositoryCache.register(repoB); @@ -243,8 +241,7 @@ public class RepositoryCacheTest extends RepositoryTestCase { @Test public void testReconfigure() throws InterruptedException, IOException { - @SuppressWarnings({"resource", "deprecation"}) // We are testing the close() method - Repository repo = createRepository(false, false); + Repository repo = createRepository(false); RepositoryCache.register(repo); assertTrue(RepositoryCache.isCached(repo)); repo.close(); -- cgit v1.2.3 From 6007aee36e11a58793a603c4451ba12a3ddfdb2d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:37:04 +0200 Subject: Remove deprecated static AnyLongObjectId#equals method Change-Id: Ie67b9a4a5e1972ec3aebf50e058a9aabf5a20099 --- .../org/eclipse/jgit/lfs/lib/AnyLongObjectId.java | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java index 75d500ef20..a13a60c2b8 100644 --- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java +++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/lib/AnyLongObjectId.java @@ -33,24 +33,6 @@ import org.eclipse.jgit.util.References; */ public abstract class AnyLongObjectId implements Comparable { - /** - * Compare two object identifier byte sequences for equality. - * - * @param firstObjectId - * the first identifier to compare. Must not be null. - * @param secondObjectId - * the second identifier to compare. Must not be null. - * @return true if the two identifiers are the same. - * @deprecated use {@link #isEqual(AnyLongObjectId, AnyLongObjectId)} - * instead. - */ - @Deprecated - @SuppressWarnings("AmbiguousMethodReference") - public static boolean equals(final AnyLongObjectId firstObjectId, - final AnyLongObjectId secondObjectId) { - return isEqual(firstObjectId, secondObjectId); - } - /** * Compare two object identifier byte sequences for equality. * @@ -263,7 +245,7 @@ public abstract class AnyLongObjectId implements Comparable { */ @SuppressWarnings({ "NonOverridingEquals", "AmbiguousMethodReference" }) public final boolean equals(AnyLongObjectId other) { - return other != null ? equals(this, other) : false; + return other != null ? isEqual(this, other) : false; } @Override -- cgit v1.2.3 From 22f7beaf2b554e497dcec3198272b528654d5547 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:38:55 +0200 Subject: Remove deprecated CheckoutCommand#setForce method Change-Id: I39cfbeba0171c66e0f03b7b3785313da55b1dcac --- .../src/org/eclipse/jgit/api/CheckoutCommand.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java index c133219d4d..32c242f271 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java @@ -641,24 +641,6 @@ public class CheckoutCommand extends GitCommand { return this; } - /** - * Specify to force the ref update in case of a branch switch. - * - * @param force - * if true and the branch with the given name - * already exists, the start-point of an existing branch will be - * set to a new start-point; if false, the existing branch will - * not be changed - * @return this instance - * @deprecated this method was badly named comparing its semantics to native - * git's checkout --force option, use - * {@link #setForceRefUpdate(boolean)} instead - */ - @Deprecated - public CheckoutCommand setForce(boolean force) { - return setForceRefUpdate(force); - } - /** * Specify to force the ref update in case of a branch switch. * -- cgit v1.2.3 From 0757ca6bfab80a20d3b832f66ed9a7b359d0d915 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:38:55 +0200 Subject: Remove deprecated CheckoutCommand#setForce method Change-Id: Ie0b59ec21fc8dbe18242bbb52cb794e5a02c1ed5 --- .../src/org/eclipse/jgit/api/CheckoutCommand.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java index c133219d4d..32c242f271 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CheckoutCommand.java @@ -641,24 +641,6 @@ public class CheckoutCommand extends GitCommand { return this; } - /** - * Specify to force the ref update in case of a branch switch. - * - * @param force - * if true and the branch with the given name - * already exists, the start-point of an existing branch will be - * set to a new start-point; if false, the existing branch will - * not be changed - * @return this instance - * @deprecated this method was badly named comparing its semantics to native - * git's checkout --force option, use - * {@link #setForceRefUpdate(boolean)} instead - */ - @Deprecated - public CheckoutCommand setForce(boolean force) { - return setForceRefUpdate(force); - } - /** * Specify to force the ref update in case of a branch switch. * -- cgit v1.2.3 From 373fbb4882f7d415c95dad23aba9e01ef2d3da9f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:40:21 +0200 Subject: Remove deprecated RemoteRemoveCommand#setName method Change-Id: I2bd2a213b4642283b11f787ffcbab29916e2c5e7 --- .../src/org/eclipse/jgit/api/RemoteRemoveCommand.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteRemoveCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteRemoveCommand.java index 553fc2e7a0..ad553f07a9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteRemoveCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteRemoveCommand.java @@ -46,18 +46,6 @@ public class RemoteRemoveCommand extends GitCommand { super(repo); } - /** - * The name of the remote to remove. - * - * @param name - * a remote name - * @deprecated use {@link #setRemoteName} instead - */ - @Deprecated - public void setName(String name) { - this.remoteName = name; - } - /** * The name of the remote to remove. * -- cgit v1.2.3 From 30274153eaeeaeb7639810114219d05a3a1cc267 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:41:15 +0200 Subject: Remove deprecated RemoteSetUrlCommand#setName method Change-Id: I769e999b5990f83719e3c638da9dfd0be4c5b826 --- .../src/org/eclipse/jgit/api/RemoteSetUrlCommand.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java index e3d01861fc..281e81026b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java @@ -68,18 +68,6 @@ public class RemoteSetUrlCommand extends GitCommand { super(repo); } - /** - * The name of the remote to change the URL for. - * - * @param name - * a remote name - * @deprecated use {@link #setRemoteName} instead - */ - @Deprecated - public void setName(String name) { - this.remoteName = name; - } - /** * The name of the remote to change the URL for. * -- cgit v1.2.3 From b4243e4317982bd7c6ac23f32f46353522cdcd57 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:42:59 +0200 Subject: Remove deprecated RemoteSetUrlCommand#setPush method Change-Id: I4026531148a7560179dae89c05424f256e6600d2 --- .../src/org/eclipse/jgit/api/RemoteSetUrlCommand.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java index 281e81026b..b09742cba9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java @@ -106,23 +106,6 @@ public class RemoteSetUrlCommand extends GitCommand { return this; } - /** - * Whether to change the push URL of the remote instead of the fetch URL. - * - * @param push - * true to set the push url, false to - * set the fetch url - * @deprecated use {@link #setUriType} instead - */ - @Deprecated - public void setPush(boolean push) { - if (push) { - setUriType(UriType.PUSH); - } else { - setUriType(UriType.FETCH); - } - } - /** * Whether to change the push URL of the remote instead of the fetch URL. * -- cgit v1.2.3 From 8c81cfc9c5718b79c3af47517780952c62200d0c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:44:16 +0200 Subject: Remove deprecated RemoteSetUrlCommand#setUri method Change-Id: Ib9041be0d88dd837aa68eda2b00f3aa9ebc54c27 --- .../src/org/eclipse/jgit/api/RemoteSetUrlCommand.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java index b09742cba9..68ddce361f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RemoteSetUrlCommand.java @@ -81,18 +81,6 @@ public class RemoteSetUrlCommand extends GitCommand { return this; } - /** - * The new URL for the remote. - * - * @param uri - * an URL for the remote - * @deprecated use {@link #setRemoteUri} instead - */ - @Deprecated - public void setUri(URIish uri) { - this.remoteUri = uri; - } - /** * The new URL for the remote. * -- cgit v1.2.3 From ee02be9c8a59d85d04b8a3d6573e26f0e3ad5a85 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:45:34 +0200 Subject: Remove deprecated StashApplyCommand#setApplyIndex method Change-Id: I2183285f6ccba1b62a318e711f2451df5d083ca1 --- .../src/org/eclipse/jgit/api/StashApplyCommand.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java index e4157286f1..1eac1ecd83 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java @@ -260,18 +260,6 @@ public class StashApplyCommand extends GitCommand { } } - /** - * Whether to restore the index state - * - * @param applyIndex - * true (default) if the command should restore the index state - * @deprecated use {@link #setRestoreIndex} instead - */ - @Deprecated - public void setApplyIndex(boolean applyIndex) { - this.restoreIndex = applyIndex; - } - /** * Whether to restore the index state * -- cgit v1.2.3 From 724626a9cc183ca3c80852c25c272d9c837a2ac5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 16:46:26 +0200 Subject: Remove deprecated StashApplyCommand#setApplyUntracked method Change-Id: I23e3ed3259edad3a22b59cca938f041b39ebf0cb --- .../src/org/eclipse/jgit/api/StashApplyCommand.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java index 1eac1ecd83..b0b715e06b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashApplyCommand.java @@ -304,19 +304,6 @@ public class StashApplyCommand extends GitCommand { return this; } - /** - * Whether the command should restore untracked files - * - * @param applyUntracked - * true (default) if the command should restore untracked files - * @since 3.4 - * @deprecated use {@link #setRestoreUntracked} instead - */ - @Deprecated - public void setApplyUntracked(boolean applyUntracked) { - this.restoreUntracked = applyUntracked; - } - /** * Whether the command should restore untracked files * -- cgit v1.2.3 From a00b7c392922952122033fafb18d28556991423b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:07:01 +0200 Subject: Remove deprecated DirCacheCheckout#checkoutEntry methods Change-Id: I28d00d7a70af0fbb76e237dd77b929508720ecdb --- .../jgit/treewalk/FileTreeIteratorTest.java | 11 +- .../eclipse/jgit/dircache/DirCacheCheckout.java | 121 --------------------- 2 files changed, 7 insertions(+), 125 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java index e463e9070a..7b9e70d4da 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/FileTreeIteratorTest.java @@ -25,8 +25,9 @@ import java.time.Instant; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.ResetCommand.ResetType; +import org.eclipse.jgit.dircache.Checkout; import org.eclipse.jgit.dircache.DirCache; -import org.eclipse.jgit.dircache.DirCacheCheckout; +import org.eclipse.jgit.dircache.DirCacheCheckout.CheckoutMetadata; import org.eclipse.jgit.dircache.DirCacheEditor; import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; import org.eclipse.jgit.dircache.DirCacheEntry; @@ -38,6 +39,7 @@ import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.CoreConfig.EolStreamType; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; @@ -303,11 +305,12 @@ public class FileTreeIteratorTest extends RepositoryTestCase { DirCacheEntry dce = db.readDirCache().getEntry("symlink"); dce.setFileMode(FileMode.SYMLINK); try (ObjectReader objectReader = db.newObjectReader()) { + Checkout checkout = new Checkout(db).setRecursiveDeletion(false); + checkout.checkout(dce, + new CheckoutMetadata(EolStreamType.DIRECT, null), + objectReader, null); WorkingTreeOptions options = db.getConfig() .get(WorkingTreeOptions.KEY); - DirCacheCheckout.checkoutEntry(db, dce, objectReader, false, null, - options); - FileTreeIterator fti = new FileTreeIterator(trash, db.getFS(), options); while (!fti.getEntryPathString().equals("symlink")) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index fa0a82fd58..4f78404f48 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -1400,127 +1400,6 @@ public class DirCacheCheckout { } } - /** - * Updates the file in the working tree with content and mode from an entry - * in the index. The new content is first written to a new temporary file in - * the same directory as the real file. Then that new file is renamed to the - * final filename. - * - *

- * Note: if the entry path on local file system exists as a non-empty - * directory, and the target entry type is a link or file, the checkout will - * fail with {@link java.io.IOException} since existing non-empty directory - * cannot be renamed to file or link without deleting it recursively. - *

- * - * @param repo - * repository managing the destination work tree. - * @param entry - * the entry containing new mode and content - * @param or - * object reader to use for checkout - * @throws java.io.IOException - * if an IO error occurred - * @since 3.6 - * @deprecated since 5.1, use - * {@link #checkoutEntry(Repository, DirCacheEntry, ObjectReader, boolean, CheckoutMetadata, WorkingTreeOptions)} - * instead - */ - @Deprecated - public static void checkoutEntry(Repository repo, DirCacheEntry entry, - ObjectReader or) throws IOException { - checkoutEntry(repo, entry, or, false, null, null); - } - - - /** - * Updates the file in the working tree with content and mode from an entry - * in the index. The new content is first written to a new temporary file in - * the same directory as the real file. Then that new file is renamed to the - * final filename. - * - *

- * Note: if the entry path on local file system exists as a file, it - * will be deleted and if it exists as a directory, it will be deleted - * recursively, independently if has any content. - *

- * - * @param repo - * repository managing the destination work tree. - * @param entry - * the entry containing new mode and content - * @param or - * object reader to use for checkout - * @param deleteRecursive - * true to recursively delete final path if it exists on the file - * system - * @param checkoutMetadata - * containing - *
    - *
  • smudgeFilterCommand to be run for smudging the entry to be - * checked out
    • - *
  • eolStreamType used for stream conversion
    • - *
- * @throws java.io.IOException - * if an IO error occurred - * @since 4.2 - * @deprecated since 6.3, use - * {@link #checkoutEntry(Repository, DirCacheEntry, ObjectReader, boolean, CheckoutMetadata, WorkingTreeOptions)} - * instead - */ - @Deprecated - public static void checkoutEntry(Repository repo, DirCacheEntry entry, - ObjectReader or, boolean deleteRecursive, - CheckoutMetadata checkoutMetadata) throws IOException { - checkoutEntry(repo, entry, or, deleteRecursive, checkoutMetadata, null); - } - - /** - * Updates the file in the working tree with content and mode from an entry - * in the index. The new content is first written to a new temporary file in - * the same directory as the real file. Then that new file is renamed to the - * final filename. - * - *

- * Note: if the entry path on local file system exists as a file, it - * will be deleted and if it exists as a directory, it will be deleted - * recursively, independently if has any content. - *

- * - * @param repo - * repository managing the destination work tree. - * @param entry - * the entry containing new mode and content - * @param or - * object reader to use for checkout - * @param deleteRecursive - * true to recursively delete final path if it exists on the file - * system - * @param checkoutMetadata - * containing - *
    - *
  • smudgeFilterCommand to be run for smudging the entry to be - * checked out
    • - *
  • eolStreamType used for stream conversion
    • - *
- * @param options - * {@link WorkingTreeOptions} that are effective; if {@code null} - * they are loaded from the repository config - * @throws java.io.IOException - * if an IO error occurred - * @since 6.3 - * @deprecated since 6.6.1; use {@link Checkout} instead - */ - @Deprecated - public static void checkoutEntry(Repository repo, DirCacheEntry entry, - ObjectReader or, boolean deleteRecursive, - CheckoutMetadata checkoutMetadata, WorkingTreeOptions options) - throws IOException { - Checkout checkout = new Checkout(repo, options) - .setRecursiveDeletion(deleteRecursive); - checkout.checkout(entry, checkoutMetadata, or, null); - } - /** * Return filtered content for a specific object (blob). EOL handling and * smudge-filter handling are applied in the same way as it would be done -- cgit v1.2.3 From f1a4afe37ac95b76a6fda5d86e330f633f681579 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:10:33 +0200 Subject: DirCacheEntry: remove deprecated methods - boolean mightBeRacilyClean(int, int) - long getLastModified() - void setLastModified(long) Change-Id: I428fbb2109e13e80b8655622531c10e55a922a6f --- .../org/eclipse/jgit/dircache/DirCacheEntry.java | 50 ---------------------- 1 file changed, 50 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java index c5e1e4e765..5a22938694 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheEntry.java @@ -386,28 +386,6 @@ public class DirCacheEntry { } } - /** - * Is it possible for this entry to be accidentally assumed clean? - *

- * The "racy git" problem happens when a work file can be updated faster - * than the filesystem records file modification timestamps. It is possible - * for an application to edit a work file, update the index, then edit it - * again before the filesystem will give the work file a new modification - * timestamp. This method tests to see if file was written out at the same - * time as the index. - * - * @param smudge_s - * seconds component of the index's last modified time. - * @param smudge_ns - * nanoseconds component of the index's last modified time. - * @return true if extra careful checks should be used. - * @deprecated use {@link #mightBeRacilyClean(Instant)} instead - */ - @Deprecated - public final boolean mightBeRacilyClean(int smudge_s, int smudge_ns) { - return mightBeRacilyClean(Instant.ofEpochSecond(smudge_s, smudge_ns)); - } - /** * Is it possible for this entry to be accidentally assumed clean? *

@@ -652,22 +630,6 @@ public class DirCacheEntry { encodeTS(P_CTIME, when); } - /** - * Get the cached last modification date of this file, in milliseconds. - *

- * One of the indicators that the file has been modified by an application - * changing the working tree is if the last modification time for the file - * differs from the time stored in this entry. - * - * @return last modification time of this file, in milliseconds since the - * Java epoch (midnight Jan 1, 1970 UTC). - * @deprecated use {@link #getLastModifiedInstant()} instead - */ - @Deprecated - public long getLastModified() { - return decodeTS(P_MTIME); - } - /** * Get the cached last modification date of this file. *

@@ -682,18 +644,6 @@ public class DirCacheEntry { return decodeTSInstant(P_MTIME); } - /** - * Set the cached last modification date of this file, using milliseconds. - * - * @param when - * new cached modification date of the file, in milliseconds. - * @deprecated use {@link #setLastModified(Instant)} instead - */ - @Deprecated - public void setLastModified(long when) { - encodeTS(P_MTIME, when); - } - /** * Set the cached last modification date of this file. * -- cgit v1.2.3 From 3c8b60b081551a1afb74b3d05e1375eb34443abd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:11:34 +0200 Subject: Remove deprecated PackInvalidException constructors Change-Id: I8db6b1dd8e39811ebde676389833dbc906106452 --- .../eclipse/jgit/errors/PackInvalidException.java | 24 ---------------------- 1 file changed, 24 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java index 1fd80867b9..38982fdf23 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/PackInvalidException.java @@ -22,18 +22,6 @@ import org.eclipse.jgit.internal.JGitText; public class PackInvalidException extends IOException { private static final long serialVersionUID = 1L; - /** - * Construct a pack invalid error. - * - * @param path - * path of the invalid pack file. - * @deprecated Use {@link #PackInvalidException(File, Throwable)}. - */ - @Deprecated - public PackInvalidException(File path) { - this(path, null); - } - /** * Construct a pack invalid error with cause. * @@ -47,18 +35,6 @@ public class PackInvalidException extends IOException { this(path.getAbsolutePath(), cause); } - /** - * Construct a pack invalid error. - * - * @param path - * path of the invalid pack file. - * @deprecated Use {@link #PackInvalidException(String, Throwable)}. - */ - @Deprecated - public PackInvalidException(String path) { - this(path, null); - } - /** * Construct a pack invalid error with cause. * -- cgit v1.2.3 From 65bc6e4f055d1522476b2ca2da1613a39341bf0e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:16:24 +0200 Subject: Remove deprecated lastModified accessors returning long - FileSnapshot#lastModified - LockFile#getCommmitLastModified Change-Id: I6962166ca5decbb332dfb25851c93debfe2ca90c --- .../org/eclipse/jgit/internal/storage/file/FileSnapshot.java | 11 ----------- .../src/org/eclipse/jgit/internal/storage/file/LockFile.java | 11 ----------- 2 files changed, 22 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index c88ac984ec..8701a1291b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java @@ -278,17 +278,6 @@ public class FileSnapshot { this.fileKey = fileKey; } - /** - * Get time of last snapshot update - * - * @return time of last snapshot update - * @deprecated use {@link #lastModifiedInstant()} instead - */ - @Deprecated - public long lastModified() { - return lastModified.toEpochMilli(); - } - /** * Get time of last snapshot update * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java index 1983541e4a..9e12ee8a0c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LockFile.java @@ -524,17 +524,6 @@ public class LockFile { } } - /** - * Get the modification time of the output file when it was committed. - * - * @return modification time of the lock file right before we committed it. - * @deprecated use {@link #getCommitLastModifiedInstant()} instead - */ - @Deprecated - public long getCommitLastModified() { - return commitSnapshot.lastModified(); - } - /** * Get the modification time of the output file when it was committed. * -- cgit v1.2.3 From ec97acb808f0685ca3e09389301bf1d3c606f607 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:17:29 +0200 Subject: Remove deprecated FileSnapshot.save(long) method Change-Id: I9b77142127cc96ee6658e85a6cf0586d941c5c0c --- .../jgit/internal/storage/file/FileSnapshot.java | 23 ---------------------- 1 file changed, 23 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index 8701a1291b..c4fa3eeb99 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java @@ -125,29 +125,6 @@ public class FileSnapshot { return fileKey == null ? MISSING_FILEKEY : fileKey; } - /** - * Record a snapshot for a file for which the last modification time is - * already known. - *

- * This method should be invoked before the file is accessed. - *

- * Note that this method cannot rely on measuring file timestamp resolution - * to avoid racy git issues caused by finite file timestamp resolution since - * it's unknown in which filesystem the file is located. Hence the worst - * case fallback for timestamp resolution is used. - * - * @param modified - * the last modification time of the file - * @return the snapshot. - * @deprecated use {@link #save(Instant)} instead. - */ - @Deprecated - public static FileSnapshot save(long modified) { - final Instant read = Instant.now(); - return new FileSnapshot(read, Instant.ofEpochMilli(modified), - UNKNOWN_SIZE, FALLBACK_TIMESTAMP_RESOLUTION, MISSING_FILEKEY); - } - /** * Record a snapshot for a file for which the last modification time is * already known. -- cgit v1.2.3 From 63348b21dbfdc002e48c92a4274576e8d1b85f1c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:21:51 +0200 Subject: Remove deprecated static #equals(AnyObjectId, AnyObjectId) method Change-Id: I72544d2b3c85b8f96c2b8f94b86fb9b362f09475 --- .../src/org/eclipse/jgit/lib/AnyObjectId.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java index c58133adab..f742e993a0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java @@ -27,23 +27,6 @@ import org.eclipse.jgit.util.References; */ public abstract class AnyObjectId implements Comparable { - /** - * Compare two object identifier byte sequences for equality. - * - * @param firstObjectId - * the first identifier to compare. Must not be null. - * @param secondObjectId - * the second identifier to compare. Must not be null. - * @return true if the two identifiers are the same. - * @deprecated use {@link #isEqual(AnyObjectId, AnyObjectId)} instead - */ - @Deprecated - @SuppressWarnings("AmbiguousMethodReference") - public static boolean equals(final AnyObjectId firstObjectId, - final AnyObjectId secondObjectId) { - return isEqual(firstObjectId, secondObjectId); - } - /** * Compare two object identifier byte sequences for equality. * -- cgit v1.2.3 From 7650a68ad6419edbdd7018102f47a68342551e1b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:23:02 +0200 Subject: Remove deprecated CommitBuilder#setEncoding(String) method Change-Id: I5bd8d0c292151bfa58325d51ef51928715871cf1 --- .../src/org/eclipse/jgit/lib/CommitBuilder.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java index ea33082229..ad3c2c091d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitBuilder.java @@ -194,19 +194,6 @@ public class CommitBuilder extends ObjectBuilder { } } - /** - * Set the encoding for the commit information. - * - * @param encodingName - * the encoding name. See - * {@link java.nio.charset.Charset#forName(String)}. - * @deprecated use {@link #setEncoding(Charset)} instead. - */ - @Deprecated - public void setEncoding(String encodingName) { - setEncoding(Charset.forName(encodingName)); - } - @Override public byte[] build() throws UnsupportedEncodingException { ByteArrayOutputStream os = new ByteArrayOutputStream(); -- cgit v1.2.3 From 3585035a71ff5eba66aba792dbbffb5bcb4690e0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:24:00 +0200 Subject: Remove deprecated ConfigConstants#CONFIG_KEY_STREAM_FILE_TRESHOLD Change-Id: I3521ba8f8456160bd18ccb22c7d4a131aaac4ff2 --- org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 4be0cceedc..acb54d7405 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -358,12 +358,6 @@ public final class ConfigConstants { */ public static final String CONFIG_KEY_STREAM_FILE_THRESHOLD = "streamFileThreshold"; - /** - * @deprecated typo, use CONFIG_KEY_STREAM_FILE_THRESHOLD instead - */ - @Deprecated(since = "6.8") - public static final String CONFIG_KEY_STREAM_FILE_TRESHOLD = CONFIG_KEY_STREAM_FILE_THRESHOLD; - /** * The "packedGitMmap" key * @since 5.1.13 -- cgit v1.2.3 From 16f8db059adb87d0544d17e3deb58886ed41adb5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:28:57 +0200 Subject: Constants: remove deprecated #CHARSET and #CHARACTER_ENCODING Change-Id: If2d3c1a96560e0bc5e352bdbcab4c191cbed1a42 --- .../src/org/eclipse/jgit/lib/Constants.java | 24 +--------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 8599bf7dbc..3eb35be79a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -15,7 +15,6 @@ package org.eclipse.jgit.lib; import static java.nio.charset.StandardCharsets.UTF_8; import java.nio.ByteBuffer; -import java.nio.charset.Charset; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.MessageFormat; @@ -203,24 +202,6 @@ public final class Constants { */ public static final byte[] PACK_SIGNATURE = { 'P', 'A', 'C', 'K' }; - /** - * Native character encoding for commit messages, file names... - * - * @deprecated Use {@link java.nio.charset.StandardCharsets#UTF_8} directly - * instead. - */ - @Deprecated - public static final Charset CHARSET; - - /** - * Native character encoding for commit messages, file names... - * - * @deprecated Use {@link java.nio.charset.StandardCharsets#UTF_8} directly - * instead. - */ - @Deprecated - public static final String CHARACTER_ENCODING; - /** Default main branch name */ public static final String MASTER = "master"; @@ -745,13 +726,12 @@ public final class Constants { } /** - * Convert a string to a byte array in the standard character encoding. + * Convert a string to a byte array in the standard character encoding UTF8. * * @param str * the string to convert. May contain any Unicode characters. * @return a byte array representing the requested string, encoded using the * default character encoding (UTF-8). - * @see #CHARACTER_ENCODING */ public static byte[] encode(String str) { final ByteBuffer bb = UTF_8.encode(str); @@ -770,8 +750,6 @@ public final class Constants { static { if (OBJECT_ID_LENGTH != newMessageDigest().getDigestLength()) throw new LinkageError(JGitText.get().incorrectOBJECT_ID_LENGTH); - CHARSET = UTF_8; - CHARACTER_ENCODING = UTF_8.name(); } /** name of the file containing the commit msg for a merge commit */ -- cgit v1.2.3 From 8140ad78d1659355bcf647188ccc7fa47dbf4b33 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:32:04 +0200 Subject: CoreConfig: remove deprecated #isLogAllRefUpdates method Change-Id: I4e5f96696b57512488f48e66a82760b2e8671878 --- .../src/org/eclipse/jgit/lib/CoreConfig.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java index 9fa5d75a3f..49602a75eb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java @@ -163,8 +163,6 @@ public class CoreConfig { private final int packIndexVersion; - private final LogRefUpdates logAllRefUpdates; - private final String excludesfile; private final String attributesfile; @@ -205,9 +203,6 @@ public class CoreConfig { ConfigConstants.CONFIG_KEY_COMPRESSION, DEFAULT_COMPRESSION); packIndexVersion = rc.getInt(ConfigConstants.CONFIG_PACK_SECTION, ConfigConstants.CONFIG_KEY_INDEXVERSION, 2); - logAllRefUpdates = rc.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, - ConfigConstants.CONFIG_KEY_LOGALLREFUPDATES, - LogRefUpdates.TRUE); excludesfile = rc.getString(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_EXCLUDESFILE); attributesfile = rc.getString(ConfigConstants.CONFIG_CORE_SECTION, @@ -235,20 +230,6 @@ public class CoreConfig { return packIndexVersion; } - /** - * Whether to log all refUpdates - * - * @return whether to log all refUpdates - * @deprecated since 5.6; default value depends on whether the repository is - * bare. Use - * {@link Config#getEnum(String, String, String, Enum)} - * directly. - */ - @Deprecated - public boolean isLogAllRefUpdates() { - return !LogRefUpdates.FALSE.equals(logAllRefUpdates); - } - /** * Get path of excludesfile * -- cgit v1.2.3 From db9443d80505bd4b75326ca6a2ef41cc4beb24e4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:33:43 +0200 Subject: Remove deprecated RefDatabase#getRef(String) method Change-Id: I89f42db2b9dabee18d4220457436b9f9b6340f50 --- .../src/org/eclipse/jgit/lib/RefDatabase.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index 9e05a39731..2cf24185c7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -237,23 +237,6 @@ public abstract class RefDatabase { return false; } - /** - * Compatibility synonym for {@link #findRef(String)}. - * - * @param name - * the name of the reference. May be a short name which must be - * searched for using the standard {@link #SEARCH_PATH}. - * @return the reference (if it exists); else {@code null}. - * @throws IOException - * the reference space cannot be accessed. - * @deprecated Use {@link #findRef(String)} instead. - */ - @Deprecated - @Nullable - public final Ref getRef(String name) throws IOException { - return findRef(name); - } - /** * Read a single reference. *

-- cgit v1.2.3 From ac1265a513cb6953ef6ddada61eed2235bff186f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:36:05 +0200 Subject: Make deprecated Repository#peel(Ref) private Change-Id: I1c16196bba00a5d0f54c10261cc08185305ba4a3 --- org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 9dde99fada..b1ecca4b60 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -1164,11 +1164,9 @@ public abstract class Repository implements AutoCloseable { * new Ref object representing the same data as Ref, but isPeeled() * will be true and getPeeledObjectId will contain the peeled object * (or null). - * @deprecated use {@code getRefDatabase().peel(ref)} instead. */ - @Deprecated @NonNull - public Ref peel(Ref ref) { + private Ref peel(Ref ref) { try { return getRefDatabase().peel(ref); } catch (IOException e) { -- cgit v1.2.3 From 925f0d14df661046a257c5035351b17106165765 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:36:58 +0200 Subject: Remove deprecated Repository#hasObject(AnyObjectId) method Change-Id: I473dff6bdc23cfb126d22e18c168390a0e21301d --- .../src/org/eclipse/jgit/lib/Repository.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index b1ecca4b60..0562840915 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -306,25 +306,6 @@ public abstract class Repository implements AutoCloseable { return fs; } - /** - * Whether the specified object is stored in this repo or any of the known - * shared repositories. - * - * @param objectId - * a {@link org.eclipse.jgit.lib.AnyObjectId} object. - * @return true if the specified object is stored in this repo or any of the - * known shared repositories. - * @deprecated use {@code getObjectDatabase().has(objectId)} - */ - @Deprecated - public boolean hasObject(AnyObjectId objectId) { - try { - return getObjectDatabase().has(objectId); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - } - /** * Open an object from this repository. *

-- cgit v1.2.3 From 7162722e9c2d373d64f8db4160be26ec440bbeb6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:37:48 +0200 Subject: Remove deprecated TagBuilder#toByteArray method Change-Id: I14e78bcd4bbdb491bcc44a53ff19609b79c0831b --- .../src/org/eclipse/jgit/lib/TagBuilder.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TagBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TagBuilder.java index bbc614448f..ea73d95102 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TagBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TagBuilder.java @@ -206,23 +206,6 @@ public class TagBuilder extends ObjectBuilder { return os.toByteArray(); } - /** - * Format this builder's state as an annotated tag object. - * - * @return this object in the canonical annotated tag format, suitable for - * storage in a repository, or {@code null} if the tag cannot be - * encoded - * @deprecated since 5.11; use {@link #build()} instead - */ - @Deprecated - public byte[] toByteArray() { - try { - return build(); - } catch (UnsupportedEncodingException e) { - return null; - } - } - @SuppressWarnings("nls") @Override public String toString() { -- cgit v1.2.3 From 987a24ba220012c6200bbbb7b80bdc8e56e89d44 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:42:16 +0200 Subject: Remove deprecated MergeFormatter#formatMerge using charset name Change-Id: Id2bdcb865203ed192fea35cfcf82c34667710726 --- .../src/org/eclipse/jgit/merge/MergeFormatter.java | 34 ---------------------- 1 file changed, 34 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java index a35b30eb01..5006f9e0cd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java @@ -111,40 +111,6 @@ public class MergeFormatter { new MergeFormatterPass(out, res, seqName, charset, true).formatMerge(); } - /** - * Formats the results of a merge of exactly two - * {@link org.eclipse.jgit.diff.RawText} objects in a Git conformant way. - * This convenience method accepts the names for the three sequences (base - * and the two merged sequences) as explicit parameters and doesn't require - * the caller to specify a List - * - * @param out - * the {@link java.io.OutputStream} where to write the textual - * presentation - * @param res - * the merge result which should be presented - * @param baseName - * the name ranges from the base should get - * @param oursName - * the name ranges from ours should get - * @param theirsName - * the name ranges from theirs should get - * @param charsetName - * the name of the character set used when writing conflict - * metadata - * @throws java.io.IOException - * if an IO error occurred - * @deprecated use - * {@link #formatMerge(OutputStream, MergeResult, String, String, String, Charset)} - * instead. - */ - @Deprecated - public void formatMerge(OutputStream out, MergeResult res, String baseName, - String oursName, String theirsName, String charsetName) throws IOException { - formatMerge(out, res, baseName, oursName, theirsName, - Charset.forName(charsetName)); - } - /** * Formats the results of a merge of exactly two * {@link org.eclipse.jgit.diff.RawText} objects in a Git conformant way. -- cgit v1.2.3 From e5422546003f7ad623d821e2e84abfd5f34a56c2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:43:10 +0200 Subject: Remove deprecated MergeFormatter#formatMerge using charset name Change-Id: I7d0bdb61a8698e94bb40c22fe1c40c70cec65dfc --- .../src/org/eclipse/jgit/merge/MergeFormatter.java | 31 ---------------------- 1 file changed, 31 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java index 5006f9e0cd..079db4a07f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeFormatter.java @@ -22,37 +22,6 @@ import org.eclipse.jgit.diff.RawText; * A class to convert merge results into a Git conformant textual presentation */ public class MergeFormatter { - /** - * Formats the results of a merge of {@link org.eclipse.jgit.diff.RawText} - * objects in a Git conformant way. This method also assumes that the - * {@link org.eclipse.jgit.diff.RawText} objects being merged are line - * oriented files which use LF as delimiter. This method will also use LF to - * separate chunks and conflict metadata, therefore it fits only to texts - * that are LF-separated lines. - * - * @param out - * the output stream where to write the textual presentation - * @param res - * the merge result which should be presented - * @param seqName - * When a conflict is reported each conflicting range will get a - * name. This name is following the "<<<<<<< - * " or ">>>>>>> " conflict markers. The - * names for the sequences are given in this list - * @param charsetName - * the name of the character set used when writing conflict - * metadata - * @throws java.io.IOException - * if an IO error occurred - * @deprecated Use - * {@link #formatMerge(OutputStream, MergeResult, List, Charset)} - * instead. - */ - @Deprecated - public void formatMerge(OutputStream out, MergeResult res, - List seqName, String charsetName) throws IOException { - formatMerge(out, res, seqName, Charset.forName(charsetName)); - } /** * Formats the results of a merge of {@link org.eclipse.jgit.diff.RawText} -- cgit v1.2.3 From 42d3182614b82cfe139012fb3c66bfeae444b91a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:44:24 +0200 Subject: Remove deprecated MergeMessageFormatter#formatWithConflicts Change-Id: I3040f655318c47f268433294720a99325ae78863 --- .../org/eclipse/jgit/merge/MergeMessageFormatter.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java index e0c083f55c..039d7d844c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeMessageFormatter.java @@ -91,24 +91,6 @@ public class MergeMessageFormatter { return sb.toString(); } - /** - * Add section with conflicting paths to merge message. Lines are prefixed - * with a hash. - * - * @param message - * the original merge message - * @param conflictingPaths - * the paths with conflicts - * @return merge message with conflicting paths added - * @deprecated since 6.1; use - * {@link #formatWithConflicts(String, Iterable, char)} instead - */ - @Deprecated - public String formatWithConflicts(String message, - List conflictingPaths) { - return formatWithConflicts(message, conflictingPaths, '#'); - } - /** * Add section with conflicting paths to merge message. * -- cgit v1.2.3 From 0143d6de0891b3ecd5a6212a659bfc9c1b1b3da9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:45:41 +0200 Subject: Remove deprecated PatchApplier#applyPatch(InputStream) Change-Id: I79923b95861af983b676d436938aaeebe8c5b658 --- .../src/org/eclipse/jgit/patch/PatchApplier.java | 27 ---------------------- 1 file changed, 27 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java index cb6cc6efa7..23e09b9479 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/patch/PatchApplier.java @@ -41,7 +41,6 @@ import java.util.zip.InflaterInputStream; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.errors.FilterFailedException; -import org.eclipse.jgit.api.errors.PatchFormatException; import org.eclipse.jgit.attributes.Attribute; import org.eclipse.jgit.attributes.Attributes; import org.eclipse.jgit.attributes.FilterCommand; @@ -287,32 +286,6 @@ public class PatchApplier { } } - /** - * Applies the given patch - * - * @param patchInput - * the patch to apply. - * @return the result of the patch - * @throws PatchFormatException - * if the patch cannot be parsed - * @throws IOException - * if the patch read fails - * @deprecated use {@link #applyPatch(Patch)} instead - */ - @Deprecated - public Result applyPatch(InputStream patchInput) - throws PatchFormatException, IOException { - Patch p = new Patch(); - try (InputStream inStream = patchInput) { - p.parse(inStream); - - if (!p.getErrors().isEmpty()) { - throw new PatchFormatException(p.getErrors()); - } - } - return applyPatch(p); - } - /** * Applies the given patch * -- cgit v1.2.3 From fc76f226c3aa8e55683f95b56e24d47e91ce0e47 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:47:16 +0200 Subject: WindowCacheStats: remove deprecated #getOpenFiles, #getOpenBytes Change-Id: If254177fd7914cb1f909f6620032bb4016208855 --- .../eclipse/jgit/storage/file/WindowCacheStats.java | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheStats.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheStats.java index 7cb8618302..668b92cf53 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheStats.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/file/WindowCacheStats.java @@ -22,27 +22,6 @@ import org.eclipse.jgit.internal.storage.file.WindowCache; */ @MXBean public interface WindowCacheStats { - /** - * Get number of open files - * - * @return the number of open files. - * @deprecated use {@link #getOpenFileCount()} instead - */ - @Deprecated - public static int getOpenFiles() { - return (int) WindowCache.getInstance().getStats().getOpenFileCount(); - } - - /** - * Get number of open bytes - * - * @return the number of open bytes. - * @deprecated use {@link #getOpenByteCount()} instead - */ - @Deprecated - public static long getOpenBytes() { - return WindowCache.getInstance().getStats().getOpenByteCount(); - } /** * Get cache statistics -- cgit v1.2.3 From 7b65a847219308beaf5b4542e45ab2927ff0e4f8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:49:12 +0200 Subject: PacketLineIn: make deprecated #END and #DELIM private Change-Id: I1b7ba9f7e3dffe54313fc5d27051ad56a02a05b9 --- .../src/org/eclipse/jgit/transport/PacketLineIn.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java index ed33eaed07..614ad88246 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PacketLineIn.java @@ -43,24 +43,13 @@ public class PacketLineIn { /** * Magic return from {@link #readString()} when a flush packet is found. - * - * @deprecated Callers should use {@link #isEnd(String)} to check if a - * string is the end marker, or - * {@link PacketLineIn#readStrings()} to iterate over all - * strings in the input stream until the marker is reached. */ - @Deprecated - public static final String END = new String(); /* must not string pool */ + private static final String END = new String(); /* must not string pool */ /** * Magic return from {@link #readString()} when a delim packet is found. - * - * @since 5.0 - * @deprecated Callers should use {@link #isDelimiter(String)} to check if a - * string is the delimiter. */ - @Deprecated - public static final String DELIM = new String(); /* must not string pool */ + private static final String DELIM = new String(); /* must not string pool */ enum AckNackResult { /** NAK */ -- cgit v1.2.3 From 66f340865b9470fa8fbc9d12e0c08bf09ebf8364 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 17:50:59 +0200 Subject: Remove deprecated class ReceivePack.FirstLine Change-Id: I1143612088dba4fdced8f14c97293d17ff9658bb --- .../org/eclipse/jgit/transport/ReceivePack.java | 46 ---------------------- 1 file changed, 46 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index ddde6038e9..21752a1294 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -88,52 +88,6 @@ import org.eclipse.jgit.util.io.TimeoutOutputStream; * Implements the server side of a push connection, receiving objects. */ public class ReceivePack { - /** - * Data in the first line of a request, the line itself plus capabilities. - * - * @deprecated Use {@link FirstCommand} instead. - * @since 5.6 - */ - @Deprecated - public static class FirstLine { - private final FirstCommand command; - - /** - * Parse the first line of a receive-pack request. - * - * @param line - * line from the client. - */ - public FirstLine(String line) { - command = FirstCommand.fromLine(line); - } - - /** - * Get non-capabilities part of the line - * - * @return non-capabilities part of the line. - */ - public String getLine() { - return command.getLine(); - } - - /** - * Get capabilities parsed from the line - * - * @return capabilities parsed from the line. - */ - public Set getCapabilities() { - Set reconstructedCapabilites = new HashSet<>(); - for (Map.Entry e : command.getCapabilities() - .entrySet()) { - String cap = e.getValue() == null ? e.getKey() - : e.getKey() + "=" + e.getValue(); //$NON-NLS-1$ - reconstructedCapabilites.add(cap); - } - - return reconstructedCapabilites; - } - } /** Database we write the stored objects into. */ private final Repository db; -- cgit v1.2.3 From 0d4e81e50cebce9a75f0a33b2106c9922375c77a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 21:49:54 +0200 Subject: Remove deprecated ReceivePack#setEchoCommandFailures method Change-Id: Ieeeb33b8b3dc8272023af5d47b3330f4a94c5b96 --- .../src/org/eclipse/jgit/transport/ReceivePack.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java index 21752a1294..6f211e0794 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java @@ -2102,22 +2102,6 @@ public class ReceivePack { this.unpackErrorHandler = unpackErrorHandler; } - /** - * Set whether this class will report command failures as warning messages - * before sending the command results. - * - * @param echo - * if true this class will report command failures as warning - * messages before sending the command results. This is usually - * not necessary, but may help buggy Git clients that discard the - * errors when all branches fail. - * @deprecated no widely used Git versions need this any more - */ - @Deprecated - public void setEchoCommandFailures(boolean echo) { - // No-op. - } - /** * Get the client session-id * -- cgit v1.2.3 From d67227653a776a39e3da64e5ee134dab831c1b06 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 21:51:27 +0200 Subject: Remove deprecated RefAdvertiser#send(Map) method Change-Id: Ifffcfa6bf9baf9f6879a5a7e0f05d317347983f6 --- .../org/eclipse/jgit/transport/RefAdvertiser.java | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java index f72c421920..3d4bea2e48 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java @@ -178,7 +178,6 @@ public abstract class RefAdvertiser { * * This method must be invoked prior to any of the following: *

    - *
  • {@link #send(Map)}
    • *
  • {@link #send(Collection)}
    • *
* @@ -195,7 +194,6 @@ public abstract class RefAdvertiser { *

* This method must be invoked prior to any of the following: *

    - *
  • {@link #send(Map)}
    • *
  • {@link #send(Collection)}
    • *
  • {@link #advertiseHave(AnyObjectId)}
    • *
@@ -230,7 +228,6 @@ public abstract class RefAdvertiser { *

* This method must be invoked prior to any of the following: *

    - *
  • {@link #send(Map)}
    • *
  • {@link #send(Collection)}
    • *
  • {@link #advertiseHave(AnyObjectId)}
    • *
@@ -249,24 +246,6 @@ public abstract class RefAdvertiser { } } - /** - * Format an advertisement for the supplied refs. - * - * @param refs - * zero or more refs to format for the client. The collection is - * sorted before display if necessary, and therefore may appear - * in any order. - * @return set of ObjectIds that were advertised to the client. - * @throws java.io.IOException - * the underlying output stream failed to write out an - * advertisement record. - * @deprecated use {@link #send(Collection)} instead. - */ - @Deprecated - public Set send(Map refs) throws IOException { - return send(refs.values()); - } - /** * Format an advertisement for the supplied refs. * -- cgit v1.2.3 From d64e09230c8bf1edae9566da15dd71b17d37b110 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 21:52:31 +0200 Subject: Remove deprecated Transport#getFilterBlobLimit methods Change-Id: Ia72cc228b0acaa8df8f405bd224916cc76eadd22 --- .../src/org/eclipse/jgit/transport/Transport.java | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java index b335675da5..ac76e83d34 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/Transport.java @@ -1120,28 +1120,6 @@ public abstract class Transport implements AutoCloseable { removeDeletedRefs = remove; } - /** - * @return the blob limit value set with {@link #setFilterBlobLimit} or - * {@link #setFilterSpec(FilterSpec)}, or -1 if no blob limit value - * was set - * @since 5.0 - * @deprecated Use {@link #getFilterSpec()} instead - */ - @Deprecated - public final long getFilterBlobLimit() { - return filterSpec.getBlobLimit(); - } - - /** - * @param bytes exclude blobs of size greater than this - * @since 5.0 - * @deprecated Use {@link #setFilterSpec(FilterSpec)} instead - */ - @Deprecated - public final void setFilterBlobLimit(long bytes) { - setFilterSpec(FilterSpec.withBlobLimit(bytes)); - } - /** * Get filter spec * -- cgit v1.2.3 From 88053eedcc89d6fded81e5edb39ae41d237ba3dd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 21:54:50 +0200 Subject: UserAgent: remove deprecated #getAgent, #hasAgent methods Change-Id: Ib53de6dabea7f73ecfde85cb30f49fa05ee48551 --- .../src/org/eclipse/jgit/transport/UserAgent.java | 41 ---------------------- 1 file changed, 41 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UserAgent.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UserAgent.java index 7b052ad4a7..b23ee97dcb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UserAgent.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UserAgent.java @@ -10,10 +10,6 @@ package org.eclipse.jgit.transport; -import static org.eclipse.jgit.transport.GitProtocolConstants.OPTION_AGENT; - -import java.util.Set; - import org.eclipse.jgit.util.StringUtils; /** @@ -91,43 +87,6 @@ public class UserAgent { userAgent = StringUtils.isEmptyOrNull(agent) ? null : clean(agent); } - /** - * - * @param options - * options - * @param transportAgent - * name of transport agent - * @return The transport agent. - * @deprecated Capabilities with <key>=<value> shape are now - * parsed alongside other capabilities in the ReceivePack flow. - */ - @Deprecated - static String getAgent(Set options, String transportAgent) { - if (options == null || options.isEmpty()) { - return transportAgent; - } - for (String o : options) { - if (o.startsWith(OPTION_AGENT) - && o.length() > OPTION_AGENT.length() - && o.charAt(OPTION_AGENT.length()) == '=') { - return o.substring(OPTION_AGENT.length() + 1); - } - } - return transportAgent; - } - - /** - * - * @param options - * options - * @return True if the transport agent is set. False otherwise. - * @deprecated Capabilities with <key>=<value> shape are now - * parsed alongside other capabilities in the ReceivePack flow. - */ - @Deprecated - static boolean hasAgent(Set options) { - return getAgent(options, null) != null; - } private UserAgent() { } -- cgit v1.2.3 From 8baef22711676bf853dfc24ef145122a335f4312 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 21:59:53 +0200 Subject: Remove deprecated lastModified methods using long from - FileUtils#lastModified - FileUtils#setLastModified - FS#getLastModifiedTime - FS#lastModified - FS#setLastModified - FileTreeIterator.Entry#getEntryLastModified - WorkingTreeIterator#getEntryLastModified - WorkingTreeIterator.Entry#getEntryLastModified Change-Id: I5073f05c32f8f626383a91048470c79332983121 --- .../eclipse/jgit/treewalk/FileTreeIterator.java | 6 --- .../eclipse/jgit/treewalk/WorkingTreeIterator.java | 27 ------------ org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 50 ---------------------- .../src/org/eclipse/jgit/util/FileUtils.java | 33 -------------- 4 files changed, 116 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java index 36fa72028e..0cac374844 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/FileTreeIterator.java @@ -371,12 +371,6 @@ public class FileTreeIterator extends WorkingTreeIterator { return attributes.getLength(); } - @Override - @Deprecated - public long getLastModified() { - return attributes.getLastModifiedInstant().toEpochMilli(); - } - /** * @since 5.1.9 */ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java index 95e9964192..f16d800f63 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java @@ -619,18 +619,6 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { return canonLen; } - /** - * Get the last modified time of this entry. - * - * @return last modified time of this file, in milliseconds since the epoch - * (Jan 1, 1970 UTC). - * @deprecated use {@link #getEntryLastModifiedInstant()} instead - */ - @Deprecated - public long getEntryLastModified() { - return current().getLastModified(); - } - /** * Get the last modified time of this entry. * @@ -1222,21 +1210,6 @@ public abstract class WorkingTreeIterator extends AbstractTreeIterator { */ public abstract long getLength(); - /** - * Get the last modified time of this entry. - *

- * Note: Efficient implementation required. - *

- * The implementation of this method must be efficient. If a subclass - * needs to compute the value they should cache the reference within an - * instance member instead. - * - * @return time since the epoch (in ms) of the last change. - * @deprecated use {@link #getLastModifiedInstant()} instead - */ - @Deprecated - public abstract long getLastModified(); - /** * Get the last modified time of this entry. *

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index 6933a6c567..4433dccc62 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -1080,24 +1080,6 @@ public abstract class FS { */ public abstract boolean setExecute(File f, boolean canExec); - /** - * Get the last modified time of a file system object. If the OS/JRE support - * symbolic links, the modification time of the link is returned, rather - * than that of the link target. - * - * @param f - * a {@link java.io.File} object. - * @return last modified time of f - * @throws java.io.IOException - * if an IO error occurred - * @since 3.0 - * @deprecated use {@link #lastModifiedInstant(Path)} instead - */ - @Deprecated - public long lastModified(File f) throws IOException { - return FileUtils.lastModified(f); - } - /** * Get the last modified time of a file system object. If the OS/JRE support * symbolic links, the modification time of the link is returned, rather @@ -1126,25 +1108,6 @@ public abstract class FS { return FileUtils.lastModifiedInstant(f.toPath()); } - /** - * Set the last modified time of a file system object. - *

- * For symlinks it sets the modified time of the link target. - * - * @param f - * a {@link java.io.File} object. - * @param time - * last modified time - * @throws java.io.IOException - * if an IO error occurred - * @since 3.0 - * @deprecated use {@link #setLastModified(Path, Instant)} instead - */ - @Deprecated - public void setLastModified(File f, long time) throws IOException { - FileUtils.setLastModified(f, time); - } - /** * Set the last modified time of a file system object. *

@@ -2425,19 +2388,6 @@ public abstract class FS { return creationTime; } - /** - * Get the time when the file was last modified in milliseconds since - * the epoch - * - * @return the time (milliseconds since 1970-01-01) when this object was - * last modified - * @deprecated use getLastModifiedInstant instead - */ - @Deprecated - public long getLastModifiedTime() { - return lastModifiedInstant.toEpochMilli(); - } - /** * Get the time when this object was last modified * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java index cab0e6a0a9..39c67f1b86 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FileUtils.java @@ -770,24 +770,6 @@ public class FileUtils { return Files.isSymbolicLink(file.toPath()); } - /** - * Get the lastModified attribute for a given file - * - * @param file - * the file - * @return lastModified attribute for given file, not following symbolic - * links - * @throws IOException - * if an IO error occurred - * @deprecated use {@link #lastModifiedInstant(Path)} instead which returns - * FileTime - */ - @Deprecated - static long lastModified(File file) throws IOException { - return Files.getLastModifiedTime(toPath(file), LinkOption.NOFOLLOW_LINKS) - .toMillis(); - } - /** * Get last modified timestamp of a file * @@ -827,21 +809,6 @@ public class FileUtils { return Files.readAttributes(file.toPath(), BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS); } - /** - * Set the last modified time of a file system object. - * - * @param file - * the file - * @param time - * last modified timestamp - * @throws IOException - * if an IO error occurred - */ - @Deprecated - static void setLastModified(File file, long time) throws IOException { - Files.setLastModifiedTime(toPath(file), FileTime.fromMillis(time)); - } - /** * Set the last modified time of a file system object. * -- cgit v1.2.3 From 0b531cd6e3f6a71975c208ce67f298a0b672d32d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 22:07:17 +0200 Subject: FS, FS_Posix: remove deprecated #createNewFile(File) method Change-Id: Id34a0be998eee360e69f74b469c4990afa153c1b --- org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 19 ------ .../src/org/eclipse/jgit/util/FS_POSIX.java | 67 ---------------------- 2 files changed, 86 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index 4433dccc62..8e0b93f082 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -1762,25 +1762,6 @@ public abstract class FS { FileUtils.createSymLink(path, target); } - /** - * Create a new file. See {@link java.io.File#createNewFile()}. Subclasses - * of this class may take care to provide a safe implementation for this - * even if {@link #supportsAtomicCreateNewFile()} is false - * - * @param path - * the file to be created - * @return true if the file was created, false if - * the file already existed - * @throws java.io.IOException - * if an IO error occurred - * @deprecated use {@link #createNewFileAtomic(File)} instead - * @since 4.5 - */ - @Deprecated - public boolean createNewFile(File path) throws IOException { - return path.createNewFile(); - } - /** * A token representing a file created by * {@link #createNewFileAtomic(File)}. The token must be retained until the diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java index e73095f5a8..db2b5b4f71 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_POSIX.java @@ -341,73 +341,6 @@ public class FS_POSIX extends FS { return supportsAtomicFileCreation == AtomicFileCreation.SUPPORTED; } - @Override - @SuppressWarnings("boxing") - /** - * {@inheritDoc} - *

- * An implementation of the File#createNewFile() semantics which works also - * on NFS. If the config option - * {@code core.supportsAtomicCreateNewFile = true} (which is the default) - * then simply File#createNewFile() is called. - * - * But if {@code core.supportsAtomicCreateNewFile = false} then after - * successful creation of the lock file a hard link to that lock file is - * created and the attribute nlink of the lock file is checked to be 2. If - * multiple clients manage to create the same lock file nlink would be - * greater than 2 showing the error. - * - * @see "https://www.time-travellers.org/shane/papers/NFS_considered_harmful.html" - * - * @deprecated use {@link FS_POSIX#createNewFileAtomic(File)} instead - * @since 4.5 - */ - @Deprecated - public boolean createNewFile(File lock) throws IOException { - if (!lock.createNewFile()) { - return false; - } - if (supportsAtomicCreateNewFile()) { - return true; - } - Path lockPath = lock.toPath(); - Path link = null; - FileStore store = null; - try { - store = Files.getFileStore(lockPath); - } catch (SecurityException e) { - return true; - } - try { - Boolean canLink = CAN_HARD_LINK.computeIfAbsent(store, - s -> Boolean.TRUE); - if (Boolean.FALSE.equals(canLink)) { - return true; - } - link = Files.createLink( - Paths.get(lock.getAbsolutePath() + ".lnk"), //$NON-NLS-1$ - lockPath); - Integer nlink = (Integer) Files.getAttribute(lockPath, - "unix:nlink"); //$NON-NLS-1$ - if (nlink > 2) { - LOG.warn(MessageFormat.format( - JGitText.get().failedAtomicFileCreation, lockPath, - nlink)); - return false; - } else if (nlink < 2) { - CAN_HARD_LINK.put(store, Boolean.FALSE); - } - return true; - } catch (UnsupportedOperationException | IllegalArgumentException e) { - CAN_HARD_LINK.put(store, Boolean.FALSE); - return true; - } finally { - if (link != null) { - Files.delete(link); - } - } - } - /** * {@inheritDoc} *

-- cgit v1.2.3 From 2a10b416f9468a6c4cc09eca68678131ec7e7db4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 22:09:11 +0200 Subject: Remove deprecated FS#setAsyncFileStoreAttributes method Change-Id: Iea9f61fd65772ab247b382c93035e3c9974705aa --- org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index 8e0b93f082..860c1c92fd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -897,21 +897,6 @@ public abstract class FS { return detect(null); } - /** - * Whether FileStore attributes should be determined asynchronously - * - * @param asynch - * whether FileStore attributes should be determined - * asynchronously. If false access to cached attributes may block - * for some seconds for the first call per FileStore - * @since 5.1.9 - * @deprecated Use {@link FileStoreAttributes#setBackground} instead - */ - @Deprecated - public static void setAsyncFileStoreAttributes(boolean asynch) { - FileStoreAttributes.setBackground(asynch); - } - /** * Auto-detect the appropriate file system abstraction, taking into account * the presence of a Cygwin installation on the system. Using jgit in -- cgit v1.2.3 From f9a608b57e9e217578d9b37c74c249e3f3837661 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 22:17:23 +0200 Subject: Remove deprecated RawParseUtils#UTF8_CHARSET Change-Id: I4b3f1344f77a575b2d0e00462806eddb4e9a6b80 --- org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java index 46d0bc85ff..2ce86904c5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java @@ -44,14 +44,6 @@ import org.eclipse.jgit.lib.PersonIdent; * Handy utility functions to parse raw object contents. */ public final class RawParseUtils { - /** - * UTF-8 charset constant. - * - * @since 2.2 - * @deprecated use {@link java.nio.charset.StandardCharsets#UTF_8} instead - */ - @Deprecated - public static final Charset UTF8_CHARSET = UTF_8; private static final byte[] digits10; -- cgit v1.2.3 From 0ae586b81fa5deb46633ccaa29607f565587d841 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 22:18:50 +0200 Subject: Remove deprecated AutoLFInputStream constructors Change-Id: I00241e45d947582886658fa528cc20a961fed9e6 --- .../eclipse/jgit/util/io/AutoLFInputStream.java | 38 ---------------------- 1 file changed, 38 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/AutoLFInputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/AutoLFInputStream.java index 2385865674..4b9706a3ce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/AutoLFInputStream.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/AutoLFInputStream.java @@ -147,44 +147,6 @@ public class AutoLFInputStream extends InputStream { && flags.contains(StreamFlag.FOR_CHECKOUT); } - /** - * Creates a new InputStream, wrapping the specified stream. - * - * @param in - * raw input stream - * @param detectBinary - * whether binaries should be detected - * @since 2.0 - * @deprecated since 5.9, use {@link #create(InputStream, StreamFlag...)} - * instead - */ - @Deprecated - public AutoLFInputStream(InputStream in, boolean detectBinary) { - this(in, detectBinary, false); - } - - /** - * Creates a new InputStream, wrapping the specified stream. - * - * @param in - * raw input stream - * @param detectBinary - * whether binaries should be detected - * @param abortIfBinary - * throw an IOException if the file is binary - * @since 3.3 - * @deprecated since 5.9, use {@link #create(InputStream, StreamFlag...)} - * instead - */ - @Deprecated - public AutoLFInputStream(InputStream in, boolean detectBinary, - boolean abortIfBinary) { - this.in = in; - this.detectBinary = detectBinary; - this.abortIfBinary = abortIfBinary; - this.forCheckout = false; - } - @Override public int read() throws IOException { final int read = read(single, 0, 1); -- cgit v1.2.3 From b4bdf9841c286116955b2b31f776af2339950036 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 30 Aug 2024 22:21:03 +0200 Subject: Remove deprecated JschSession#getSftpChannel method Change-Id: I5b5d3cbc6b0e5f85df26fe6c288c973cf5609296 --- .../eclipse/jgit/transport/ssh/jsch/JschSession.java | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschSession.java b/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschSession.java index 5f36dadc04..ad58ae1c8e 100644 --- a/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschSession.java +++ b/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/JschSession.java @@ -34,7 +34,6 @@ import org.eclipse.jgit.transport.RemoteSession2; import org.eclipse.jgit.transport.URIish; import org.eclipse.jgit.util.io.IsolatedOutputStream; -import com.jcraft.jsch.Channel; import com.jcraft.jsch.ChannelExec; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.JSchException; @@ -85,22 +84,6 @@ public class JschSession implements RemoteSession2 { sock.disconnect(); } - /** - * A kludge to allow {@link org.eclipse.jgit.transport.TransportSftp} to get - * an Sftp channel from Jsch. Ideally, this method would be generic, which - * would require implementing generic Sftp channel operations in the - * RemoteSession class. - * - * @return a channel suitable for Sftp operations. - * @throws com.jcraft.jsch.JSchException - * on problems getting the channel. - * @deprecated since 5.2; use {@link #getFtpChannel()} instead - */ - @Deprecated - public Channel getSftpChannel() throws JSchException { - return sock.openChannel("sftp"); //$NON-NLS-1$ - } - /** * {@inheritDoc} * -- cgit v1.2.3 From 45689b4a2c39b820143140aa7185f23f445067ea Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Sep 2024 19:35:16 +0200 Subject: Revert "Remove deprecated LocalDiskRepositoryTestCase#create(boolean,boolean)" This reverts commit 3682611cef41ade46cf5ac194f0674b46367a395. Reason: removing this deprecated method caused a ton of warnings about closing an already closed Repository when running tests. Change-Id: I3e9f224c55c167f92dad39caabfab5e43cf54cfb --- .../jgit/junit/LocalDiskRepositoryTestCase.java | 23 +++++++++++++++++++++- .../org/eclipse/jgit/lib/RepositoryCacheTest.java | 13 +++++++----- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java index 98f69ed31c..407290a399 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java @@ -422,11 +422,32 @@ public abstract class LocalDiskRepositoryTestCase { */ protected FileRepository createRepository(boolean bare) throws IOException { + return createRepository(bare, false /* auto close */); + } + + /** + * Creates a new empty repository. + * + * @param bare + * true to create a bare repository; false to make a repository + * within its working directory + * @param autoClose + * auto close the repository in {@link #tearDown()} + * @return the newly created repository, opened for access + * @throws IOException + * the repository could not be created in the temporary area + * @deprecated use {@link #createRepository(boolean)} instead + */ + @Deprecated + public FileRepository createRepository(boolean bare, boolean autoClose) + throws IOException { File gitdir = createUniqueTestGitDir(bare); FileRepository db = new FileRepository(gitdir); assertFalse(gitdir.exists()); db.create(bare); - addRepoToClose(db); + if (autoClose) { + addRepoToClose(db); + } return db; } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryCacheTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryCacheTest.java index 2a6551787f..cec69c4998 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryCacheTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RepositoryCacheTest.java @@ -159,8 +159,8 @@ public class RepositoryCacheTest extends RepositoryTestCase { @Test public void testRepositoryUsageCountWithRegisteredRepository() throws IOException { - @SuppressWarnings("resource") // We are testing the close() method - Repository repo = createRepository(false); + @SuppressWarnings({"resource", "deprecation"}) // We are testing the close() method + Repository repo = createRepository(false, false); assertEquals(1, repo.useCnt.get()); RepositoryCache.register(repo); assertEquals(1, repo.useCnt.get()); @@ -207,8 +207,10 @@ public class RepositoryCacheTest extends RepositoryTestCase { @Test public void testRepositoryUnregisteringWhenExpired() throws Exception { - Repository repoA = createRepository(true); - Repository repoB = createRepository(true); + @SuppressWarnings({"resource", "deprecation"}) // We are testing the close() method + Repository repoA = createRepository(true, false); + @SuppressWarnings({"resource", "deprecation"}) // We are testing the close() method + Repository repoB = createRepository(true, false); Repository repoC = createBareRepository(); RepositoryCache.register(repoA); RepositoryCache.register(repoB); @@ -241,7 +243,8 @@ public class RepositoryCacheTest extends RepositoryTestCase { @Test public void testReconfigure() throws InterruptedException, IOException { - Repository repo = createRepository(false); + @SuppressWarnings({"resource", "deprecation"}) // We are testing the close() method + Repository repo = createRepository(false, false); RepositoryCache.register(repo); assertTrue(RepositoryCache.isCached(repo)); repo.close(); -- cgit v1.2.3 From 608a6432d08a31657aea48eae06d45a1e5dd4db3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Sep 2024 19:42:07 +0200 Subject: JGit v7.0.0.202409031743-r Signed-off-by: Matthias Sohn Change-Id: I86507936091e6f7af7588835722672ff2668a205 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 7c079a5899..e2a58f1b5d 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index be954bd8e0..5787c455e7 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index b6b52e595e..cf748d3e99 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 22f8aff82c..8b18b0b0a0 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 7c3edf475c..739e9f41d0 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 3e151f0b0c..54f29ed01a 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 322f52f9f4..3409a56169 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 18b7fcff82..15a7ddb800 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index d8a616f09e..ffa8c3b660 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 1fe5318660..c432949321 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.test - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 27510e2095..3c74acab9f 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index d865b13901..1e52b3ce62 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 7a62d1d232..9dcbfd7159 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 0733a68ba0..1983c7f247 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index ad907d3809..3839f92c7f 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c1ec7ae7c8..8662a40e0b 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index d29d3879d5..e90c4e51f9 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 51a79d61ef..30e0d699d4 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 124129d73d..bdaa810d96 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.0.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index bbb29cd846..7e10e74970 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 7645dd1418..fa36d84434 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index edce2d8d27..30354a97b7 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 01ee7824ca..bd71a93326 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 3e983511d5..8ae57d92af 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index cfeb426385..21eae4b94c 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 67c82652cb..7c9f864388 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index ee65b851a2..b4b72272b9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index a7ca6336b8..7b0dab21fd 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2a885f204e..9cf31c1db5 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index af1cbf256a..aa5e72fc6d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 149ad00121..721e79c9b8 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c33cb29b66..9db20f5107 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 8e41ee3d28..ffbca553b9 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 49c1023ef0..72798f9a7c 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index a59c82ed1a..7e13cc1604 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 2cf86bc942..f86476f006 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index befaa367de..56c9aa55e0 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 96c8953398..6d29800729 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 2c109c90ee..e86fd5c9e9 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f4c1e566a4..50823e531a 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.0.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index a048aa1738..93425f9c57 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 62508e245f..4e2b03377a 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 3dd7b10079..996c836f43 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index ea66a2383c..abe4d44f6f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 23fdd235cb..f73b067cb9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index fc1bf49989..21a17ed037 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 92262a00be..fb1b66b807 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 3344dcbb1b..5bbd4300fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 6f03419cb7..59b1f53c96 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 45162c97a7..3d2b99d270 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8eacae1fe7..6439f1f7b1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 287a723b9c..1e8bc0c97f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 179eab8a6b..e4d0ee5025 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index cbb8e4fafc..2fda9d1938 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 61b5dd6031..c3b1bc34a4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 4c0068bfab..2da2e712f6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 12ab06937a..f8e9b6692d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 209274feeb..b3a2f8b0b3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 1d82d4a1cc..9305b2c5b8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index ff46d9e65d..edfb9cd46c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index c4d4fcf825..9ed4f7a637 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 657b90f0cf..2c1cc9412b 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 955c5c04b5..0aa7f42b28 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 90090d6958..8a3346566e 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index bb0c23dd72..cde98c776e 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 8bb1b64622..f582b9a42d 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 7cd76c3011..6c6013db15 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index ad0164086a..3ba641bc74 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 684ab70f86..0be4bc5cee 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index f407ce11bf..8b0e74595b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 9c6df6b79a..ea5ec2185d 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 967b781d10..2ebf46aa1c 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 114582af22..ab7667a415 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index bb0d79b3d5..fb6dceba8a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 7cc3a55b26..a995d6ed1f 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 3bf4edd65f..6e78fb7c12 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 761b6c4aef..224f48197b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 9da7452428..de096f1651 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 1dc0e01964..54e27cb100 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index a3db63ca23..61230dfdb4 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index ab70d68a3f..b42327a93f 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 05f7c08bd2..d080415808 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 04bda44748..1f18179394 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.0.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 8170fc6bd2..870095f04b 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 6d1e2676af..87af678d78 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d6c0ba5dcc..4d9bce0323 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.qualifier +Bundle-Version: 7.0.0.202409031743-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 7531018bc3..1cbdc39f31 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.qualifier";roots="." +Bundle-Version: 7.0.0.202409031743-r +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202409031743-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 3c6c38992c..306158cc3e 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 13c681a716..919afa7029 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0-SNAPSHOT + 7.0.0.202409031743-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From df497514c7ca6991c0326ff334cb8998acdf2059 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Sep 2024 21:41:34 +0200 Subject: Prepare 7.0.1-SNAPSHOT builds Change-Id: I5a6a9e398d8b81bf7bd0afbd6c82116d4472a349 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++---- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 34 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 ++++----- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 86 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 16 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 118 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 112 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 531 insertions(+), 531 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index e2a58f1b5d..0cb66de275 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.ant.tasks;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 5787c455e7..d30abbf99e 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index cf748d3e99..6462b4db51 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)" + org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.0.0", - org.eclipse.jgit.ant.tasks;version="7.0.0"; +Export-Package: org.eclipse.jgit.ant;version="7.0.1", + org.eclipse.jgit.ant.tasks;version="7.0.1"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 8b18b0b0a0..da8d666c7a 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 739e9f41d0..6e629c6b82 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 54f29ed01a..45953f657d 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,18 +13,18 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.0.0"; +Export-Package: org.eclipse.jgit.archive;version="7.0.1"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.0.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.0.1";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 3409a56169..25660aea16 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 15a7ddb800..c4cc0d2f90 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index ffa8c3b660..ab9f6e7856 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index c432949321..2011268bb2 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 3c74acab9f..701f2eb512 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,9 +13,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.sha1;version="[7.0.0,7.1.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.sha1;version="[7.0.1,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 1e52b3ce62..3a5384256d 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 9dcbfd7159..a301e2fae5 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.1,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", @@ -29,5 +29,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.0.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.0.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.0.1";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 1983c7f247..27b9308b40 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 3839f92c7f..42ebec7f66 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 8662a40e0b..e7ff8a694d 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.0.0"; + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.0.1"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index e90c4e51f9..5b68ebe1ad 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 30e0d699d4..d2258b3aa4 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index bdaa810d96..e30a76025f 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="7.0.0", - org.eclipse.jgit.http.server.glue;version="7.0.0"; +Export-Package: org.eclipse.jgit.http.server;version="7.0.1", + org.eclipse.jgit.http.server.glue;version="7.0.1"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.0.0"; + org.eclipse.jgit.http.server.resolver;version="7.0.1"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, @@ -19,14 +19,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)" + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 7e10e74970..fee2336132 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index fa36d84434..1cc54cc0ee 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 30354a97b7..d2fc327de7 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -29,26 +29,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.http.server;version="[7.0.0,7.1.0)", - org.eclipse.jgit.http.server.glue;version="[7.0.0,7.1.0)", - org.eclipse.jgit.http.server.resolver;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.http.server;version="[7.0.1,7.1.0)", + org.eclipse.jgit.http.server.glue;version="[7.0.1,7.1.0)", + org.eclipse.jgit.http.server.resolver;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index bd71a93326..4c9a529fcb 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 8ae57d92af..fe369bcb39 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,17 +22,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.http.server;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.http.server;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.0.0"; +Export-Package: org.eclipse.jgit.junit.http;version="7.0.1"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 21eae4b94c..e81c084490 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 7c9f864388..d4ff8eead5 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index b4b72272b9..0e8091396d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.13.2,2.14.0)", org.apache.sshd.server.subsystem;version="[2.13.2,2.14.0)", org.apache.sshd.sftp;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.server;version="[2.13.2,2.14.0)", - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.1" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 7b0dab21fd..95c7a36cb1 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 9cf31c1db5..d98a0f1507 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index aa5e72fc6d..9a445f75dd 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.util;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="7.0.0", - org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.time;version="[7.0.0,7.1.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="7.0.1", + org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.time;version="[7.0.1,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.0.0"; +Export-Package: org.eclipse.jgit.junit;version="7.0.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.0.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.0.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.0.1";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 721e79c9b8..0b2f7ff059 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9db20f5107..f84ee783cc 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index ffbca553b9..118c68f633 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,24 +26,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.server;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.test;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.server;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.test;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 72798f9a7c..91200618e4 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 7e13cc1604..cd45ec8f43 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="7.0.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.0.1"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.0.0"; + org.eclipse.jgit.lfs.server.fs;version="7.0.1"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.0.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.0.0"; + org.eclipse.jgit.lfs.server.internal;version="7.0.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.0.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index f86476f006..b4bb8581a6 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 56c9aa55e0..6433cb8183 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 6d29800729..08c3b6c5c6 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,27 +3,27 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", +Import-Package: org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="7.0.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.0.1";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index e86fd5c9e9..9941c79205 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 50823e531a..a249afe290 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="7.0.0", - org.eclipse.jgit.lfs.errors;version="7.0.0", - org.eclipse.jgit.lfs.internal;version="7.0.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="7.0.0" +Export-Package: org.eclipse.jgit.lfs;version="7.0.1", + org.eclipse.jgit.lfs.errors;version="7.0.1", + org.eclipse.jgit.lfs.internal;version="7.0.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="7.0.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.0,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.0,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.hooks;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)" + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", + org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.hooks;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 93425f9c57..7719266733 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 4e2b03377a..377d91ff6b 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 996c836f43..da3c62ed63 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index abe4d44f6f..0fb58eb4cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index f73b067cb9..399bab2426 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index fb1b66b807..f701d8c32b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 59b1f53c96..73a6a0e826 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 6439f1f7b1..fd7a8617b1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index e4d0ee5025..f575459e59 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index c3b1bc34a4..3f1f3da12c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 2da2e712f6..a1c39415ce 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index b3a2f8b0b3..a4f28246da 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index edfb9cd46c..7726ca7f0c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 2c1cc9412b..fac003cc82 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 0aa7f42b28..8b7092e1fd 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.0,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.0,7.1.0)", - org.eclipse.jgit.pgm;version="[7.0.0,7.1.0)", - org.eclipse.jgit.pgm.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.pgm.opt;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", +Import-Package: org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", + org.eclipse.jgit.pgm;version="[7.0.1,7.1.0)", + org.eclipse.jgit.pgm.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.pgm.opt;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 8a3346566e..f9aea04f72 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index cde98c776e..8b1d53a5b0 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,49 +14,49 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.archive;version="[7.0.0,7.1.0)", - org.eclipse.jgit.awtui;version="[7.0.0,7.1.0)", - org.eclipse.jgit.blame;version="[7.0.0,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.0,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.gitrepo;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.io;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.server;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.notes;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk.filter;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.sshd;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.archive;version="[7.0.1,7.1.0)", + org.eclipse.jgit.awtui;version="[7.0.1,7.1.0)", + org.eclipse.jgit.blame;version="[7.0.1,7.1.0)", + org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.gitrepo;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.io;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.server;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.notes;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk.filter;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="7.0.0"; +Export-Package: org.eclipse.jgit.console;version="7.0.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.0.0"; + org.eclipse.jgit.pgm;version="7.0.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="7.0.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.0.0"; + org.eclipse.jgit.pgm.debug;version="7.0.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.0.0"; + org.eclipse.jgit.pgm.internal;version="7.0.1"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.0.0"; + org.eclipse.jgit.pgm.opt;version="7.0.1"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index f582b9a42d..d7f0ba4a08 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 6c6013db15..5055f39040 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 3ba641bc74..096eb332eb 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.0,7.1.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.1,7.1.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.0.0";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.0.1";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 0be4bc5cee..826108fd1f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 8b0e74595b..3c5f39fc78 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index ea5ec2185d..d9b0e1b901 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -22,16 +22,16 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)", org.apache.sshd.core;version="[2.13.2,2.14.0)", org.apache.sshd.server;version="[2.13.2,2.14.0)", org.apache.sshd.server.forward;version="[2.13.2,2.14.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit.ssh;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.sshd;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2ebf46aa1c..175119eab2 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index ab7667a415..4ddb3ad7f0 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.1";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.0";x-inter org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.0.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.0.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.0.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.0.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="7.0.0"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.0.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.0.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.0.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.0.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="7.0.1"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.0.0", + org.eclipse.jgit.transport.sshd.agent;version="7.0.1", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.13.2,2.14.0)", @@ -89,12 +89,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.client;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.common;version="[2.13.2,2.14.0)", - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.fnmatch;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index fb6dceba8a..2db55a3fc2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index a995d6ed1f..993a163c33 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 6e78fb7c12..8192be0cc3 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit.ssh;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 224f48197b..e4873e4067 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index de096f1651..8092a58aa5 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.0,7.1.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.1,7.1.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.0" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.1" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 54e27cb100..d5121038e1 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 61230dfdb4..2bd78a3c19 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index b42327a93f..96b9e35a6c 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,64 +21,64 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io;version="[2.15.0,3.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api;version="[7.0.0,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.archive;version="[7.0.0,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.0,7.1.0)", - org.eclipse.jgit.awtui;version="[7.0.0,7.1.0)", - org.eclipse.jgit.blame;version="[7.0.0,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.0,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.0,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.events;version="[7.0.0,7.1.0)", - org.eclipse.jgit.fnmatch;version="[7.0.0,7.1.0)", - org.eclipse.jgit.gitrepo;version="[7.0.0,7.1.0)", - org.eclipse.jgit.hooks;version="[7.0.0,7.1.0)", - org.eclipse.jgit.ignore;version="[7.0.0,7.1.0)", - org.eclipse.jgit.ignore.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.diff;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.fsck;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.0.0", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.io;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.transport.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.0.0,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.0,7.1.0)", - org.eclipse.jgit.junit.time;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.logging;version="[7.0.0,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.notes;version="[7.0.0,7.1.0)", - org.eclipse.jgit.patch;version="[7.0.0,7.1.0)", - org.eclipse.jgit.pgm;version="[7.0.0,7.1.0)", - org.eclipse.jgit.pgm.internal;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk.filter;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.0,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.0,7.1.0)", - org.eclipse.jgit.submodule;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util.sha1;version="[7.0.0,7.1.0)", + org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.archive;version="[7.0.1,7.1.0)", + org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", + org.eclipse.jgit.awtui;version="[7.0.1,7.1.0)", + org.eclipse.jgit.blame;version="[7.0.1,7.1.0)", + org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", + org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.events;version="[7.0.1,7.1.0)", + org.eclipse.jgit.fnmatch;version="[7.0.1,7.1.0)", + org.eclipse.jgit.gitrepo;version="[7.0.1,7.1.0)", + org.eclipse.jgit.hooks;version="[7.0.1,7.1.0)", + org.eclipse.jgit.ignore;version="[7.0.1,7.1.0)", + org.eclipse.jgit.ignore.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.diff;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.fsck;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.0.1", + org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.io;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.transport.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.0.1,7.1.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", + org.eclipse.jgit.junit.time;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.logging;version="[7.0.1,7.1.0)", + org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.notes;version="[7.0.1,7.1.0)", + org.eclipse.jgit.patch;version="[7.0.1,7.1.0)", + org.eclipse.jgit.pgm;version="[7.0.1,7.1.0)", + org.eclipse.jgit.pgm.internal;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk.filter;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", + org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", + org.eclipse.jgit.submodule;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util.sha1;version="[7.0.1,7.1.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index d080415808..272d784c71 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 1f18179394..7568d7446c 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.awtui;version="7.0.0" -Import-Package: org.eclipse.jgit.errors;version="[7.0.0,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.0,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.0,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.0,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.0,7.1.0)", - org.eclipse.jgit.util;version="[7.0.0,7.1.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.0.1" +Import-Package: org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", + org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", + org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", + org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", + org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", + org.eclipse.jgit.util;version="[7.0.1,7.1.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 870095f04b..26d3f5c7ea 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 87af678d78..da3b146355 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 4d9bce0323..bb0afdc62f 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.0.202409031743-r +Bundle-Version: 7.0.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.0.0", - org.eclipse.jgit.api;version="7.0.0"; +Export-Package: org.eclipse.jgit.annotations;version="7.0.1", + org.eclipse.jgit.api;version="7.0.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,18 +25,18 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.0.0"; + org.eclipse.jgit.api.errors;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.0.0"; + org.eclipse.jgit.attributes;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.0.0"; + org.eclipse.jgit.blame;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="7.0.0"; + org.eclipse.jgit.diff;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -44,53 +44,53 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.0.0"; + org.eclipse.jgit.dircache;version="7.0.1"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="7.0.0"; + org.eclipse.jgit.errors;version="7.0.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="7.0.0"; + org.eclipse.jgit.events;version="7.0.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.0.0", - org.eclipse.jgit.gitrepo;version="7.0.0"; + org.eclipse.jgit.fnmatch;version="7.0.1", + org.eclipse.jgit.gitrepo;version="7.0.1"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.0.0";x-internal:=true, - org.eclipse.jgit.hooks;version="7.0.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="7.0.0", - org.eclipse.jgit.ignore.internal;version="7.0.0"; + org.eclipse.jgit.gitrepo.internal;version="7.0.1";x-internal:=true, + org.eclipse.jgit.hooks;version="7.0.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="7.0.1", + org.eclipse.jgit.ignore.internal;version="7.0.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.0.0"; + org.eclipse.jgit.internal;version="7.0.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.0.0"; + org.eclipse.jgit.internal.diff;version="7.0.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.0.0"; + org.eclipse.jgit.internal.diffmergetool;version="7.0.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.0.0"; + org.eclipse.jgit.internal.fsck;version="7.0.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.0.0"; + org.eclipse.jgit.internal.revwalk;version="7.0.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.0.0"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.0.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.0.0"; + org.eclipse.jgit.internal.storage.dfs;version="7.0.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="7.0.0"; + org.eclipse.jgit.internal.storage.file;version="7.0.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -99,36 +99,36 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.0", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="7.0.0"; + org.eclipse.jgit.internal.storage.io;version="7.0.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.0.0"; + org.eclipse.jgit.internal.storage.memory;version="7.0.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.0.0"; + org.eclipse.jgit.internal.storage.pack;version="7.0.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.0.0"; + org.eclipse.jgit.internal.storage.reftable;version="7.0.1"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="7.0.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.0.0"; + org.eclipse.jgit.internal.submodule;version="7.0.1";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.0.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.0.0"; + org.eclipse.jgit.internal.transport.http;version="7.0.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.0.0"; + org.eclipse.jgit.internal.transport.parser;version="7.0.1"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.0.0"; + org.eclipse.jgit.internal.transport.ssh;version="7.0.1"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.0.0"; + org.eclipse.jgit.internal.util;version="7.0.1"; x-friends:=" org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.0.0"; + org.eclipse.jgit.lib;version="7.0.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -142,12 +142,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.0.0"; + org.eclipse.jgit.lib.internal;version="7.0.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.0.0", - org.eclipse.jgit.merge;version="7.0.0"; + org.eclipse.jgit.logging;version="7.0.1", + org.eclipse.jgit.merge;version="7.0.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -156,40 +156,40 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.0.0", - org.eclipse.jgit.notes;version="7.0.0"; + org.eclipse.jgit.nls;version="7.0.1", + org.eclipse.jgit.notes;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.0.0"; + org.eclipse.jgit.patch;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.0.0"; + org.eclipse.jgit.revplot;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="7.0.0"; + org.eclipse.jgit.revwalk;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="7.0.0"; + org.eclipse.jgit.revwalk.filter;version="7.0.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.0.0"; + org.eclipse.jgit.storage.file;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.0.0"; + org.eclipse.jgit.storage.pack;version="7.0.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.0.0"; + org.eclipse.jgit.submodule;version="7.0.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.0.0"; + org.eclipse.jgit.transport;version="7.0.1"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -202,21 +202,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.0.0"; + org.eclipse.jgit.transport.http;version="7.0.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.0.0"; + org.eclipse.jgit.transport.resolver;version="7.0.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.0.0"; + org.eclipse.jgit.treewalk;version="7.0.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="7.0.0"; + org.eclipse.jgit.treewalk.filter;version="7.0.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.0.0"; + org.eclipse.jgit.util;version="7.0.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -229,12 +229,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.0.0"; + org.eclipse.jgit.util.io;version="7.0.1"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.0.0", - org.eclipse.jgit.util.time;version="7.0.0" + org.eclipse.jgit.util.sha1;version="7.0.1", + org.eclipse.jgit.util.time;version="7.0.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 1cbdc39f31..2ced16481f 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.0.202409031743-r -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.0.202409031743-r";roots="." +Bundle-Version: 7.0.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 306158cc3e..f01a7db3f0 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 919afa7029..960df03570 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.0.202409031743-r + 7.0.1-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From c338c19f6dbc845542f63d7d8ba0b39088c61b56 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 3 Sep 2024 23:47:11 +0200 Subject: Prepare 7.1.0-SNAPSHOT builds Change-Id: Iba206a2d4645fc275cd2cd1cb3ae965b8ceafb28 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++---- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 34 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 ++++----- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 86 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 22 ++-- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 16 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 118 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 112 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 531 insertions(+), 531 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0cb66de275..cc2cecb6ae 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.ant.tasks;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index d30abbf99e..1921cf1f9d 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 6462b4db51..da001763da 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)" + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.0.1", - org.eclipse.jgit.ant.tasks;version="7.0.1"; +Export-Package: org.eclipse.jgit.ant;version="7.1.0", + org.eclipse.jgit.ant.tasks;version="7.1.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index da8d666c7a..4bac377fbf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 6e629c6b82..805d2fb94b 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 45953f657d..0c07d5f5a1 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,18 +13,18 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.0.1"; +Export-Package: org.eclipse.jgit.archive;version="7.1.0"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.0.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.1.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 25660aea16..cb710c0daf 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index c4cc0d2f90..3c01f2ad75 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index ab9f6e7856..e0fb94085d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 2011268bb2..dde8c148d9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 701f2eb512..c71f9b6541 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,9 +13,9 @@ Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.sha1;version="[7.0.1,7.1.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.sha1;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 3a5384256d..c4442b9fbf 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index a301e2fae5..6e3321ebf6 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.1,7.1.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", @@ -29,5 +29,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", org.bouncycastle.util.io;version="[1.69.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.0.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.0.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 27b9308b40..82690f8520 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 42ebec7f66..1a541c5b02 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index e7ff8a694d..d678a1e444 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.0.1"; + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.1.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 5b68ebe1ad..cd70e113cd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index d2258b3aa4..7b0f5d365d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index e30a76025f..23eb132afd 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="7.0.1", - org.eclipse.jgit.http.server.glue;version="7.0.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.1.0", + org.eclipse.jgit.http.server.glue;version="7.1.0"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.0.1"; + org.eclipse.jgit.http.server.resolver;version="7.1.0"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, @@ -19,14 +19,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)" + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index fee2336132..02fd70b8d7 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 1cc54cc0ee..f69febd1f3 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index d2fc327de7..58245d3404 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -29,26 +29,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.http.server;version="[7.0.1,7.1.0)", - org.eclipse.jgit.http.server.glue;version="[7.0.1,7.1.0)", - org.eclipse.jgit.http.server.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.http.server;version="[7.1.0,7.2.0)", + org.eclipse.jgit.http.server.glue;version="[7.1.0,7.2.0)", + org.eclipse.jgit.http.server.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 4c9a529fcb..9e7ea160ba 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index fe369bcb39..1e8eec0ac0 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,17 +22,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.http.server;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.http.server;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.0.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.1.0"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index e81c084490..ef53b03cba 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index d4ff8eead5..4fdc9f9694 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 0e8091396d..aed8eda17c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.13.2,2.14.0)", org.apache.sshd.server.subsystem;version="[2.13.2,2.14.0)", org.apache.sshd.sftp;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.server;version="[2.13.2,2.14.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.0.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.1.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 95c7a36cb1..9ce8de90b9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d98a0f1507..2e74ff506b 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 9a445f75dd..744309749d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="7.0.1", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.time;version="[7.0.1,7.1.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="7.1.0", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.time;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.0.1"; +Export-Package: org.eclipse.jgit.junit;version="7.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.0.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.0.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.1.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 0b2f7ff059..1e41d0819f 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index f84ee783cc..af83647318 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 118c68f633..5b6870d597 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,24 +26,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.test;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.test;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 91200618e4..968078a644 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index cd45ec8f43..56178d05fd 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="7.0.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.0.1"; + org.eclipse.jgit.lfs.server.fs;version="7.1.0"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.0.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.0.1"; + org.eclipse.jgit.lfs.server.internal;version="7.1.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.1.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index b4bb8581a6..796db2ca59 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 6433cb8183..297ee3d28d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 08c3b6c5c6..0aa081ff6f 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,27 +3,27 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", +Import-Package: org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="7.0.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.1.0";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 9941c79205..42547756dc 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index a249afe290..f24ea1bc60 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="7.0.1", - org.eclipse.jgit.lfs.errors;version="7.0.1", - org.eclipse.jgit.lfs.internal;version="7.0.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="7.0.1" +Export-Package: org.eclipse.jgit.lfs;version="7.1.0", + org.eclipse.jgit.lfs.errors;version="7.1.0", + org.eclipse.jgit.lfs.internal;version="7.1.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="7.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.hooks;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)" + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.hooks;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 7719266733..066068378b 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 377d91ff6b..134556d081 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index da3c62ed63..e971a9a608 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 0fb58eb4cb..1d16f52428 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 399bab2426..aabda306e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index f701d8c32b..7a797e7762 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 73a6a0e826..fc73ea87c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index fd7a8617b1..2aa2979b65 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index f575459e59..509f68834e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 3f1f3da12c..711e5b9421 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index a1c39415ce..e774a47fcb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index a4f28246da..d550bbbe05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 7726ca7f0c..88a8fd5635 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index fac003cc82..aba1324d05 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 8b7092e1fd..7054afcb27 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm.opt;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", +Import-Package: org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm.opt;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index f9aea04f72..1b67e0ae5b 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 8b1d53a5b0..26717ff61c 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,49 +14,49 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.archive;version="[7.0.1,7.1.0)", - org.eclipse.jgit.awtui;version="[7.0.1,7.1.0)", - org.eclipse.jgit.blame;version="[7.0.1,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.gitrepo;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.io;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.notes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http.apache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.archive;version="[7.1.0,7.2.0)", + org.eclipse.jgit.awtui;version="[7.1.0,7.2.0)", + org.eclipse.jgit.blame;version="[7.1.0,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.gitrepo;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.notes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="7.0.1"; +Export-Package: org.eclipse.jgit.console;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.0.1"; + org.eclipse.jgit.pgm;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="7.0.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.0.1"; + org.eclipse.jgit.pgm.debug;version="7.1.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.0.1"; + org.eclipse.jgit.pgm.internal;version="7.1.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.0.1"; + org.eclipse.jgit.pgm.opt;version="7.1.0"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index d7f0ba4a08..69f703fe12 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 5055f39040..32736cfab8 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 096eb332eb..107d3dc814 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.0.1,7.1.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.0.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.1.0";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 826108fd1f..6d42144623 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 3c5f39fc78..6c99ff97e1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index d9b0e1b901..1f8edac3a8 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -22,16 +22,16 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)", org.apache.sshd.core;version="[2.13.2,2.14.0)", org.apache.sshd.server;version="[2.13.2,2.14.0)", org.apache.sshd.server.forward;version="[2.13.2,2.14.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.sshd;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 175119eab2..b3e3d31eea 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 4ddb3ad7f0..9544c5f74a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,9 +6,9 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.1";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -23,18 +23,18 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.0.1";x-inter org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.0.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.transport.sshd;version="7.0.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.transport.sshd;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.0.1", + org.eclipse.jgit.transport.sshd.agent;version="7.1.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.13.2,2.14.0)", @@ -89,12 +89,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.client;version="[2.13.2,2.14.0)", org.apache.sshd.sftp.common;version="[2.13.2,2.14.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.fnmatch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 2db55a3fc2..d39f45f342 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 993a163c33..da42323474 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 8192be0cc3..0e1e396c7d 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e4873e4067..e141c7e7f3 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 8092a58aa5..4e004ea95e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.0.1,7.1.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.0.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index d5121038e1..675754cda6 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 2bd78a3c19..51252ee7b7 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 96b9e35a6c..a992c24509 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,64 +21,64 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io;version="[2.15.0,3.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api;version="[7.0.1,7.1.0)", - org.eclipse.jgit.api.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.archive;version="[7.0.1,7.1.0)", - org.eclipse.jgit.attributes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.awtui;version="[7.0.1,7.1.0)", - org.eclipse.jgit.blame;version="[7.0.1,7.1.0)", - org.eclipse.jgit.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.dircache;version="[7.0.1,7.1.0)", - org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.events;version="[7.0.1,7.1.0)", - org.eclipse.jgit.fnmatch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.gitrepo;version="[7.0.1,7.1.0)", - org.eclipse.jgit.hooks;version="[7.0.1,7.1.0)", - org.eclipse.jgit.ignore;version="[7.0.1,7.1.0)", - org.eclipse.jgit.ignore.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.diff;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.fsck;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.0.1", - org.eclipse.jgit.internal.storage.dfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.io;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.0.1,7.1.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit;version="[7.0.1,7.1.0)", - org.eclipse.jgit.junit.time;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lfs;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.logging;version="[7.0.1,7.1.0)", - org.eclipse.jgit.merge;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.notes;version="[7.0.1,7.1.0)", - org.eclipse.jgit.patch;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm;version="[7.0.1,7.1.0)", - org.eclipse.jgit.pgm.internal;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.file;version="[7.0.1,7.1.0)", - org.eclipse.jgit.storage.pack;version="[7.0.1,7.1.0)", - org.eclipse.jgit.submodule;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.http;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport.resolver;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.treewalk.filter;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.io;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util.sha1;version="[7.0.1,7.1.0)", + org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.archive;version="[7.1.0,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.awtui;version="[7.1.0,7.2.0)", + org.eclipse.jgit.blame;version="[7.1.0,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.events;version="[7.1.0,7.2.0)", + org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.gitrepo;version="[7.1.0,7.2.0)", + org.eclipse.jgit.hooks;version="[7.1.0,7.2.0)", + org.eclipse.jgit.ignore;version="[7.1.0,7.2.0)", + org.eclipse.jgit.ignore.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.diff;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.fsck;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.1.0", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", + org.eclipse.jgit.junit.time;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.logging;version="[7.1.0,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.notes;version="[7.1.0,7.2.0)", + org.eclipse.jgit.patch;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm;version="[7.1.0,7.2.0)", + org.eclipse.jgit.pgm.internal;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", + org.eclipse.jgit.submodule;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util.sha1;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 272d784c71..f925a282d6 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 7568d7446c..1c15155d37 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.awtui;version="7.0.1" -Import-Package: org.eclipse.jgit.errors;version="[7.0.1,7.1.0)", - org.eclipse.jgit.lib;version="[7.0.1,7.1.0)", - org.eclipse.jgit.nls;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revplot;version="[7.0.1,7.1.0)", - org.eclipse.jgit.revwalk;version="[7.0.1,7.1.0)", - org.eclipse.jgit.transport;version="[7.0.1,7.1.0)", - org.eclipse.jgit.util;version="[7.0.1,7.1.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.1.0" +Import-Package: org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", + org.eclipse.jgit.util;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 26d3f5c7ea..0819f8024f 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index da3b146355..d5fe05d98e 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index bb0afdc62f..07188a0f16 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.0.1.qualifier +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.0.1", - org.eclipse.jgit.api;version="7.0.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.1.0", + org.eclipse.jgit.api;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,18 +25,18 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.0.1"; + org.eclipse.jgit.api.errors;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.0.1"; + org.eclipse.jgit.attributes;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.0.1"; + org.eclipse.jgit.blame;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="7.0.1"; + org.eclipse.jgit.diff;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -44,53 +44,53 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.0.1"; + org.eclipse.jgit.dircache;version="7.1.0"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="7.0.1"; + org.eclipse.jgit.errors;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="7.0.1"; + org.eclipse.jgit.events;version="7.1.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.0.1", - org.eclipse.jgit.gitrepo;version="7.0.1"; + org.eclipse.jgit.fnmatch;version="7.1.0", + org.eclipse.jgit.gitrepo;version="7.1.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.0.1";x-internal:=true, - org.eclipse.jgit.hooks;version="7.0.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="7.0.1", - org.eclipse.jgit.ignore.internal;version="7.0.1"; + org.eclipse.jgit.gitrepo.internal;version="7.1.0";x-internal:=true, + org.eclipse.jgit.hooks;version="7.1.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="7.1.0", + org.eclipse.jgit.ignore.internal;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.0.1"; + org.eclipse.jgit.internal;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.0.1"; + org.eclipse.jgit.internal.diff;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.0.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.0.1"; + org.eclipse.jgit.internal.fsck;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.0.1"; + org.eclipse.jgit.internal.revwalk;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.0.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.0.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="7.0.1"; + org.eclipse.jgit.internal.storage.file;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -99,36 +99,36 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="7.0.1"; + org.eclipse.jgit.internal.storage.io;version="7.1.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.0.1"; + org.eclipse.jgit.internal.storage.memory;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.0.1"; + org.eclipse.jgit.internal.storage.pack;version="7.1.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.0.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.1.0"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="7.0.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.0.1"; + org.eclipse.jgit.internal.submodule;version="7.1.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.0.1"; + org.eclipse.jgit.internal.transport.http;version="7.1.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.0.1"; + org.eclipse.jgit.internal.transport.parser;version="7.1.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.0.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.1.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.0.1"; + org.eclipse.jgit.internal.util;version="7.1.0"; x-friends:=" org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.0.1"; + org.eclipse.jgit.lib;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -142,12 +142,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.0.1"; + org.eclipse.jgit.lib.internal;version="7.1.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.0.1", - org.eclipse.jgit.merge;version="7.0.1"; + org.eclipse.jgit.logging;version="7.1.0", + org.eclipse.jgit.merge;version="7.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -156,40 +156,40 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.0.1", - org.eclipse.jgit.notes;version="7.0.1"; + org.eclipse.jgit.nls;version="7.1.0", + org.eclipse.jgit.notes;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.0.1"; + org.eclipse.jgit.patch;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.0.1"; + org.eclipse.jgit.revplot;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="7.0.1"; + org.eclipse.jgit.revwalk;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="7.0.1"; + org.eclipse.jgit.revwalk.filter;version="7.1.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.0.1"; + org.eclipse.jgit.storage.file;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.0.1"; + org.eclipse.jgit.storage.pack;version="7.1.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.0.1"; + org.eclipse.jgit.submodule;version="7.1.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.0.1"; + org.eclipse.jgit.transport;version="7.1.0"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -202,21 +202,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.0.1"; + org.eclipse.jgit.transport.http;version="7.1.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.0.1"; + org.eclipse.jgit.transport.resolver;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.0.1"; + org.eclipse.jgit.treewalk;version="7.1.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="7.0.1"; + org.eclipse.jgit.treewalk.filter;version="7.1.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.0.1"; + org.eclipse.jgit.util;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -229,12 +229,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.0.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.0.1"; + org.eclipse.jgit.util.io;version="7.1.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.0.1", - org.eclipse.jgit.util.time;version="7.0.1" + org.eclipse.jgit.util.sha1;version="7.1.0", + org.eclipse.jgit.util.time;version="7.1.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 2ced16481f..f78f3638bd 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.0.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.0.1.qualifier";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index f01a7db3f0..e012cbc049 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 960df03570..b5ecc15494 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.0.1-SNAPSHOT + 7.1.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 3d0d754ae5aa593cba68ea0f50f87e5d1839e54e Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Wed, 4 Sep 2024 22:32:52 +0200 Subject: [releng] Bump japicmp base version to 7.0.0.202409031743-r Change-Id: I5245a8b095174946abcbbb899f9c0a7dfd504cb4 Signed-off-by: Thomas Wolf --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b5ecc15494..3a8a77ff13 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ ${commit.time.iso} - 6.10.0.202406032230-r + 7.0.0.202409031743-r 1.10.14 2.13.2 0.1.55 -- cgit v1.2.3 From e5d2898997462e0f2409c09497ab62c6cda2dbaf Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 6 Sep 2024 12:26:44 +0200 Subject: Replace custom encoder `Constants#encode` by JDK implementation Using the implementation provided in the JDK since Java 1.6 by `String#getBytes(Charset)` reduces JGit maintenance effort and improves performance. The method Constants#encode was implemented when JGit still used Java 1.5. See [1]. Kudos to Marcin for proposing to use this improvement in RefWriter [2]. I think it should be used generally. [1] https://repo.or.cz/jgit.git?a=commit;h=bfa3da225f198b19061158499b1135aff07d85b3 [2] https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1195180 Also-By: Marcin Czech Change-Id: I361ed6286b98351a315b8a8ffc3cb845831d35b2 --- org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 3eb35be79a..c27047f25d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -14,7 +14,6 @@ package org.eclipse.jgit.lib; import static java.nio.charset.StandardCharsets.UTF_8; -import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.MessageFormat; @@ -734,17 +733,7 @@ public final class Constants { * default character encoding (UTF-8). */ public static byte[] encode(String str) { - final ByteBuffer bb = UTF_8.encode(str); - final int len = bb.limit(); - if (bb.hasArray() && bb.arrayOffset() == 0) { - final byte[] arr = bb.array(); - if (arr.length == len) - return arr; - } - - final byte[] arr = new byte[len]; - bb.get(arr); - return arr; + return str.getBytes(UTF_8); } static { -- cgit v1.2.3 From 0fd76114e3436ac635641d06371fd8833179312d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 6 Sep 2024 13:42:27 +0200 Subject: Replace custom encoder Constants#encodeASCII by JDK implementation Ensure that the method still throws an IllegalArgumentException for malformed input or if the String contains unmappable characters. Change-Id: I6a340aa1af60c315272ff13b6bf2041ba30c94ca --- .../src/org/eclipse/jgit/lib/Constants.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index c27047f25d..cb4a5b51fe 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -12,8 +12,13 @@ package org.eclipse.jgit.lib; +import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.UTF_8; +import java.nio.CharBuffer; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.CharsetEncoder; +import java.nio.charset.CodingErrorAction; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.MessageFormat; @@ -714,14 +719,15 @@ public final class Constants { * the 7-bit ASCII character space. */ public static byte[] encodeASCII(String s) { - final byte[] r = new byte[s.length()]; - for (int k = r.length - 1; k >= 0; k--) { - final char c = s.charAt(k); - if (c > 127) - throw new IllegalArgumentException(MessageFormat.format(JGitText.get().notASCIIString, s)); - r[k] = (byte) c; + try { + CharsetEncoder encoder = US_ASCII.newEncoder() + .onUnmappableCharacter(CodingErrorAction.REPORT) + .onMalformedInput(CodingErrorAction.REPORT); + return encoder.encode(CharBuffer.wrap(s)).array(); + } catch (CharacterCodingException e) { + throw new IllegalArgumentException( + MessageFormat.format(JGitText.get().notASCIIString, s), e); } - return r; } /** -- cgit v1.2.3 From 62d0b220c87d6b51de620418de0a86be7af274cb Mon Sep 17 00:00:00 2001 From: "jackdt@google.com" Date: Mon, 9 Sep 2024 14:05:52 -0700 Subject: PackReverseIndex: Fix javadoc in position methods Position in the API refers to reverse-index position (offset order), not primary index position (sha1 order) Change-Id: I7dbe314dac1b3a128dd1c4ed93b9be28fd0802cc --- .../org/eclipse/jgit/internal/storage/file/PackReverseIndex.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackReverseIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackReverseIndex.java index ef9753cd79..720a3bcbff 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackReverseIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackReverseIndex.java @@ -75,20 +75,20 @@ public interface PackReverseIndex { throws CorruptObjectException; /** - * Find the position in the primary index of the object at the given pack + * Find the position in the reverse index of the object at the given pack * offset. * * @param offset * the pack offset of the object - * @return the position in the primary index of the object + * @return the position in the reverse index of the object */ int findPosition(long offset); /** - * Find the object that is in the given position in the primary index. + * Find the object that is in the given position in the reverse index. * * @param nthPosition - * the position of the object in the primary index + * the position of the object in the reverse index * @return the object in that position */ ObjectId findObjectByPosition(int nthPosition); -- cgit v1.2.3 From b7d3a44ba76a688d30fbf2ab84e92492aa7beffd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 12 Sep 2024 08:52:09 +0200 Subject: Use 2024-09 release repository in 4.33 target platform Change-Id: I30e6d8cf0690184f081d7f39d5733d4e46b86e0c --- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 8591802f38..f009edacea 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@ - + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd index d01a8a98ba..74c687834b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.tpd @@ -3,6 +3,6 @@ target "jgit-4.33" with source configurePhase include "orbit/orbit-4.33.tpd" include "maven/dependencies.tpd" -location "https://download.eclipse.org/staging/2024-09/" { +location "https://download.eclipse.org/releases/2024-09/" { org.eclipse.osgi lazy } -- cgit v1.2.3 From 022a4855203a7a008b9b412e9d64fd26c7e04d92 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 12 Sep 2024 09:01:57 +0200 Subject: Add 4.34 target platform for Eclipse 2024-12 and update org.apache.ant to 1.10.15 since Orbit updated to Ant 1.10.15. See https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12/ Change-Id: I865decbad55f0b7ca998b37cafa6c0a1eb183734 --- .../org.eclipse.jgit.target/jgit-4.34.target | 290 +++++++++++++++++++++ .../org.eclipse.jgit.target/jgit-4.34.tpd | 8 + .../org.eclipse.jgit.target/orbit/orbit-4.34.tpd | 27 ++ pom.xml | 2 +- 4 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target new file mode 100644 index 0000000000..468489f3fe --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.tukaani + xz + 1.10 + jar + + + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.13.2 + jar + + + org.apache.sshd + sshd-sftp + 2.13.2 + jar + + + + + + + org.mockito + mockito-core + 5.12.0 + jar + + + + + + + net.java.dev.jna + jna + 5.14.0 + jar + + + net.java.dev.jna + jna-platform + 5.14.0 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.10 + jar + + + org.eclipse.jetty + jetty-http + 12.0.12 + jar + + + org.eclipse.jetty + jetty-io + 12.0.12 + jar + + + org.eclipse.jetty + jetty-security + 12.0.12 + jar + + + org.eclipse.jetty + jetty-server + 12.0.12 + jar + + + org.eclipse.jetty + jetty-session + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util + 12.0.12 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.12 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + org.hamcrest + hamcrest + 2.2 + jar + + + + + + + com.google.code.gson + gson + 2.11.0 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.15.0 + jar + + + net.bytebuddy + byte-buddy-agent + 1.15.0 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.78.1 + jar + + + + + + + org.assertj + assertj-core + 3.26.3 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.17.1 + jar + + + org.apache.commons + commons-compress + 1.27.1 + jar + + + org.apache.commons + commons-lang3 + 3.16.0 + jar + + + commons-io + commons-io + 2.16.1 + jar + + + commons-logging + commons-logging + 1.3.4 + jar + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.tpd new file mode 100644 index 0000000000..4c38371748 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.tpd @@ -0,0 +1,8 @@ +target "jgit-4.34" with source configurePhase + +include "orbit/orbit-4.34.tpd" +include "maven/dependencies.tpd" + +location "https://download.eclipse.org/staging/2024-12/" { + org.eclipse.osgi lazy +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd new file mode 100644 index 0000000000..83ac838340 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd @@ -0,0 +1,27 @@ +target "orbit-4.34" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + net.i2p.crypto.eddsa [0.3.0,0.3.0] + net.i2p.crypto.eddsa.source [0.3.0,0.3.0] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} diff --git a/pom.xml b/pom.xml index 3a8a77ff13..9ea1eb27a4 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ ${commit.time.iso} 7.0.0.202409031743-r - 1.10.14 + 1.10.15 2.13.2 0.1.55 1.1.3 -- cgit v1.2.3 From 06ca004ec2e0a477ebd3f0a2d2b2596d79aea0d2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 12 Sep 2024 09:31:00 +0200 Subject: Update bytebuddy to 1.15.1 Change-Id: I244dab5dec191497ad794cd16884f2392d0fa3b8 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 1fb967fbc5..2f1d66a4a6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "0d26263eb7524252d98e602fc6942996a3195e29", ) -BYTE_BUDDY_VERSION = "1.15.0" +BYTE_BUDDY_VERSION = "1.15.1" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "a5b1159b91c5334015de0f22ab4b1188cd42bbff", + sha1 = "3072da2184d49cf642d22badee2ce36b2d6dfb92", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "e32740c43acebaac9d55b86399ecf6a5df3c17fb", + sha1 = "d5c8cbe2c1b94a5efa3f9f0736e1b3f00b5f6103", ) maven_jar( 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 e996aebab1..b022e8bc52 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 cd4f935941..e23b36b573 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 01e8071026..6b8534e30f 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 7dbb163db0..881233d375 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 985fee0dee..1e18efef63 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 afd61cf717..970f6864cd 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 0309d2f844..39cf22da2f 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 0ed6d80ca9..8f5781495b 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 b081af4a10..9d5a2e219f 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 5874693f6b..389de395f3 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index e192b624b3..166bfc1f64 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 3875520cb4..e295607540 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 01ae4ac550..44d4f67da0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 1651587a13..d1348fb37b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 9141303103..41f3aae44b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 26524a9aa2..125c550e16 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index f009edacea..ed5e230344 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 468489f3fe..cfa05d74cb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.0 + 1.15.1 jar net.bytebuddy byte-buddy-agent - 1.15.0 + 1.15.1 jar 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 8718535c78..fda99489b6 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.15.0" + version = "1.15.1" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.15.0" + version = "1.15.1" } } diff --git a/pom.xml b/pom.xml index 9ea1eb27a4..04893c9fb1 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.26.3 5.14.0 - 1.15.0 + 1.15.1 jacoco -- cgit v1.2.3 From 9524adbdc20b7c872b83c629efbd34af50e88fd0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 12 Sep 2024 09:41:10 +0200 Subject: Update org.apache.commons:commons-lang3 to 3.17.0 Change-Id: I27a657a424050f0d7cacaec0f504c00f2c77b62a --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- 20 files changed, 39 insertions(+), 39 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 2f1d66a4a6..115a5d1830 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -174,8 +174,8 @@ maven_jar( maven_jar( name = "commons-lang3", - artifact = "org.apache.commons:commons-lang3:3.16.0", - sha1 = "3eb54effe40946dfb06dc5cd6c7ce4116cd51ea4", + artifact = "org.apache.commons:commons-lang3:3.17.0", + sha1 = "b17d2136f0460dcc0d2016ceefca8723bdf4ee70", ) maven_jar( 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 b022e8bc52..8fd9a0451a 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 e23b36b573..dbc17851a8 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 6b8534e30f..2194cf1949 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 881233d375..6a112a7db2 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 1e18efef63..f9b54ed244 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 970f6864cd..4d49231c34 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 39cf22da2f..fdac70449d 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 8f5781495b..5eeae5b168 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 9d5a2e219f..fe3885cc42 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 389de395f3..4c474a14e9 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 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 166bfc1f64..a6c3489c4f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index e295607540..2000fe4a3b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 44d4f67da0..5c23f7b4c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index d1348fb37b..eb9bbba3a3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 41f3aae44b..d7fd4ae0ac 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 125c550e16..323c94d8cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index ed5e230344..3628c9c451 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index cfa05d74cb..b4248d68bb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -269,7 +269,7 @@ org.apache.commons commons-lang3 - 3.16.0 + 3.17.0 jar 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 fda99489b6..1eca384e82 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 @@ -20,7 +20,7 @@ maven apache dependency { groupId = "org.apache.commons" artifactId = "commons-lang3" - version = "3.16.0" + version = "3.17.0" } dependency { groupId = "commons-io" -- cgit v1.2.3 From 1adf927dde692c79f31548a46a9db34be2cd9923 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 12 Sep 2024 09:49:15 +0200 Subject: Update to jetty 12.0.13 Change-Id: I05772a87c351fed631d386c034e01fca9ec38fb1 --- WORKSPACE | 34 +++++++++++----------- .../org.eclipse.jgit.target/jgit-4.17.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.18.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.19.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.20.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.21.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.22.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.23.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.24.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.25.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.26.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.27.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.28.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.29.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.30.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.31.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.32.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.33.target | 18 ++++++------ .../org.eclipse.jgit.target/jgit-4.34.target | 18 ++++++------ .../org.eclipse.jgit.target/maven/dependencies.tpd | 16 +++++----- pom.xml | 2 +- 21 files changed, 188 insertions(+), 188 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 115a5d1830..76e1d6ae25 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -246,62 +246,62 @@ maven_jar( sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", ) -JETTY_VER = "12.0.12" +JETTY_VER = "12.0.13" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, - sha1 = "12f25f260a8f9fb519b6d3058260564277e618cd", - src_sha1 = "16a22f6ed585c6dcab07d111de290301373db1c7", + sha1 = "e1cb00629ed0d4091caad7e4ee542878d60978d2", + src_sha1 = "15c9b6eced1fc9fb55450b43410acdef03903282", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "962d2c5748f750aae667399481915bd02a9746e0", - src_sha1 = "e953d0e19e6e420f5e7c1f62424c4bbe0d385d15", + sha1 = "c71b4755750198d3639cd26b55c32c87be568cce", + src_sha1 = "6a181480c9c2075abfb75d03abf0ff00a7545e58", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "77591ab10113d7de7eb8a01bb4d9d23b234aebd1", - src_sha1 = "952873398a59bc5a964d9d2d130227af807559e9", + sha1 = "f7e2f539dacb3426fef1bcd66ca7a5c13d5f6409", + src_sha1 = "be6cb0c0c3a7abc9b835fe1c918af3fef9cb3689", ) maven_jar( name = "jetty-session", artifact = "org.eclipse.jetty:jetty-session:" + JETTY_VER, - sha1 = "fceae460fb4677a6cec80d3b70b1fc3ae2a114a7", - src_sha1 = "ba95d5e17a3d7f09ca908d4c0773e913f3612425", + sha1 = "dd79f830f79bd827ba8d7c9e3fd35e03315afbd8", + src_sha1 = "970836d155c4b5e6d273ad32d40a384ceda2f2e8", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "549fe58ae50b9c061d09803fb0d2659a93ce0ecd", - src_sha1 = "c7afad980b9eade12b473172a9d069d96d016677", + sha1 = "4cc207e1006a747796cb99072087d58182193ad8", + src_sha1 = "3e047c2f4842cf6a9e3b68db36a1a667aefa6a1d", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "4e2cd5c23e8ba550238f35c361c22ffb1e7bf00c", - src_sha1 = "42397797c496a51520900a529ba7e1b315aba768", + sha1 = "a8377234b4a3967ee9ecc65ee25ef93dcffeb0f8", + src_sha1 = "ad84fef838609a88d50a0ced859972a8f4dc0f19", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "f7b1e4f835c38d12668b426d327118e767d2f1d4", - src_sha1 = "0fdb95a123cc50f6adf4154edc5316cabca05f58", + sha1 = "ad63179e37e1037b901feaa9d7423c27f70fcdfe", + src_sha1 = "93354fb32122f3be1ea23c6c44c00bbf58ac506a", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "330e692032c82c305cd52c6a8e9bfba0f1da2555", - src_sha1 = "d6b9274b3ef0419a6ba869c828fd0c59c570cd9d", + sha1 = "d5caa4713c49aa2984505849b7bcab0c57b1d4c6", + src_sha1 = "dd4630c8b243725a6715caf268a8230ff9b6083a", ) BOUNCYCASTLE_VER = "1.78.1" 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 8fd9a0451a..71bd99bdc7 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 dbc17851a8..f019d3621c 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 2194cf1949..49b5d69189 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 6a112a7db2..5e65fc2075 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 f9b54ed244..53c09c15b1 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 4d49231c34..a0efc76afd 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 fdac70449d..d09ca0771c 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 5eeae5b168..9579587b62 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 fe3885cc42..923078bbf7 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 4c474a14e9..c562da6e76 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index a6c3489c4f..117835414a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 2000fe4a3b..b9469b0498 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 5c23f7b4c9..92b8d7ffcd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index eb9bbba3a3..c53a168367 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index d7fd4ae0ac..e604e68872 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 323c94d8cc..b6bcaed52e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 3628c9c451..d69b94177c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index b4248d68bb..9c81e87dc9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.10 + 12.0.13 jar org.eclipse.jetty jetty-http - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-io - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-security - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-server - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-session - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util - 12.0.12 + 12.0.13 jar org.eclipse.jetty jetty-util-ajax - 12.0.12 + 12.0.13 jar 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 1eca384e82..d67d541bd6 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 @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.10" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.12" + version = "12.0.13" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 04893c9fb1..333074a23b 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.27.1 6.0.0 6.1.0 - 12.0.12 + 12.0.13 0.21.2 4.5.14 4.4.16 -- cgit v1.2.3 From 17d3837e6c5b735b7aa3b8c0a80bb415f7c1e202 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 12 Sep 2024 10:10:17 +0200 Subject: Update org.mockito:mockito-core to 5.13.0 Change-Id: I7aa2a3ee8e5ad107992309ea1fd82eaa73bf59d6 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 21 files changed, 40 insertions(+), 40 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 76e1d6ae25..25e878c65e 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -210,8 +210,8 @@ maven_jar( maven_jar( name = "mockito", - artifact = "org.mockito:mockito-core:5.12.0", - sha1 = "22f8bbaf478e6789164787fa411a3b5ed986e110", + artifact = "org.mockito:mockito-core:5.13.0", + sha1 = "bb2ba38657ce6fa72a13d96009d0b3bb9d7ddc1e", ) maven_jar( 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 71bd99bdc7..07e1c2f077 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 f019d3621c..5dd884cbfb 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 49b5d69189..5088be0848 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 5e65fc2075..e87a5f77c5 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 53c09c15b1..ec4007fab7 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 a0efc76afd..7d91de1a22 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 d09ca0771c..800f224b79 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 9579587b62..9054d9837a 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 923078bbf7..f00b2804b7 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 c562da6e76..29d93c66a5 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 117835414a..d9f6e4eab6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index b9469b0498..9504b7f69d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 92b8d7ffcd..4cbb5bfda6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index c53a168367..81a693b2ee 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index e604e68872..ac8bb77891 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index b6bcaed52e..afc27a4d9f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index d69b94177c..baa4d04c89 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 9c81e87dc9..4c639912b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 jar 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 d67d541bd6..7be7141516 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 @@ -225,7 +225,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.12.0" + version = "5.13.0" } } diff --git a/pom.xml b/pom.xml index 333074a23b..d21d551400 100644 --- a/pom.xml +++ b/pom.xml @@ -1007,7 +1007,7 @@ org.mockito mockito-core - 5.12.0 + 5.13.0 -- cgit v1.2.3 From 77e7479a36e5e9742043d0c54a02119a1097f623 Mon Sep 17 00:00:00 2001 From: "jackdt@google.com" Date: Wed, 4 Sep 2024 16:07:23 -0700 Subject: PackIndex: Simplify Iterator/MutableEntry interaction The iterator keeps the current position in the index and the MutableEntry reads data from there on-demand, but the iterator needs to know about the entry and this creates a complicated interaction. Make MutableEntry a simple data object and let the iterator iterate and populate it before returning it. Code is clearer and implementors only needs to worry about the iterator. This fixes also MutableEntry visibility, that was preventing subclassing from out of the package. Change-Id: I35010d1f80237e421dd51b8d3d61a8ecb03e0d01 --- .../jgit/internal/storage/file/PackIndex.java | 38 ++++++++++++------- .../jgit/internal/storage/file/PackIndexV1.java | 42 +++++++++------------ .../jgit/internal/storage/file/PackIndexV2.java | 43 +++++++++------------- 3 files changed, 60 insertions(+), 63 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index c0540d5a4c..95050d472e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -302,8 +302,9 @@ public interface PackIndex * */ class MutableEntry { + /** Buffer of the ObjectId visited by the EntriesIterator. */ final MutableObjectId idBuffer = new MutableObjectId(); - + /** Offset into the packfile of the current object. */ long offset; /** @@ -321,7 +322,6 @@ public interface PackIndex * @return hex string describing the object id of this entry. */ public String name() { - ensureId(); return idBuffer.name(); } @@ -331,7 +331,6 @@ public interface PackIndex * @return a copy of the object id. */ public ObjectId toObjectId() { - ensureId(); return idBuffer.toObjectId(); } @@ -342,32 +341,32 @@ public interface PackIndex */ public MutableEntry cloneEntry() { final MutableEntry r = new MutableEntry(); - ensureId(); r.idBuffer.fromObjectId(idBuffer); r.offset = offset; return r; } - - void ensureId() { - // Override in implementations. - } } /** * Base implementation of the iterator over index entries. */ abstract class EntriesIterator implements Iterator { - protected final MutableEntry entry = initEntry(); - private final long objectCount; + private final MutableEntry entry = new MutableEntry(); + + /** Counts number of entries accessed so far. */ + private long returnedNumber = 0; + + /** + * Default constructor. + * + * @param objectCount the number of objects in the PackFile. + */ protected EntriesIterator(long objectCount) { this.objectCount = objectCount; } - protected long returnedNumber = 0; - - protected abstract MutableEntry initEntry(); @Override public boolean hasNext() { @@ -379,7 +378,18 @@ public interface PackIndex * element. */ @Override - public abstract MutableEntry next(); + public MutableEntry next() { + readNext(entry); + returnedNumber++; + return entry; + } + + /** + * Used by subclasses to load the next entry into the MutableEntry. + * + * @param entry the container of the next Iterator entry. + */ + protected abstract void readNext(MutableEntry entry); @Override public void remove() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java index d7c83785d8..99f3315811 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java @@ -203,7 +203,7 @@ class PackIndexV1 implements PackIndex { @Override public Iterator iterator() { - return new IndexV1Iterator(objectCnt); + return new EntriesIteratorV1(this); } @Override @@ -246,36 +246,30 @@ class PackIndexV1 implements PackIndex { return packChecksum; } - private class IndexV1Iterator extends EntriesIterator { - int levelOne; + private static class EntriesIteratorV1 extends EntriesIterator { + private int levelOne; - int levelTwo; + private int levelTwo; - IndexV1Iterator(long objectCount) { - super(objectCount); - } + private final PackIndexV1 packIndex; - @Override - protected MutableEntry initEntry() { - return new MutableEntry() { - @Override - protected void ensureId() { - idBuffer.fromRaw(idxdata[levelOne], levelTwo - - Constants.OBJECT_ID_LENGTH); - } - }; + private EntriesIteratorV1(PackIndexV1 packIndex) { + super(packIndex.objectCnt); + this.packIndex = packIndex; } @Override - public MutableEntry next() { - for (; levelOne < idxdata.length; levelOne++) { - if (idxdata[levelOne] == null) + protected void readNext(MutableEntry entry) { + for (; levelOne < packIndex.idxdata.length; levelOne++) { + if (packIndex.idxdata[levelOne] == null) continue; - if (levelTwo < idxdata[levelOne].length) { - entry.offset = NB.decodeUInt32(idxdata[levelOne], levelTwo); - levelTwo += Constants.OBJECT_ID_LENGTH + 4; - returnedNumber++; - return entry; + if (levelTwo < packIndex.idxdata[levelOne].length) { + entry.offset = NB.decodeUInt32(packIndex.idxdata[levelOne], + levelTwo); + this.levelTwo += Constants.OBJECT_ID_LENGTH + 4; + entry.idBuffer.fromRaw(packIndex.idxdata[levelOne], + levelTwo - Constants.OBJECT_ID_LENGTH); + return; } levelTwo = 0; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java index caf8b71180..f23380dd6b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java @@ -224,7 +224,7 @@ class PackIndexV2 implements PackIndex { @Override public Iterator iterator() { - return new EntriesIteratorV2(objectCnt); + return new EntriesIteratorV2(this); } @Override @@ -289,41 +289,34 @@ class PackIndexV2 implements PackIndex { return packChecksum; } - private class EntriesIteratorV2 extends EntriesIterator { - int levelOne; + private static class EntriesIteratorV2 extends EntriesIterator { + private int levelOne = 0; - int levelTwo; + private int levelTwo = 0; - EntriesIteratorV2(long objectCount){ - super(objectCount); - } + private final PackIndexV2 packIndex; - @Override - protected MutableEntry initEntry() { - return new MutableEntry() { - @Override - protected void ensureId() { - idBuffer.fromRaw(names[levelOne], levelTwo - - Constants.OBJECT_ID_LENGTH / 4); - } - }; + private EntriesIteratorV2(PackIndexV2 packIndex) { + super(packIndex.objectCnt); + this.packIndex = packIndex; } @Override - public MutableEntry next() { - for (; levelOne < names.length; levelOne++) { - if (levelTwo < names[levelOne].length) { + protected void readNext(MutableEntry entry) { + for (; levelOne < packIndex.names.length; levelOne++) { + if (levelTwo < packIndex.names[levelOne].length) { int idx = levelTwo / (Constants.OBJECT_ID_LENGTH / 4) * 4; - long offset = NB.decodeUInt32(offset32[levelOne], idx); + long offset = NB.decodeUInt32(packIndex.offset32[levelOne], + idx); if ((offset & IS_O64) != 0) { idx = (8 * (int) (offset & ~IS_O64)); - offset = NB.decodeUInt64(offset64, idx); + offset = NB.decodeUInt64(packIndex.offset64, idx); } entry.offset = offset; - - levelTwo += Constants.OBJECT_ID_LENGTH / 4; - returnedNumber++; - return entry; + this.levelTwo += Constants.OBJECT_ID_LENGTH / 4; + entry.idBuffer.fromRaw(packIndex.names[levelOne], + levelTwo - Constants.OBJECT_ID_LENGTH / 4); + return; } levelTwo = 0; } -- cgit v1.2.3 From c3c78ddd9243aca1d03575c37672b767daaa503c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 16 Sep 2024 12:44:00 -0700 Subject: PackWriter: Remove constructor with only Reader as param At construction time, PackWriter receives the PackConfig as a parameter or reads it from the repository. The only exception is when the constructor receives only a reader (no repo nor conf provided?!). Remove PackWriter(Reader) and let callers be explicit what conf to use. This makes clearer the flow of conf in the PackWriter. Change-Id: If12e122797ffc8c44fc3c435ca1b000ca016645b --- .../src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java | 3 ++- .../eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java | 3 ++- .../org/eclipse/jgit/internal/storage/pack/PackWriter.java | 13 ------------- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java index c95f1384e8..74e322ff7f 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowPackDelta.java @@ -31,6 +31,7 @@ import org.eclipse.jgit.pgm.Command; import org.eclipse.jgit.pgm.TextBuiltin; import org.eclipse.jgit.revwalk.RevObject; import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.util.TemporaryBuffer; import org.kohsuke.args4j.Argument; @@ -68,7 +69,7 @@ class ShowPackDelta extends TextBuiltin { ObjectReuseAsIs asis = (ObjectReuseAsIs) reader; ObjectToPack target = asis.newObjectToPack(obj, obj.getType()); - PackWriter pw = new PackWriter(reader) { + PackWriter pw = new PackWriter(new PackConfig(), reader) { @Override public void select(ObjectToPack otp, StoredObjectRepresentation next) { otp.select(next); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java index bc851f8dde..9680019f88 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackFileTest.java @@ -41,6 +41,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.transport.ReceiveCommand; import org.junit.Before; import org.junit.Test; @@ -309,7 +310,7 @@ public class DfsPackFileTest { private void assertPackSize() throws IOException { try (DfsReader ctx = db.getObjectDatabase().newReader(); - PackWriter pw = new PackWriter(ctx); + PackWriter pw = new PackWriter(new PackConfig(), ctx); ByteArrayOutputStream os = new ByteArrayOutputStream(); PackOutputStream out = new PackOutputStream( NullProgressMonitor.INSTANCE, os, pw)) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index 4350f97915..d3e30f3f6c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -302,19 +302,6 @@ public class PackWriter implements AutoCloseable { this(repo, repo.newObjectReader()); } - /** - * Create a writer to load objects from the specified reader. - *

- * Objects for packing are specified in {@link #preparePack(Iterator)} or - * {@link #preparePack(ProgressMonitor, Set, Set)}. - * - * @param reader - * reader to read from the repository with. - */ - public PackWriter(ObjectReader reader) { - this(new PackConfig(), reader); - } - /** * Create writer for specified repository. *

-- cgit v1.2.3 From 1af7aa891910131a6a6012ef156510609417bd5e Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 17 Sep 2024 13:50:59 -0700 Subject: DfsReader: Fallback to regular size read if size index throws The reader can get IOException when reading the object size index, but that index is an optimization, the size should still be available in the pack. Use the regular #getObjectSize() as a fallback when we get an IOException from the object size index. Change-Id: Ic5ec2cfc7c698aa94c6cfd5960cbab6c129f595a --- .../jgit/internal/storage/dfs/DfsReader.java | 61 +++++++++++++++++----- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java index 9cfcbaa5f7..62f6753e5d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReader.java @@ -511,18 +511,15 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs { throw new MissingObjectException(objectId.copy(), typeHint); } - if (typeHint != Constants.OBJ_BLOB || !pack.hasObjectSizeIndex(this)) { + if (typeHint != Constants.OBJ_BLOB || !safeHasObjectSizeIndex(pack)) { return pack.getObjectSize(this, objectId); } - long sz = pack.getIndexedObjectSize(this, objectId); + Optional maybeSz = safeGetIndexedObjectSize(pack, objectId); + long sz = maybeSz.orElse(-1L); if (sz >= 0) { - stats.objectSizeIndexHit += 1; return sz; } - - // Object wasn't in the index - stats.objectSizeIndexMiss += 1; return pack.getObjectSize(this, objectId); } @@ -541,23 +538,61 @@ public class DfsReader extends ObjectReader implements ObjectReuseAsIs { } stats.isNotLargerThanCallCount += 1; - if (typeHint != Constants.OBJ_BLOB || !pack.hasObjectSizeIndex(this)) { + if (typeHint != Constants.OBJ_BLOB || !safeHasObjectSizeIndex(pack)) { + return pack.getObjectSize(this, objectId) <= limit; + } + + Optional maybeSz = safeGetIndexedObjectSize(pack, objectId); + if (maybeSz.isEmpty()) { + // Exception in object size index return pack.getObjectSize(this, objectId) <= limit; } - long sz = pack.getIndexedObjectSize(this, objectId); + long sz = maybeSz.get(); + if (sz >= 0) { + return sz <= limit; + } + + if (isLimitInsideIndexThreshold(pack, limit)) { + // With threshold T, not-found means object < T + // If limit L > T, then object < T < L + return true; + } + + return pack.getObjectSize(this, objectId) <= limit; + } + + private boolean safeHasObjectSizeIndex(DfsPackFile pack) { + try { + return pack.hasObjectSizeIndex(this); + } catch (IOException e) { + return false; + } + } + + private Optional safeGetIndexedObjectSize(DfsPackFile pack, + AnyObjectId objectId) { + long sz; + try { + sz = pack.getIndexedObjectSize(this, objectId); + } catch (IOException e) { + // Do not count the exception as an index miss + return Optional.empty(); + } if (sz < 0) { stats.objectSizeIndexMiss += 1; } else { stats.objectSizeIndexHit += 1; } + return Optional.of(sz); + } - // Got size from index or we didn't but we are sure it should be there. - if (sz >= 0 || pack.getObjectSizeIndexThreshold(this) <= limit) { - return sz <= limit; + private boolean isLimitInsideIndexThreshold(DfsPackFile pack, long limit) { + try { + return pack.getObjectSizeIndexThreshold(this) <= limit; + } catch (IOException e) { + return false; } - - return pack.getObjectSize(this, objectId) <= limit; } private DfsPackFile findPackWithObject(AnyObjectId objectId) -- cgit v1.2.3 From e7d569c8c7851a6e7013d6eb4d57ba6d90c101a4 Mon Sep 17 00:00:00 2001 From: "jackdt@google.com" Date: Thu, 19 Sep 2024 13:28:27 -0700 Subject: PackIndex: Add protected setters to populate the MutableEntry Implementations of the iterator out of package receive a MutableEntry but they don't have a way to set data into it. Add setters to the MutableEntry via protected methods in the iterator. This way, only implementors of the Iterator can modify the entry (cannot be modified e.g. by callers). Change-Id: Id50c69d8be230ebdb8108acc47df13abcad0af0a --- .../jgit/internal/storage/file/PackIndex.java | 54 ++++++++++++++++++---- .../jgit/internal/storage/file/PackIndexV1.java | 8 ++-- .../jgit/internal/storage/file/PackIndexV2.java | 6 +-- 3 files changed, 53 insertions(+), 15 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index 95050d472e..dfea5c1c80 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -359,10 +359,11 @@ public interface PackIndex private long returnedNumber = 0; /** - * Default constructor. - * - * @param objectCount the number of objects in the PackFile. - */ + * Construct an iterator that can move objectCount times forward. + * + * @param objectCount + * the number of objects in the PackFile. + */ protected EntriesIterator(long objectCount) { this.objectCount = objectCount; } @@ -379,17 +380,54 @@ public interface PackIndex */ @Override public MutableEntry next() { - readNext(entry); + readNext(); returnedNumber++; return entry; } /** * Used by subclasses to load the next entry into the MutableEntry. + *

+ * Subclasses are expected to populate the entry with + * {@link #setIdBuffer} and {@link #setOffset}. + */ + protected abstract void readNext(); + + + /** + * Copies to the entry an {@link ObjectId} from the int buffer and + * position idx + * + * @param raw + * the raw data + * @param idx + * the index into {@code raw} + */ + protected void setIdBuffer(int[] raw, int idx) { + entry.idBuffer.fromRaw(raw, idx); + } + + /** + * Copies to the entry an {@link ObjectId} from the byte array at + * position idx. * - * @param entry the container of the next Iterator entry. - */ - protected abstract void readNext(MutableEntry entry); + * @param raw + * the raw data + * @param idx + * the index into {@code raw} + */ + protected void setIdBuffer(byte[] raw, int idx) { + entry.idBuffer.fromRaw(raw, idx); + } + + /** + * Sets the {@code offset} to the entry + * + * @param offset the offset in the pack file + */ + protected void setOffset(long offset) { + entry.offset = offset; + } @Override public void remove() { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java index 99f3315811..be48358a0d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV1.java @@ -259,15 +259,15 @@ class PackIndexV1 implements PackIndex { } @Override - protected void readNext(MutableEntry entry) { + protected void readNext() { for (; levelOne < packIndex.idxdata.length; levelOne++) { if (packIndex.idxdata[levelOne] == null) continue; if (levelTwo < packIndex.idxdata[levelOne].length) { - entry.offset = NB.decodeUInt32(packIndex.idxdata[levelOne], - levelTwo); + super.setOffset(NB.decodeUInt32(packIndex.idxdata[levelOne], + levelTwo)); this.levelTwo += Constants.OBJECT_ID_LENGTH + 4; - entry.idBuffer.fromRaw(packIndex.idxdata[levelOne], + super.setIdBuffer(packIndex.idxdata[levelOne], levelTwo - Constants.OBJECT_ID_LENGTH); return; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java index f23380dd6b..36e54fcd62 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexV2.java @@ -302,7 +302,7 @@ class PackIndexV2 implements PackIndex { } @Override - protected void readNext(MutableEntry entry) { + protected void readNext() { for (; levelOne < packIndex.names.length; levelOne++) { if (levelTwo < packIndex.names[levelOne].length) { int idx = levelTwo / (Constants.OBJECT_ID_LENGTH / 4) * 4; @@ -312,9 +312,9 @@ class PackIndexV2 implements PackIndex { idx = (8 * (int) (offset & ~IS_O64)); offset = NB.decodeUInt64(packIndex.offset64, idx); } - entry.offset = offset; + super.setOffset(offset); this.levelTwo += Constants.OBJECT_ID_LENGTH / 4; - entry.idBuffer.fromRaw(packIndex.names[levelOne], + super.setIdBuffer(packIndex.names[levelOne], levelTwo - Constants.OBJECT_ID_LENGTH / 4); return; } -- cgit v1.2.3 From 1332b5156a2d8413d778a630f16cd1e030ac89ef Mon Sep 17 00:00:00 2001 From: "jackdt@google.com" Date: Mon, 23 Sep 2024 13:19:48 -0700 Subject: Record failing paths in recursive merge. This is meant to help diagnose LOCK_FAILURE errors, which otherwise provides very little information in https://eclipse.googlesource.com/jgit/jgit/+/refs/heads/master/org.eclipse.jgit/src/org/eclipse/jgit/lib/BatchRefUpdate.java#731. Change-Id: I3d544c899fe66effbd107ea2f38d73f6f253a7e6 --- .../org/eclipse/jgit/internal/JGitText.properties | 2 +- .../src/org/eclipse/jgit/merge/RecursiveMerger.java | 21 +++++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 11435b8ce4..b1450ef057 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -502,7 +502,7 @@ mergeConflictOnNotes=Merge conflict on note {0}. base = {1}, ours = {2}, theirs mergeStrategyAlreadyExistsAsDefault=Merge strategy "{0}" already exists as a default strategy mergeStrategyDoesNotSupportHeads=merge strategy {0} does not support {1} heads to be merged into HEAD mergeUsingStrategyResultedInDescription=Merge of revisions {0} with base {1} using strategy {2} resulted in: {3}. {4} -mergeRecursiveConflictsWhenMergingCommonAncestors=Multiple common ancestors were found and merging them resulted in a conflict: {0}, {1} +mergeRecursiveConflictsWhenMergingCommonAncestors=Multiple common ancestors were found and merging them resulted in a conflict: {0}, {1}\nFailing paths: {2} mergeRecursiveTooManyMergeBasesFor = "More than {0} merge bases for:\n a {1}\n b {2} found:\n count {3}" mergeToolNotGivenError=No merge tool provided and no defaults configured. mergeToolNullError=Parameter for merge tool cannot be null. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java index 1162a615f2..24614f7d18 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.TimeZone; +import java.util.stream.Collectors; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -185,12 +186,15 @@ public class RecursiveMerger extends ResolveMerger { if (mergeTrees(bcTree, currentBase.getTree(), nextBase.getTree(), true)) currentBase = createCommitForTree(resultTree, parents); - else + else { + String failedPaths = failingPathsMessage(); throw new NoMergeBaseException( NoMergeBaseException.MergeBaseFailureReason.CONFLICTS_DURING_MERGE_BASE_CALCULATION, MessageFormat.format( JGitText.get().mergeRecursiveConflictsWhenMergingCommonAncestors, - currentBase.getName(), nextBase.getName())); + currentBase.getName(), nextBase.getName(), + failedPaths)); + } } } finally { inCore = oldIncore; @@ -236,4 +240,17 @@ public class RecursiveMerger extends ResolveMerger { new Date((time + 1) * 1000L), TimeZone.getTimeZone("GMT+0000")); //$NON-NLS-1$ } + + private String failingPathsMessage() { + int max = 25; + String failedPaths = failingPaths.entrySet().stream().limit(max) + .map(entry -> entry.getKey() + ":" + entry.getValue()) + .collect(Collectors.joining("\n")); + + if (failingPaths.size() > max) { + failedPaths = String.format("%s\n... (%s failing paths omitted)", + failedPaths, failingPaths.size() - max); + } + return failedPaths; + } } -- cgit v1.2.3 From c5407a2b5967e19859d9028db2ad72c54a6f047c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 24 Sep 2024 15:23:04 -0700 Subject: DfsInserter: Create PackConfig from repo instead of repo.conf PackConfig can be constructed from the repo or from a config. While browing the code, it is easier to follow the provenance of the configuration when using the repository constructor. Use the PackConfig(Repository) constructor in the DfsInserter. Internally it calls PackConfig(repo.getConfig()) so this should be a noop. Change-Id: Ifce5bc87404ca8ec9a821d28253d489056faad9a --- .../src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java index a07d8416c4..86fbd445be 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java @@ -93,7 +93,7 @@ public class DfsInserter extends ObjectInserter { */ protected DfsInserter(DfsObjDatabase db) { this.db = db; - PackConfig pc = new PackConfig(db.getRepository().getConfig()); + PackConfig pc = new PackConfig(db.getRepository()); this.minBytesForObjectSizeIndex = pc.getMinBytesForObjSizeIndex(); } -- cgit v1.2.3 From 56a5db65b3e6c0c838b29071323332439dbbc08f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 24 Sep 2024 10:51:22 +0200 Subject: AdvertisedRequestValidator: fix WantNotValidException caused by race Fetch with protocol V2 failed under the following conditions - fetch uses bidirectional protocol (git, ssh) which uses a shortcut to determine invalid wants - not all wants are advertised - race condition: wanted ref is updated during fetch by another thread after the thread serving upload-pack determined wants and before it checks not advertised wants Fix this by calling `new ReachableCommitRequestValidator().checkWants(up, wants)` instead of throwing WantNotValidException in [1] if this race happened in the same way like it's done for unidirectional protocols (http) [2]. [1] https://github.com/eclipse-jgit/jgit/blob/stable-6.10/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java#L2002 [2] https://github.com/eclipse-jgit/jgit/blob/stable-6.10/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java#L2000 Bug: jgit-48 Change-Id: I32f28502923815dc49781aab5d810c9afbe7e7e6 --- org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 3264f556fa..8b97ee10ca 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -1968,10 +1968,9 @@ public class UploadPack implements Closeable { @Override public void checkWants(UploadPack up, List wants) throws PackProtocolException, IOException { - if (!up.isBiDirectionalPipe()) + if (!up.isBiDirectionalPipe() || !wants.isEmpty()) { new ReachableCommitRequestValidator().checkWants(up, wants); - else if (!wants.isEmpty()) - throw new WantNotValidException(wants.iterator().next()); + } } } -- cgit v1.2.3 From 4ca0d13c272366cbaa503273ab29fa28b11bcdaa Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 24 Sep 2024 16:32:31 -0700 Subject: FileRepository: Remove unnecessary setConfig call The constructor of GC sets exactly the same config. Remove this set to make clearer from where the config is coming. Change-Id: Idb71c7827f180923092ef5392545df81960ee93a --- .../src/org/eclipse/jgit/internal/storage/file/FileRepository.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index b5d29a3fc8..230dc6f45a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -60,7 +60,6 @@ import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.eclipse.jgit.storage.file.FileRepositoryBuilder; -import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.IO; @@ -595,7 +594,6 @@ public class FileRepository extends Repository { @Override public void autoGC(ProgressMonitor monitor) { GC gc = new GC(this); - gc.setPackConfig(new PackConfig(this)); gc.setProgressMonitor(monitor); gc.setAuto(true); gc.setBackground(shouldAutoDetach()); -- cgit v1.2.3 From fc53ca06e4e9d145ed30d164388f52a49f72c952 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 1 Oct 2024 16:07:40 +0200 Subject: Update commons-io:commons-io to 2.17.0 Change-Id: Ib3030b917ffb1a02115345e9050180313efdc19b --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 21 files changed, 40 insertions(+), 40 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 25e878c65e..d921642545 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -180,8 +180,8 @@ maven_jar( maven_jar( name = "commons-io", - artifact = "commons-io:commons-io:2.16.1", - sha1 = "377d592e740dc77124e0901291dbfaa6810a200e", + artifact = "commons-io:commons-io:2.17.0", + sha1 = "ddcc8433eb019fb48fe25207c0278143f3e1d7e2", ) maven_jar( 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 07e1c2f077..a8fd66872c 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 5dd884cbfb..71088bb2d7 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 5088be0848..5d1986931a 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 e87a5f77c5..68853f5c5a 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 ec4007fab7..04ea7dc498 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 7d91de1a22..7209bcb44f 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 800f224b79..07300a1b79 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 9054d9837a..e7ad9ab2d5 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 f00b2804b7..14a3cfcaa0 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 29d93c66a5..a9897bacf9 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 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index d9f6e4eab6..dd7a43e399 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 9504b7f69d..cb7ebd41cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 4cbb5bfda6..3a26f08edf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 81a693b2ee..1e561237f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index ac8bb77891..f019cd5629 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index afc27a4d9f..dcc2c49ee7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index baa4d04c89..3c3766bd23 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 4c639912b0..c302558eb0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.16.1 + 2.17.0 jar 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 7be7141516..fe260930ba 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 @@ -25,7 +25,7 @@ maven apache dependency { groupId = "commons-io" artifactId = "commons-io" - version = "2.16.1" + version = "2.17.0" } dependency { groupId = "commons-logging" diff --git a/pom.xml b/pom.xml index d21d551400..5482453e61 100644 --- a/pom.xml +++ b/pom.xml @@ -898,7 +898,7 @@ org.apache.commons commons-io - 2.16.1 + 2.17.0 -- cgit v1.2.3 From e355c0e492918c55bf50ed6df59db40f233c1398 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 1 Oct 2024 16:18:04 +0200 Subject: Update bytebuddy to 1.15.3 Change-Id: Ib17b92d6f413f706ff97fb4ccf07847f4b5808ad --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index d921642545..44bc0abd27 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "0d26263eb7524252d98e602fc6942996a3195e29", ) -BYTE_BUDDY_VERSION = "1.15.1" +BYTE_BUDDY_VERSION = "1.15.3" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "3072da2184d49cf642d22badee2ce36b2d6dfb92", + sha1 = "01b3069696cd9ed55d90b9114ffe3429035ff924", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "d5c8cbe2c1b94a5efa3f9f0736e1b3f00b5f6103", + sha1 = "e619d89ed41a6cedc23bee3549cec8c4ffdaee7b", ) maven_jar( 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 a8fd66872c..2f5ec8e9c1 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 71088bb2d7..efa7ce832f 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 5d1986931a..269532b000 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 68853f5c5a..9a02088af8 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 04ea7dc498..bc0c26d2ce 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 7209bcb44f..74cc894052 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 07300a1b79..f9188671c0 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 e7ad9ab2d5..9cc7f9f55c 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 14a3cfcaa0..c03a3237cb 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 a9897bacf9..5dcdf5241a 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index dd7a43e399..a358b0d8aa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index cb7ebd41cc..bb774587d5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 3a26f08edf..8b796f145e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 1e561237f3..33eacefc25 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index f019cd5629..00e011c77a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index dcc2c49ee7..c3c95e609f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 3c3766bd23..d858cfa588 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index c302558eb0..fe77776b53 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.1 + 1.15.3 jar net.bytebuddy byte-buddy-agent - 1.15.1 + 1.15.3 jar 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 fe260930ba..5f21d76a0f 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.15.1" + version = "1.15.3" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.15.1" + version = "1.15.3" } } diff --git a/pom.xml b/pom.xml index 5482453e61..123c8058e8 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.26.3 5.14.0 - 1.15.1 + 1.15.3 jacoco -- cgit v1.2.3 From 69cc4c312a7732a93a3793962035aab14196349e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 1 Oct 2024 16:20:54 +0200 Subject: Update jna to 5.15.0 Change-Id: I164964b2173ee285d35d6d3a29caf30c0b8a6f95 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 44bc0abd27..d41fc00b31 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -122,18 +122,18 @@ maven_jar( sha1 = "334f42d5bbc8afb7f1149a37d10f8718cf59cc06", ) -JNA_VERS = "5.14.0" +JNA_VERS = "5.15.0" maven_jar( name = "jna", artifact = "net.java.dev.jna:jna:" + JNA_VERS, - sha1 = "67bf3eaea4f0718cb376a181a629e5f88fa1c9dd", + sha1 = "01ee1d80ff44f08280188f7c0e740d57207841ac", ) maven_jar( name = "jna-platform", artifact = "net.java.dev.jna:jna-platform:" + JNA_VERS, - sha1 = "28934d48aed814f11e4c584da55c49fa7032b31b", + sha1 = "86b502cad57d45da172b5e3231c537b042e296ef", ) maven_jar( 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 2f5ec8e9c1..2feafd8ba2 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 efa7ce832f..f15d3518d8 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 269532b000..6f9b9a55a8 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 9a02088af8..a51c1d6768 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 bc0c26d2ce..b247ba2f41 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 74cc894052..46367f0774 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 f9188671c0..e8394dbeae 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 9cc7f9f55c..9651dcbef5 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 c03a3237cb..e2a285acee 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 5dcdf5241a..877fdbe325 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 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index a358b0d8aa..6202171d67 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index bb774587d5..68e09268ff 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 8b796f145e..65cf677f5f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 33eacefc25..970ce2f03d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 00e011c77a..22d6f97c90 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index c3c95e609f..2ad1db86aa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index d858cfa588..6bc25692e5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index fe77776b53..58e9e8785b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.14.0 + 5.15.0 jar net.java.dev.jna jna-platform - 5.14.0 + 5.15.0 jar 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 5f21d76a0f..7a43274799 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 @@ -207,12 +207,12 @@ maven jna dependency { groupId = "net.java.dev.jna" artifactId = "jna" - version = "5.14.0" + version = "5.15.0" } dependency { groupId = "net.java.dev.jna" artifactId = "jna-platform" - version = "5.14.0" + version = "5.15.0" } } diff --git a/pom.xml b/pom.xml index 123c8058e8..0aba9f9046 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.13.0 2.2 3.26.3 - 5.14.0 + 5.15.0 1.15.3 -- cgit v1.2.3 From 36fa55a4cf14f35eeb04cbea23d678f7a34b5a70 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 1 Oct 2024 16:29:18 +0200 Subject: Update mockito to 5.14.1 Change-Id: I6da7acb4fb8188a5bd32382eca12593febff29b7 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 21 files changed, 40 insertions(+), 40 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index d41fc00b31..27d29d3763 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -210,8 +210,8 @@ maven_jar( maven_jar( name = "mockito", - artifact = "org.mockito:mockito-core:5.13.0", - sha1 = "bb2ba38657ce6fa72a13d96009d0b3bb9d7ddc1e", + artifact = "org.mockito:mockito-core:5.14.1", + sha1 = "a89b0ce9ee5d92646522caeb27fb92c02a0b4c55", ) maven_jar( 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 2feafd8ba2..bc767729b0 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 f15d3518d8..3f07e0e72d 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 6f9b9a55a8..9ff9322a0b 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 a51c1d6768..74b1c9faab 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 b247ba2f41..3204643408 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 46367f0774..27475409aa 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 e8394dbeae..a50dccae74 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 9651dcbef5..65da8b905b 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 e2a285acee..6192303a38 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 877fdbe325..80a11ecb48 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 6202171d67..0aa691dcf0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 68e09268ff..6d25716a9c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 65cf677f5f..646bcfd91b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 970ce2f03d..d83948953a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 22d6f97c90..7ed0186138 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 2ad1db86aa..bf1b6a8706 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 6bc25692e5..4c51e6fb3b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 58e9e8785b..1a30841b6f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 jar 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 7a43274799..d52dfd1957 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 @@ -225,7 +225,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.13.0" + version = "5.14.1" } } diff --git a/pom.xml b/pom.xml index 0aba9f9046..bd9fde15d5 100644 --- a/pom.xml +++ b/pom.xml @@ -1007,7 +1007,7 @@ org.mockito mockito-core - 5.13.0 + 5.14.1 -- cgit v1.2.3 From 17882b1cd8e66a174468633b1b8eb695c86011cf Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Sep 2024 08:30:39 +0200 Subject: NoteMapMerger: remove unnecessary cast Change-Id: I3be4963f506529bbadc5b6dfc0b625ee85effc1f --- org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java index 79ceb1316a..30512c17b8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java @@ -199,7 +199,7 @@ public class NoteMapMerger { if (child == null) return; if (child instanceof InMemoryNoteBucket) - b.setBucket(cell, ((InMemoryNoteBucket) child).writeTree(inserter)); + b.setBucket(cell, child.writeTree(inserter)); else b.setBucket(cell, child.getTreeId()); } -- cgit v1.2.3 From 764894804cdc6f11404e3c5b759db4b6094ce3af Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Sep 2024 08:32:55 +0200 Subject: ApacheSshProtocol2Test: remove unnecessary cast Change-Id: Ie8e7b097e48342a9cda6873e8595146a1b3f1427 --- org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF | 1 + .../tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 1f8edac3a8..f16c96040c 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -24,6 +24,7 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)", org.apache.sshd.server.forward;version="[2.13.2,2.14.0)", org.eclipse.jgit.api;version="[7.1.0,7.2.0)", org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.1.0,7.2.0)", org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java index eef0402b07..69bd5c501a 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java @@ -17,7 +17,6 @@ import java.util.Arrays; import org.eclipse.jgit.junit.ssh.SshBasicTestBase; import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.transport.SshSessionFactory; import org.eclipse.jgit.util.FS; @@ -52,7 +51,8 @@ public class ApacheSshProtocol2Test extends SshBasicTestBase { @Override public void setUp() throws Exception { super.setUp(); - StoredConfig config = ((Repository) db).getConfig(); + @SuppressWarnings("restriction") + StoredConfig config = db.getConfig(); config.setInt("protocol", null, "version", 2); config.save(); } -- cgit v1.2.3 From 7ad2be2aa1c871c105418ed42db0aad53d7729a2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Sep 2024 08:35:30 +0200 Subject: JSchSshProtocol2Test: remove unnecessary cast Change-Id: Id3767f43cbbfd0c05f9a7f0d5620943da874df92 --- org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF | 1 + .../tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 0e1e396c7d..aa32e25a4e 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java b/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java index 611d4e8bcb..8aa33e3235 100644 --- a/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java +++ b/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java @@ -22,7 +22,6 @@ import java.util.Arrays; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.junit.ssh.SshBasicTestBase; import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.RemoteSession; @@ -89,7 +88,8 @@ public class JSchSshProtocol2Test extends SshBasicTestBase { @Override public void setUp() throws Exception { super.setUp(); - StoredConfig config = ((Repository) db).getConfig(); + @SuppressWarnings("restriction") + StoredConfig config = db.getConfig(); config.setInt("protocol", null, "version", 2); config.save(); } -- cgit v1.2.3 From b1c83bfbd799647ab6762eb493f3c018938488b1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Sep 2024 08:36:31 +0200 Subject: LfsConnectionFactoryTest: remove unnecessary cast Change-Id: I08ed51b13aa269a4f6b64ac723b6bd7649c6591c --- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 1 + .../tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 0aa081ff6f..506141dd58 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.eclipse.jgit.api;version="[7.1.0,7.2.0)", org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", diff --git a/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java b/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java index badcb7d7e5..ee8e893b3e 100644 --- a/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java +++ b/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java @@ -97,7 +97,8 @@ public class LfsConnectionFactoryTest extends RepositoryTestCase { public void lfsUrlFromLocalConfig() throws Exception { addRemoteUrl("https://localhost/repo"); - StoredConfig cfg = ((Repository) db).getConfig(); + @SuppressWarnings("restriction") + StoredConfig cfg = db.getConfig(); cfg.setString(ConfigConstants.CONFIG_SECTION_LFS, null, ConfigConstants.CONFIG_KEY_URL, @@ -111,7 +112,8 @@ public class LfsConnectionFactoryTest extends RepositoryTestCase { public void lfsUrlFromOriginConfig() throws Exception { addRemoteUrl("https://localhost/repo"); - StoredConfig cfg = ((Repository) db).getConfig(); + @SuppressWarnings("restriction") + StoredConfig cfg = db.getConfig(); cfg.setString(ConfigConstants.CONFIG_SECTION_LFS, org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME, ConfigConstants.CONFIG_KEY_URL, -- cgit v1.2.3 From 06579c084d1d8494bdfbf3961cf39397069479fc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 1 Oct 2024 22:40:00 +0200 Subject: JGit v7.1.0.202410012040-m1 Signed-off-by: Matthias Sohn Change-Id: Ib48cf15ad039bc7102a8af202ffcc39ea9233b9b --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index cc2cecb6ae..01f9b5df35 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1921cf1f9d..57f2a3369d 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index da001763da..5d0a37bc70 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 4bac377fbf..fc05c34df1 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 805d2fb94b..61d7a5d554 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 0c07d5f5a1..79df1d4454 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index cb710c0daf..010245901b 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 3c01f2ad75..f0d586a05d 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e0fb94085d..5f0a871b22 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index dde8c148d9..790d8d975e 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.test - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index c71f9b6541..135220503c 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index c4442b9fbf..6dd36f8e37 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 6e3321ebf6..e4c33d601f 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 82690f8520..90ddebd9f5 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 1a541c5b02..53316eafa5 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d678a1e444..39bb1b881c 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index cd70e113cd..9c11d1d182 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7b0f5d365d..9c83a8d95e 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 23eb132afd..5cca6d9c1a 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 02fd70b8d7..3416991e8c 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f69febd1f3..d935a89621 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 58245d3404..cbadd2a3ff 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9e7ea160ba..7017897983 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 1e8eec0ac0..491e8b478f 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index ef53b03cba..8be4e83828 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fdc9f9694..5f0b0af165 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index aed8eda17c..59204585c1 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 9ce8de90b9..bf173a6236 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2e74ff506b..bbb60feb7b 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 744309749d..eafc0b898b 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 1e41d0819f..adf4c3909c 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index af83647318..56fc60b807 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 5b6870d597..b0438b923a 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 968078a644..7fa3e67cf2 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 56178d05fd..1ccde5577d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 796db2ca59..9fb4389844 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 297ee3d28d..e530765c61 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 506141dd58..f4a6e1ba97 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 42547756dc..8ea1d88bc9 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f24ea1bc60..5606b4e930 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 066068378b..76e214fa3d 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 134556d081..9fd4a7f034 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index e971a9a608..148f716d64 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 1d16f52428..a0ba1061ba 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index aabda306e9..a2268518bf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 686e561621..7860ae9d8b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 7a797e7762..79bb212227 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 7ab15719d1..c454446326 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index fc73ea87c1..729096c4b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 458b99e35e..71eee7d2c7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2aa2979b65..e1d702bf73 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index a3cdc4af05..88ea2aebd1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 509f68834e..1188080848 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 09d8053267..93e9db46f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 711e5b9421..a15bdf4199 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index e774a47fcb..db2ddd1997 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 7fafa3bbde..22bd721ed9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index d550bbbe05..d09fd1d74a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index ce1d446d7f..767fdb94ad 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 88a8fd5635..f44e199605 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 195e286499..b54c663c54 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index aba1324d05..60ca5fb9eb 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 7054afcb27..1379729c21 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 1b67e0ae5b..fa7114bd81 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 26717ff61c..23942f2c45 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 69f703fe12..6baced362b 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 32736cfab8..59e6456629 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 107d3dc814..85f812edac 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 6d42144623..9370511986 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 6c99ff97e1..0b54b70762 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index f16c96040c..4a6db70a60 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index b3e3d31eea..3411b6b64d 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 9544c5f74a..9b4c16d94f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index d39f45f342..4be2a19782 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index da42323474..94a2dfb415 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index aa32e25a4e..eac2ca048b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e141c7e7f3..994d9bed85 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 4e004ea95e..5cfe6ffdc3 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 675754cda6..2ebcf5045d 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 51252ee7b7..0823674d01 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index a992c24509..7a51468e07 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index f925a282d6..8029e8e874 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 1c15155d37..3fafdc399b 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 0819f8024f..5abbcccc40 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d5fe05d98e..e129610ef6 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 07188a0f16..a9ae1e4999 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410012040-m1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index f78f3638bd..ea293da11d 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410012040-m1 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202410012040-m1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e012cbc049..73165f53be 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index bd9fde15d5..208c8c19e9 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0-SNAPSHOT + 7.1.0.202410012040-m1 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 1c545843a3a8f9f3e915cb36dbaada43947c17a7 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 2 Oct 2024 01:36:12 +0200 Subject: Prepare 7.1.0-SNAPSHOT builds Change-Id: I6329845c41bf40a752c685fb77483d9722cd1583 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 01f9b5df35..cc2cecb6ae 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 57f2a3369d..1921cf1f9d 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 5d0a37bc70..da001763da 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index fc05c34df1..4bac377fbf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 61d7a5d554..805d2fb94b 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 79df1d4454..0c07d5f5a1 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 010245901b..cb710c0daf 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index f0d586a05d..3c01f2ad75 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 5f0a871b22..e0fb94085d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 790d8d975e..dde8c148d9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 135220503c..c71f9b6541 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 6dd36f8e37..c4442b9fbf 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index e4c33d601f..6e3321ebf6 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 90ddebd9f5..82690f8520 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 53316eafa5..1a541c5b02 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 39bb1b881c..d678a1e444 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 9c11d1d182..cd70e113cd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 9c83a8d95e..7b0f5d365d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 5cca6d9c1a..23eb132afd 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 3416991e8c..02fd70b8d7 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index d935a89621..f69febd1f3 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index cbadd2a3ff..58245d3404 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 7017897983..9e7ea160ba 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 491e8b478f..1e8eec0ac0 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 8be4e83828..ef53b03cba 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 5f0b0af165..4fdc9f9694 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 59204585c1..aed8eda17c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index bf173a6236..9ce8de90b9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index bbb60feb7b..2e74ff506b 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index eafc0b898b..744309749d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index adf4c3909c..1e41d0819f 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 56fc60b807..af83647318 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index b0438b923a..5b6870d597 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 7fa3e67cf2..968078a644 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 1ccde5577d..56178d05fd 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 9fb4389844..796db2ca59 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index e530765c61..297ee3d28d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index f4a6e1ba97..506141dd58 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 8ea1d88bc9..42547756dc 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 5606b4e930..f24ea1bc60 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 76e214fa3d..066068378b 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 9fd4a7f034..134556d081 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 148f716d64..e971a9a608 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index a0ba1061ba..1d16f52428 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index a2268518bf..aabda306e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 7860ae9d8b..686e561621 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 79bb212227..7a797e7762 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index c454446326..7ab15719d1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 729096c4b0..fc73ea87c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 71eee7d2c7..458b99e35e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index e1d702bf73..2aa2979b65 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 88ea2aebd1..a3cdc4af05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 1188080848..509f68834e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 93e9db46f3..09d8053267 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index a15bdf4199..711e5b9421 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index db2ddd1997..e774a47fcb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 22bd721ed9..7fafa3bbde 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index d09fd1d74a..d550bbbe05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 767fdb94ad..ce1d446d7f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index f44e199605..88a8fd5635 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index b54c663c54..195e286499 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 60ca5fb9eb..aba1324d05 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 1379729c21..7054afcb27 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index fa7114bd81..1b67e0ae5b 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 23942f2c45..26717ff61c 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 6baced362b..69f703fe12 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 59e6456629..32736cfab8 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 85f812edac..107d3dc814 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 9370511986..6d42144623 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 0b54b70762..6c99ff97e1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 4a6db70a60..f16c96040c 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 3411b6b64d..b3e3d31eea 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 9b4c16d94f..9544c5f74a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; uses:="org.apache.sshd.client, diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 4be2a19782..d39f45f342 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 94a2dfb415..da42323474 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index eac2ca048b..aa32e25a4e 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 994d9bed85..e141c7e7f3 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 5cfe6ffdc3..4e004ea95e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 2ebcf5045d..675754cda6 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 0823674d01..51252ee7b7 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 7a51468e07..a992c24509 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 8029e8e874..f925a282d6 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 3fafdc399b..1c15155d37 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 5abbcccc40..0819f8024f 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index e129610ef6..d5fe05d98e 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index a9ae1e4999..07188a0f16 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.202410012040-m1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index ea293da11d..f78f3638bd 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410012040-m1 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202410012040-m1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 73165f53be..e012cbc049 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 208c8c19e9..bd9fde15d5 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0.202410012040-m1 + 7.1.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 7e85e7e21e29769c596694ea8492ffbc6dc3d9af Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Mon, 10 Jun 2024 13:42:03 -0700 Subject: DfsBlockCache: use PackExtBlockCacheTable when configured Adds the usage of PackExtBlockCacheTable to the DfsBlockCache, replacing the current DfsBlockCacheTable when PackExtCacheConfigurations exists. When no PackExtCacheConfigurations exists the current DfsBlockCacheTable implementation will be used. Change-Id: I42222a0cb43785baba907a49077dd9874d19d891 --- .../internal/storage/dfs/DfsBlockCacheTest.java | 53 ++++++++++++++++++++-- .../jgit/internal/storage/dfs/DfsBlockCache.java | 10 ++-- 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTest.java index fef0563f48..3c7cc075d2 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTest.java @@ -13,20 +13,24 @@ package org.eclipse.jgit.internal.storage.dfs; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.time.Duration; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.EnumSet; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.stream.LongStream; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.LongStream; +import org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.DfsBlockCachePackExtConfig; import org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.IndexEventConsumer; import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.junit.TestRepository; @@ -39,14 +43,35 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestName; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; +@RunWith(Parameterized.class) public class DfsBlockCacheTest { @Rule public TestName testName = new TestName(); + private TestRng rng; + private DfsBlockCache cache; + private ExecutorService pool; + private enum CacheType { + SINGLE_TABLE_CLOCK_BLOCK_CACHE, EXT_SPLIT_TABLE_CLOCK_BLOCK_CACHE + } + + @Parameters(name = "cache type: {0}") + public static Iterable data() { + return Arrays.asList(CacheType.SINGLE_TABLE_CLOCK_BLOCK_CACHE, + CacheType.EXT_SPLIT_TABLE_CLOCK_BLOCK_CACHE); + } + + @Parameter + public CacheType cacheType; + @Before public void setUp() { rng = new TestRng(testName.getMethodName()); @@ -448,8 +473,28 @@ public class DfsBlockCacheTest { } private void resetCache(int concurrencyLevel) { - DfsBlockCache.reconfigure(new DfsBlockCacheConfig().setBlockSize(512) - .setConcurrencyLevel(concurrencyLevel).setBlockLimit(1 << 20)); + DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig() + .setBlockSize(512).setConcurrencyLevel(concurrencyLevel) + .setBlockLimit(1 << 20); + switch (cacheType) { + case SINGLE_TABLE_CLOCK_BLOCK_CACHE: + // SINGLE_TABLE_CLOCK_BLOCK_CACHE doesn't modify the config. + break; + case EXT_SPLIT_TABLE_CLOCK_BLOCK_CACHE: + List packExtCacheConfigs = new ArrayList<>(); + for (PackExt packExt : PackExt.values()) { + DfsBlockCacheConfig extCacheConfig = new DfsBlockCacheConfig() + .setBlockSize(512).setConcurrencyLevel(concurrencyLevel) + .setBlockLimit(1 << 20) + .setPackExtCacheConfigurations(packExtCacheConfigs); + packExtCacheConfigs.add(new DfsBlockCachePackExtConfig( + EnumSet.of(packExt), extCacheConfig)); + } + cacheConfig.setPackExtCacheConfigurations(packExtCacheConfigs); + break; + } + assertNotNull(cacheConfig); + DfsBlockCache.reconfigure(cacheConfig); cache = DfsBlockCache.getInstance(); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java index 3e1300c867..0334450fbe 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java @@ -97,7 +97,12 @@ public final class DfsBlockCache { double streamRatio = cfg.getStreamRatio(); maxStreamThroughCache = (long) (maxBytes * streamRatio); - dfsBlockCacheTable = new ClockBlockCacheTable(cfg); + if (!cfg.getPackExtCacheConfigurations().isEmpty()) { + dfsBlockCacheTable = PackExtBlockCacheTable + .fromBlockCacheConfigs(cfg); + } else { + dfsBlockCacheTable = new ClockBlockCacheTable(cfg); + } for (int i = 0; i < PackExt.values().length; ++i) { Integer limit = cfg.getCacheHotMap().get(PackExt.values()[i]); @@ -158,8 +163,7 @@ public final class DfsBlockCache { * @return total number of requests (hit + miss), per pack file extension. */ public long[] getTotalRequestCount() { - return dfsBlockCacheTable.getBlockCacheStats() - .getTotalRequestCount(); + return dfsBlockCacheTable.getBlockCacheStats().getTotalRequestCount(); } /** -- cgit v1.2.3 From dd8c3dab8af85a4c367949c06c648d1e6c9a9f4a Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Wed, 24 Jul 2024 13:56:28 -0700 Subject: dfs: add configurable name to block cache table stats The addition of a name will help show statistics broken down per inner cache table when more than one cache table is used. The name configuration is obtained from the config subsection name prefixed by `dfs`, or `dfs` for the base case. Change-Id: Ia16c794f094d756441b779e3b1f1a3c992443509 --- .../storage/dfs/ClockBlockCacheTableTest.java | 49 ++++++++++++++++++++++ .../storage/dfs/DfsBlockCacheConfigTest.java | 34 +++++++++++++++ .../storage/dfs/PackExtBlockCacheTableTest.java | 32 ++++++++++++++ .../internal/storage/dfs/ClockBlockCacheTable.java | 13 +++++- .../internal/storage/dfs/DfsBlockCacheConfig.java | 33 +++++++++++++++ .../internal/storage/dfs/DfsBlockCacheTable.java | 21 ++++++++++ .../storage/dfs/PackExtBlockCacheTable.java | 37 +++++++++++++--- 7 files changed, 212 insertions(+), 7 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTableTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTableTest.java new file mode 100644 index 0000000000..cb68bbc515 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTableTest.java @@ -0,0 +1,49 @@ +package org.eclipse.jgit.internal.storage.dfs; + +import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.DEFAULT_NAME; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; + +import org.junit.Test; + +public class ClockBlockCacheTableTest { + private static final String NAME = "name"; + + @Test + public void getName_nameNotConfigured_returnsDefaultName() { + ClockBlockCacheTable cacheTable = new ClockBlockCacheTable( + createBlockCacheConfig()); + + assertThat(cacheTable.getName(), equalTo(DEFAULT_NAME)); + } + + @Test + public void getName_nameConfigured_returnsConfiguredName() { + ClockBlockCacheTable cacheTable = new ClockBlockCacheTable( + createBlockCacheConfig().setName(NAME)); + + assertThat(cacheTable.getName(), equalTo(NAME)); + } + + @Test + public void getBlockCacheStats_nameNotConfigured_returnsBlockCacheStatsWithDefaultName() { + ClockBlockCacheTable cacheTable = new ClockBlockCacheTable( + createBlockCacheConfig()); + + assertThat(cacheTable.getBlockCacheStats().getName(), + equalTo(DEFAULT_NAME)); + } + + @Test + public void getBlockCacheStats_nameConfigured_returnsBlockCacheStatsWithConfiguredName() { + ClockBlockCacheTable cacheTable = new ClockBlockCacheTable( + createBlockCacheConfig().setName(NAME)); + + assertThat(cacheTable.getBlockCacheStats().getName(), equalTo(NAME)); + } + + private static DfsBlockCacheConfig createBlockCacheConfig() { + return new DfsBlockCacheConfig().setBlockSize(512) + .setConcurrencyLevel(4).setBlockLimit(1024); + } +} \ No newline at end of file diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java index c93f48d79c..4b7aae05f0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java @@ -38,6 +38,7 @@ package org.eclipse.jgit.internal.storage.dfs; +import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.DEFAULT_NAME; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_CACHE_PREFIX; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; @@ -48,6 +49,7 @@ import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PACK_EXTENSIONS; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_RATIO; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.closeTo; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThrows; @@ -172,6 +174,38 @@ public class DfsBlockCacheConfigTest { is(indexConfig)); } + @Test + public void fromConfigs_baseConfigOnly_nameSetFromConfigDfsSubSection() { + Config config = new Config(); + + DfsBlockCacheConfig blockCacheConfig = new DfsBlockCacheConfig() + .fromConfig(config); + assertThat(blockCacheConfig.getName(), equalTo(DEFAULT_NAME)); + } + + @Test + public void fromConfigs_namesSetFromConfigDfsCachePrefixSubSections() { + Config config = new Config(); + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_STREAM_RATIO, "0.5"); + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_CACHE_PREFIX + "name1", + CONFIG_KEY_PACK_EXTENSIONS, PackExt.PACK.name()); + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_CACHE_PREFIX + "name2", + CONFIG_KEY_PACK_EXTENSIONS, PackExt.BITMAP_INDEX.name()); + + DfsBlockCacheConfig blockCacheConfig = new DfsBlockCacheConfig() + .fromConfig(config); + assertThat(blockCacheConfig.getName(), equalTo("dfs")); + assertThat( + blockCacheConfig.getPackExtCacheConfigurations().get(0) + .getPackExtCacheConfiguration().getName(), + equalTo("dfs.name1")); + assertThat( + blockCacheConfig.getPackExtCacheConfigurations().get(1) + .getPackExtCacheConfiguration().getName(), + equalTo("dfs.name2")); + } + @Test public void fromConfigs_dfsBlockCachePackExtConfigWithDuplicateExtensions_throws() { Config config = new Config(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java index 8c003e0cb3..f2a5abcacd 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java @@ -11,6 +11,7 @@ package org.eclipse.jgit.internal.storage.dfs; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNotNull; @@ -37,6 +38,8 @@ import org.mockito.Mockito; @SuppressWarnings({ "boxing", "unchecked" }) public class PackExtBlockCacheTableTest { + private static final String CACHE_NAME = "CacheName"; + @Test public void fromBlockCacheConfigs_createsDfsPackExtBlockCacheTables() { DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig(); @@ -384,6 +387,29 @@ public class PackExtBlockCacheTableTest { assertThat(tables.get(dfsStreamKey, 0), sameInstance(ref)); } + @Test + public void getName() { + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + cacheTableWithStats(/* name= */ "defaultName", packStats), + Map.of(PackExt.PACK, cacheTableWithStats(/* name= */ "packName", + packStats))); + + assertThat(tables.getName(), equalTo("defaultName,packName")); + } + + @Test + public void getBlockCacheStats_getName_returnsPackExtCacheTableName() { + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( + cacheTableWithStats(/* name= */ "defaultName", packStats), + Map.of(PackExt.PACK, cacheTableWithStats(/* name= */ "packName", + packStats))); + + assertThat(tables.getBlockCacheStats().getName(), + equalTo("defaultName,packName")); + } + @Test public void getBlockCacheStats_getCurrentSize_consolidatesAllTableCurrentSizes() { long[] currentSizes = createEmptyStatsArray(); @@ -573,7 +599,13 @@ public class PackExtBlockCacheTableTest { private static DfsBlockCacheTable cacheTableWithStats( DfsBlockCacheStats dfsBlockCacheStats) { + return cacheTableWithStats(CACHE_NAME, dfsBlockCacheStats); + } + + private static DfsBlockCacheTable cacheTableWithStats(String name, + DfsBlockCacheStats dfsBlockCacheStats) { DfsBlockCacheTable cacheTable = mock(DfsBlockCacheTable.class); + when(cacheTable.getName()).thenReturn(name); when(cacheTable.getBlockCacheStats()).thenReturn(dfsBlockCacheStats); return cacheTable; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java index ce71a71d67..bbee23b061 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java @@ -47,6 +47,11 @@ import org.eclipse.jgit.internal.storage.pack.PackExt; * invocations is also fixed in size. */ final class ClockBlockCacheTable implements DfsBlockCacheTable { + /** + * Table name. + */ + private final String name; + /** Number of entries in {@link #table}. */ private final int tableSize; @@ -129,7 +134,8 @@ final class ClockBlockCacheTable implements DfsBlockCacheTable { -1, 0, null); clockHand.next = clockHand; - this.dfsBlockCacheStats = new DfsBlockCacheStats(); + this.name = cfg.getName(); + this.dfsBlockCacheStats = new DfsBlockCacheStats(this.name); this.refLockWaitTime = cfg.getRefLockWaitTimeConsumer(); this.indexEventConsumer = cfg.getIndexEventConsumer(); } @@ -139,6 +145,11 @@ final class ClockBlockCacheTable implements DfsBlockCacheTable { return dfsBlockCacheStats; } + @Override + public String getName() { + return name; + } + @Override public boolean hasBlock0(DfsStreamKey key) { HashEntry e1 = table.get(slot(key, 0)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index fa68b979fb..52eb9e0785 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -49,6 +49,10 @@ public class DfsBlockCacheConfig { /** Default number of max cache hits. */ public static final int DEFAULT_CACHE_HOT_MAX = 1; + static final String DEFAULT_NAME = ""; + + private String name; + private long blockLimit; private int blockSize; @@ -69,6 +73,7 @@ public class DfsBlockCacheConfig { * Create a default configuration. */ public DfsBlockCacheConfig() { + name = DEFAULT_NAME; setBlockLimit(32 * MB); setBlockSize(64 * KB); setStreamRatio(0.30); @@ -77,6 +82,29 @@ public class DfsBlockCacheConfig { packExtCacheConfigurations = Collections.emptyList(); } + /** + * Get the name for the block cache configured by this cache config. + * + * @return the name for the block cache configured by this cache config. + */ + public String getName() { + return name; + } + + /** + * Set the name for the block cache configured by this cache config. + *

+ * Made visible for testing. + * + * @param name + * the name for the block cache configured by this cache config. + * @return {@code this} + */ + DfsBlockCacheConfig setName(String name) { + this.name = name; + return this; + } + /** * Get maximum number bytes of heap memory to dedicate to caching pack file * data. @@ -308,6 +336,11 @@ public class DfsBlockCacheConfig { Long.valueOf(cfgBlockLimit), Long.valueOf(cfgBlockSize))); } + // Set name only if `core dfs` is configured, otherwise fall back to the + // default. + if (rc.getSubsections(section).contains(subSection)) { + this.name = subSection; + } setBlockLimit(cfgBlockLimit); setBlockSize(cfgBlockSize); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java index 309f2d1595..de5dc23963 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java @@ -137,10 +137,19 @@ public interface DfsBlockCacheTable { */ BlockCacheStats getBlockCacheStats(); + /** + * Get the name of the table. + * + * @return this table's name. + */ + String getName(); + /** * Provides methods used with Block Cache statistics. */ interface BlockCacheStats { + String getName(); + /** * Get total number of bytes in the cache, per pack file extension. * @@ -195,6 +204,8 @@ public interface DfsBlockCacheTable { * Keeps track of stats for a Block Cache table. */ class DfsBlockCacheStats implements BlockCacheStats { + private final String name; + /** * Number of times a block was found in the cache, per pack file * extension. @@ -220,12 +231,22 @@ public interface DfsBlockCacheTable { private final AtomicReference liveBytes; DfsBlockCacheStats() { + this(""); + } + + DfsBlockCacheStats(String name) { + this.name = name; statHit = new AtomicReference<>(newCounters()); statMiss = new AtomicReference<>(newCounters()); statEvict = new AtomicReference<>(newCounters()); liveBytes = new AtomicReference<>(newCounters()); } + @Override + public String getName() { + return name; + } + /** * Increment the {@code statHit} count. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java index 858f731b70..7f21b3f10a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java @@ -37,6 +37,11 @@ import org.eclipse.jgit.internal.storage.pack.PackExt; * type. */ class PackExtBlockCacheTable implements DfsBlockCacheTable { + /** + * Table name. + */ + private final String name; + private final DfsBlockCacheTable defaultBlockCacheTable; // Holds the unique tables backing the extBlockCacheTables values. @@ -120,13 +125,19 @@ class PackExtBlockCacheTable implements DfsBlockCacheTable { Set blockCacheTables = new HashSet<>(); blockCacheTables.add(defaultBlockCacheTable); blockCacheTables.addAll(packExtBlockCacheTables.values()); - return new PackExtBlockCacheTable(defaultBlockCacheTable, + String name = defaultBlockCacheTable.getName() + "," + + packExtBlockCacheTables.values().stream() + .map(DfsBlockCacheTable::getName).sorted() + .collect(Collectors.joining(",")); + return new PackExtBlockCacheTable(name, defaultBlockCacheTable, List.copyOf(blockCacheTables), packExtBlockCacheTables); } - private PackExtBlockCacheTable(DfsBlockCacheTable defaultBlockCacheTable, + private PackExtBlockCacheTable(String name, + DfsBlockCacheTable defaultBlockCacheTable, List blockCacheTableList, Map extBlockCacheTables) { + this.name = name; this.defaultBlockCacheTable = defaultBlockCacheTable; this.blockCacheTableList = blockCacheTableList; this.extBlockCacheTables = extBlockCacheTables; @@ -178,9 +189,15 @@ class PackExtBlockCacheTable implements DfsBlockCacheTable { @Override public BlockCacheStats getBlockCacheStats() { - return new CacheStats(blockCacheTableList.stream() - .map(DfsBlockCacheTable::getBlockCacheStats) - .collect(Collectors.toList())); + return new CacheStats(name, + blockCacheTableList.stream() + .map(DfsBlockCacheTable::getBlockCacheStats) + .collect(Collectors.toList())); + } + + @Override + public String getName() { + return name; } private DfsBlockCacheTable getTable(PackExt packExt) { @@ -198,12 +215,20 @@ class PackExtBlockCacheTable implements DfsBlockCacheTable { } private static class CacheStats implements BlockCacheStats { + private final String name; + private final List blockCacheStats; - private CacheStats(List blockCacheStats) { + private CacheStats(String name, List blockCacheStats) { + this.name = name; this.blockCacheStats = blockCacheStats; } + @Override + public String getName() { + return name; + } + @Override public long[] getCurrentSize() { long[] sums = emptyPackStats(); -- cgit v1.2.3 From c99c8b9d00063fd177e4e895ac3e155cd2a0b437 Mon Sep 17 00:00:00 2001 From: Kamil Musin Date: Tue, 8 Oct 2024 13:25:53 +0200 Subject: Remove unnecessary argument handler in MergeBase.java Currently the parsing of command line arguments always results in an error. ``` fatal: Argument "commit-ish" is required ``` This is caused by the fact that the first method (commit_0) is invoked twice. (As if the multiValued = true). I couldn't figure out, why that would be the case, as it's defaults to false and RevCommit handler doesn't seem to have a logic that would override that either. In any case, defining Arguments like this is unnecessary as it's sufficient to define a single ArrayList @Argument that will accumulate all commits. Change-Id: Ifd1278b3059f86618db05bfe264dd5c00879d82b --- org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java index aacde2f430..a29c4d9f36 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeBase.java @@ -26,11 +26,6 @@ class MergeBase extends TextBuiltin { private boolean all; @Argument(index = 0, metaVar = "metaVar_commitish", required = true) - void commit_0(final RevCommit c) { - commits.add(c); - } - - @Argument(index = 1, metaVar = "metaVar_commitish", required = true) private List commits = new ArrayList<>(); @Override -- cgit v1.2.3 From 0155f8bf6e569b487251767be985332a438ccc39 Mon Sep 17 00:00:00 2001 From: Kamil Musin Date: Tue, 8 Oct 2024 13:36:00 +0200 Subject: RevolveMerger: honor ignoreConflicts also for binary files Currently difference in binary files during merge will cause them to be added to unmergedPaths regardless of whether ignoreConflicts is true. This creates an issue during merging with strategy "RECURSIVE", as it makes it impossible to create a virtual commit if there is a difference in a binary file. Resulting in the CONFLICTS_DURING_MERGE_BASE_CALCULATION error being thrown. This is especially problematic, since JGit has a rather simplistic rules for considering file binary, which easily leads to false positives. What we should do instead is keep OURS. This will not lead to silently ignoring difference in the final result. It will allow creation of virtual merge-base commit, and then the difference would be presented again in the final merge results. In essense it only affects what's shown as BASE in 3-way merge. Additionally, this is correct because - It's consistent with treatment of other unmergeable entities, for example Gitlinks - It's consistent with behaviour of CGit: - https://git-scm.com/docs/gitattributes#Documentation/gitattributes.txt-binary states on diffs in binary OURS is picked by default. - In code: https://git.kernel.org/pub/scm/git/git.git/tree/merge-ll.c#n81 - ignoreConflicts in CGit afterwards ignores all issues with content merging https://git.kernel.org/pub/scm/git/git.git/tree/merge-ort.c#n5201 We also adjust the behaviour when .gitattributes tell us to treat the file as binary for the purpose of the merge. We only change the behaviour when ignoreConlicts = true, as otherwise the current behaviour works as intended. Change-Id: I2b69f80a13d250aad3fe12dd438b2763f3022270 --- .../tst/org/eclipse/jgit/merge/MergerTest.java | 70 ++++++++++++++++++++++ .../src/org/eclipse/jgit/merge/ResolveMerger.java | 17 +++++- 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java index 3a036acaca..c6a6321cf8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergerTest.java @@ -1792,7 +1792,77 @@ public class MergerTest extends RepositoryTestCase { // children mergeResult = git.merge().include(commitC3S).call(); assertEquals(mergeResult.getMergeStatus(), MergeStatus.MERGED); + } + + /** + * Merging two commits when binary files have equal content, but conflicting content in the + * virtual ancestor. + * + *

+ * This test has the same set up as + * {@code checkFileDirMergeConflictInVirtualAncestor_NoConflictInChildren}, only + * with the content conflict in A1 and A2. + */ + @Theory + public void checkBinaryMergeConflictInVirtualAncestor(MergeStrategy strategy) throws Exception { + if (!strategy.equals(MergeStrategy.RECURSIVE)) { + return; + } + + Git git = Git.wrap(db); + + // master + writeTrashFile("c", "initial file"); + git.add().addFilepattern("c").call(); + RevCommit commitI = git.commit().setMessage("Initial commit").call(); + + writeTrashFile("a", "\0\1\1\1\1\0"); // content in Ancestor 1 + git.add().addFilepattern("a").call(); + RevCommit commitA1 = git.commit().setMessage("Ancestor 1").call(); + + writeTrashFile("a", "\0\1\2\3\4\5\0"); // content in Child 1 (commited on master) + git.add().addFilepattern("a").call(); + // commit C1M + git.commit().setMessage("Child 1 on master").call(); + + git.checkout().setCreateBranch(true).setStartPoint(commitI).setName("branch-to-merge").call(); + writeTrashFile("a", "\0\2\2\2\2\0"); // content in Ancestor 1 + git.add().addFilepattern("a").call(); + RevCommit commitA2 = git.commit().setMessage("Ancestor 2").call(); + + // second branch + git.checkout().setCreateBranch(true).setStartPoint(commitA1).setName("second-branch").call(); + writeTrashFile("a", "\0\5\4\3\2\1\0"); // content in Child 2 (commited on second-branch) + git.add().addFilepattern("a").call(); + // commit C2S + git.commit().setMessage("Child 2 on second-branch").call(); + // Merge branch-to-merge into second-branch + MergeResult mergeResult = git.merge().include(commitA2).setStrategy(strategy).call(); + assertEquals(mergeResult.getNewHead(), null); + assertEquals(mergeResult.getMergeStatus(), MergeStatus.CONFLICTING); + // Resolve the conflict manually + writeTrashFile("a", "\0\3\3\3\3\0"); // merge conflict resolution + git.add().addFilepattern("a").call(); + RevCommit commitC3S = git.commit().setMessage("Child 3 on second bug - resolve merge conflict").call(); + + // Merge branch-to-merge into master + git.checkout().setName("master").call(); + mergeResult = git.merge().include(commitA2).setStrategy(strategy).call(); + assertEquals(mergeResult.getNewHead(), null); + assertEquals(mergeResult.getMergeStatus(), MergeStatus.CONFLICTING); + + // Resolve the conflict manually - set the same value as in resolution above + writeTrashFile("a", "\0\3\3\3\3\0"); // merge conflict resolution + git.add().addFilepattern("a").call(); + // commit C4M + git.commit().setMessage("Child 4 on master - resolve merge conflict").call(); + + // Merge C4M (second-branch) into master (C3S) + // Conflict in virtual base should be here, but there are no conflicts in + // children + mergeResult = git.merge().include(commitC3S).call(); + assertEquals(mergeResult.getMergeStatus(), MergeStatus.MERGED); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 1ad41be423..50c2c1570c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -1273,6 +1273,13 @@ public class ResolveMerger extends ThreeWayMerger { default: break; } + if (ignoreConflicts) { + // If the path is selected to be treated as binary via attributes, we do not perform + // content merge. When ignoreConflicts = true, we simply keep OURS to allow virtual commit + // to be built. + keep(ourDce); + return true; + } // add the conflicting path to merge result String currentPath = tw.getPathString(); MergeResult result = new MergeResult<>( @@ -1312,8 +1319,12 @@ public class ResolveMerger extends ThreeWayMerger { addToCheckout(currentPath, null, attributes); return true; } catch (BinaryBlobException e) { - // if the file is binary in either OURS, THEIRS or BASE - // here, we don't have an option to ignore conflicts + // The file is binary in either OURS, THEIRS or BASE + if (ignoreConflicts) { + // When ignoreConflicts = true, we simply keep OURS to allow virtual commit to be built. + keep(ourDce); + return true; + } } } switch (getContentMergeStrategy()) { @@ -1354,6 +1365,8 @@ public class ResolveMerger extends ThreeWayMerger { } } } else { + // This is reachable if contentMerge() call above threw BinaryBlobException, so we don't + // need to check ignoreConflicts here, since it's already handled above. result.setContainsConflicts(true); addConflict(base, ours, theirs); unmergedPaths.add(currentPath); -- cgit v1.2.3 From 7a4c059322f13dace12b8a3be5e8e4ee0cb088bc Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Tue, 8 Oct 2024 14:46:22 -0700 Subject: WindowCursor: Fix parameter name in javadoc This doc was copied from another where the parameter had a shorter name. Change-Id: I6ae1afa525f02e26ab7224cced56db946f679bb8 Signed-off-by: Nasser Grainawi --- .../src/org/eclipse/jgit/internal/storage/file/WindowCursor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java index 01f514b939..11c45471e4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCursor.java @@ -205,7 +205,7 @@ final class WindowCursor extends ObjectReader implements ObjectReuseAsIs { * @param cnt * number of bytes to copy. This value may exceed the number of * bytes remaining in the window starting at offset - * pos. + * position. * @return number of bytes actually copied; this may be less than * cnt if cnt exceeded the number of bytes * available. -- cgit v1.2.3 From 81d552ed586e9dd1a2ea73b771d3626ad2e82994 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 9 Oct 2024 02:04:25 +0200 Subject: orbit-4.34: update junit bundle to 4.13.2.v20240929-1000 Change-Id: I641c4dc44af47106149804fa05313d62d4f33325 --- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/orbit/orbit-4.34.tpd | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 1a30841b6f..5f1053f457 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -20,8 +20,8 @@ - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd index 83ac838340..15931db8c7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd @@ -18,8 +18,8 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024 org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] org.objenesis [3.4,3.4] org.objenesis.source [3.4,3.4] org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] -- cgit v1.2.3 From 30134f214e3746594f8a6dd454504cdb9c0e3865 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 9 Oct 2024 02:04:55 +0200 Subject: Update Apache sshd to 2.14.0 This fixes an 'incorrect signature' error when trying to use the keys generated by SSHD during server init with an OpenSSH client. This also includes a few other changes since 2.13.2: * GH-524 Performance improvements * GH-533 Fix multi-step authentication * GH-582 Fix filtering in NamedFactory * GH-587 Prevent NullPointerExceptionon closed channel in NettyIoSession * GH-590 Better support for FIPS * GH-597 Pass on Charset in ClientSession.executeRemoteCommand() https://github.com/apache/mina-sshd/releases/tag/sshd-2.14.0 Change-Id: I76909fd56e70ee4ce16a075bd40ed6b2a609cc47 --- WORKSPACE | 6 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 50 +++++----- .../org.eclipse.jgit.target/jgit-4.17.target | 6 +- .../org.eclipse.jgit.target/jgit-4.18.target | 6 +- .../org.eclipse.jgit.target/jgit-4.19.target | 6 +- .../org.eclipse.jgit.target/jgit-4.20.target | 6 +- .../org.eclipse.jgit.target/jgit-4.21.target | 6 +- .../org.eclipse.jgit.target/jgit-4.22.target | 6 +- .../org.eclipse.jgit.target/jgit-4.23.target | 6 +- .../org.eclipse.jgit.target/jgit-4.24.target | 6 +- .../org.eclipse.jgit.target/jgit-4.25.target | 6 +- .../org.eclipse.jgit.target/jgit-4.26.target | 6 +- .../org.eclipse.jgit.target/jgit-4.27.target | 6 +- .../org.eclipse.jgit.target/jgit-4.28.target | 6 +- .../org.eclipse.jgit.target/jgit-4.29.target | 6 +- .../org.eclipse.jgit.target/jgit-4.30.target | 6 +- .../org.eclipse.jgit.target/jgit-4.31.target | 6 +- .../org.eclipse.jgit.target/jgit-4.32.target | 6 +- .../org.eclipse.jgit.target/jgit-4.33.target | 6 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 28 +++--- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 104 ++++++++++----------- pom.xml | 2 +- 24 files changed, 151 insertions(+), 151 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 27d29d3763..1e73782592 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -108,18 +108,18 @@ maven_jar( sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", ) -SSHD_VERS = "2.13.2" +SSHD_VERS = "2.14.0" maven_jar( name = "sshd-osgi", artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, - sha1 = "34914a5bef9ba3d04971fdec1273b47df835b038", + sha1 = "6ef66228a088f8ac1383b2ff28f3102f80ebc01a", ) maven_jar( name = "sshd-sftp", artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, - sha1 = "334f42d5bbc8afb7f1149a37d10f8718cf59cc06", + sha1 = "c070ac920e72023ae9ab0a3f3a866bece284b470", ) JNA_VERS = "5.15.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index aed8eda17c..9bbabc6007 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -8,31 +8,31 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.apache.sshd.common;version="[2.13.2,2.14.0)", - org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)", - org.apache.sshd.common.file.virtualfs;version="[2.13.2,2.14.0)", - org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)", - org.apache.sshd.common.io;version="[2.13.2,2.14.0)", - org.apache.sshd.common.kex;version="[2.13.2,2.14.0)", - org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)", - org.apache.sshd.common.session;version="[2.13.2,2.14.0)", - org.apache.sshd.common.signature;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.buffer;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.logging;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.threads;version="[2.13.2,2.14.0)", - org.apache.sshd.core;version="[2.13.2,2.14.0)", - org.apache.sshd.server;version="[2.13.2,2.14.0)", - org.apache.sshd.server.auth;version="[2.13.2,2.14.0)", - org.apache.sshd.server.auth.gss;version="[2.13.2,2.14.0)", - org.apache.sshd.server.auth.keyboard;version="[2.13.2,2.14.0)", - org.apache.sshd.server.auth.password;version="[2.13.2,2.14.0)", - org.apache.sshd.server.command;version="[2.13.2,2.14.0)", - org.apache.sshd.server.session;version="[2.13.2,2.14.0)", - org.apache.sshd.server.shell;version="[2.13.2,2.14.0)", - org.apache.sshd.server.subsystem;version="[2.13.2,2.14.0)", - org.apache.sshd.sftp;version="[2.13.2,2.14.0)", - org.apache.sshd.sftp.server;version="[2.13.2,2.14.0)", +Import-Package: org.apache.sshd.common;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.common.file.virtualfs;version="[2.14.0,2.15.0)", + org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", + org.apache.sshd.common.io;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", + org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", + org.apache.sshd.common.session;version="[2.14.0,2.15.0)", + org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.threads;version="[2.14.0,2.15.0)", + org.apache.sshd.core;version="[2.14.0,2.15.0)", + org.apache.sshd.server;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth.gss;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth.keyboard;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth.password;version="[2.14.0,2.15.0)", + org.apache.sshd.server.command;version="[2.14.0,2.15.0)", + org.apache.sshd.server.session;version="[2.14.0,2.15.0)", + org.apache.sshd.server.shell;version="[2.14.0,2.15.0)", + org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)", org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", org.eclipse.jgit.api;version="[7.1.0,7.2.0)", org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", 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 bc767729b0..588dfd37ae 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 3f07e0e72d..ff1273c703 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 9ff9322a0b..c538cc1ef4 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 74b1c9faab..7d55a95e33 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 3204643408..657f57091b 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 27475409aa..a080f951aa 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 a50dccae74..69c87ad04b 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 65da8b905b..4275429bed 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 6192303a38..7064c466ac 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 80a11ecb48..0ffc4d089e 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 0aa691dcf0..7bc490c360 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 6d25716a9c..da784ea7b1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 646bcfd91b..18fb243fcc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index d83948953a..5925e02403 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 7ed0186138..1fb2c0b0eb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index bf1b6a8706..6b9f65983b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 4c51e6fb3b..82e6953cb6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 5f1053f457..9b5bd088fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.13.2 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.13.2 + 2.14.0 jar 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 d52dfd1957..d840043ae5 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 @@ -238,12 +238,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.13.2" + version = "2.14.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.13.2" + version = "2.14.0" } } diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index f16c96040c..546dfd4a1d 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,20 +8,20 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)", - org.apache.sshd.common;version="[2.13.2,2.14.0)", - org.apache.sshd.common.auth;version="[2.13.2,2.14.0)", - org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)", - org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)", - org.apache.sshd.common.kex;version="[2.13.2,2.14.0)", - org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)", - org.apache.sshd.common.session;version="[2.13.2,2.14.0)", - org.apache.sshd.common.signature;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.net;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)", - org.apache.sshd.core;version="[2.13.2,2.14.0)", - org.apache.sshd.server;version="[2.13.2,2.14.0)", - org.apache.sshd.server.forward;version="[2.13.2,2.14.0)", +Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", + org.apache.sshd.common;version="[2.14.0,2.15.0)", + org.apache.sshd.common.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", + org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", + org.apache.sshd.common.session;version="[2.14.0,2.15.0)", + org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", + org.apache.sshd.core;version="[2.14.0,2.15.0)", + org.apache.sshd.server;version="[2.14.0,2.15.0)", + org.apache.sshd.server.forward;version="[2.14.0,2.15.0)", org.eclipse.jgit.api;version="[7.1.0,7.2.0)", org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 9544c5f74a..69f23a5ebe 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -37,58 +37,58 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-inter org.eclipse.jgit.transport.sshd.agent;version="7.1.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.13.2,2.14.0)", - org.apache.sshd.client;version="[2.13.2,2.14.0)", - org.apache.sshd.client.auth;version="[2.13.2,2.14.0)", - org.apache.sshd.client.auth.keyboard;version="[2.13.2,2.14.0)", - org.apache.sshd.client.auth.password;version="[2.13.2,2.14.0)", - org.apache.sshd.client.auth.pubkey;version="[2.13.2,2.14.0)", - org.apache.sshd.client.channel;version="[2.13.2,2.14.0)", - org.apache.sshd.client.config.hosts;version="[2.13.2,2.14.0)", - org.apache.sshd.client.config.keys;version="[2.13.2,2.14.0)", - org.apache.sshd.client.future;version="[2.13.2,2.14.0)", - org.apache.sshd.client.keyverifier;version="[2.13.2,2.14.0)", - org.apache.sshd.client.session;version="[2.13.2,2.14.0)", - org.apache.sshd.client.session.forward;version="[2.13.2,2.14.0)", - org.apache.sshd.common;version="[2.13.2,2.14.0)", - org.apache.sshd.common.auth;version="[2.13.2,2.14.0)", - org.apache.sshd.common.channel;version="[2.13.2,2.14.0)", - org.apache.sshd.common.cipher;version="[2.13.2,2.14.0)", - org.apache.sshd.common.compression;version="[2.13.2,2.14.0)", - org.apache.sshd.common.config.keys;version="[2.13.2,2.14.0)", - org.apache.sshd.common.config.keys.loader;version="[2.13.2,2.14.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.13.2,2.14.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.13.2,2.14.0)", - org.apache.sshd.common.digest;version="[2.13.2,2.14.0)", - org.apache.sshd.common.forward;version="[2.13.2,2.14.0)", - org.apache.sshd.common.future;version="[2.13.2,2.14.0)", - org.apache.sshd.common.helpers;version="[2.13.2,2.14.0)", - org.apache.sshd.common.io;version="[2.13.2,2.14.0)", - org.apache.sshd.common.kex;version="[2.13.2,2.14.0)", - org.apache.sshd.common.kex.extension;version="[2.13.2,2.14.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.13.2,2.14.0)", - org.apache.sshd.common.keyprovider;version="[2.13.2,2.14.0)", - org.apache.sshd.common.mac;version="[2.13.2,2.14.0)", - org.apache.sshd.common.random;version="[2.13.2,2.14.0)", - org.apache.sshd.common.session;version="[2.13.2,2.14.0)", - org.apache.sshd.common.session.helpers;version="[2.13.2,2.14.0)", - org.apache.sshd.common.signature;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.buffer;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.closeable;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.io;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.io.der;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.io.functors;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.io.resource;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.logging;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.net;version="[2.13.2,2.14.0)", - org.apache.sshd.common.util.security;version="[2.13.2,2.14.0)", - org.apache.sshd.core;version="[2.13.2,2.14.0)", - org.apache.sshd.server.auth;version="[2.13.2,2.14.0)", - org.apache.sshd.sftp;version="[2.13.2,2.14.0)", - org.apache.sshd.sftp.client;version="[2.13.2,2.14.0)", - org.apache.sshd.sftp.common;version="[2.13.2,2.14.0)", + org.apache.sshd.agent;version="[2.14.0,2.15.0)", + org.apache.sshd.client;version="[2.14.0,2.15.0)", + org.apache.sshd.client.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.client.auth.keyboard;version="[2.14.0,2.15.0)", + org.apache.sshd.client.auth.password;version="[2.14.0,2.15.0)", + org.apache.sshd.client.auth.pubkey;version="[2.14.0,2.15.0)", + org.apache.sshd.client.channel;version="[2.14.0,2.15.0)", + org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", + org.apache.sshd.client.config.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.client.future;version="[2.14.0,2.15.0)", + org.apache.sshd.client.keyverifier;version="[2.14.0,2.15.0)", + org.apache.sshd.client.session;version="[2.14.0,2.15.0)", + org.apache.sshd.client.session.forward;version="[2.14.0,2.15.0)", + org.apache.sshd.common;version="[2.14.0,2.15.0)", + org.apache.sshd.common.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.common.channel;version="[2.14.0,2.15.0)", + org.apache.sshd.common.cipher;version="[2.14.0,2.15.0)", + org.apache.sshd.common.compression;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys.loader;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.14.0,2.15.0)", + org.apache.sshd.common.digest;version="[2.14.0,2.15.0)", + org.apache.sshd.common.forward;version="[2.14.0,2.15.0)", + org.apache.sshd.common.future;version="[2.14.0,2.15.0)", + org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", + org.apache.sshd.common.io;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex.extension;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.14.0,2.15.0)", + org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", + org.apache.sshd.common.mac;version="[2.14.0,2.15.0)", + org.apache.sshd.common.random;version="[2.14.0,2.15.0)", + org.apache.sshd.common.session;version="[2.14.0,2.15.0)", + org.apache.sshd.common.session.helpers;version="[2.14.0,2.15.0)", + org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.closeable;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.io;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.io.der;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.io.functors;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.io.resource;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", + org.apache.sshd.core;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)", org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", diff --git a/pom.xml b/pom.xml index bd9fde15d5..8108fecef4 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 7.0.0.202409031743-r 1.10.15 - 2.13.2 + 2.14.0 0.1.55 1.1.3 1.2.3 -- cgit v1.2.3 From 73e84475de54591f761cd9d025e7cb53236bd5f6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 9 Oct 2024 23:39:28 +0200 Subject: Update jetty to 12.0.14 Change-Id: I05da7de8fa370e3f00532f9f50408ddb79d37e56 --- WORKSPACE | 26 ++++++++-------------- .../org.eclipse.jgit.target/jgit-4.17.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.18.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.19.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.20.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.21.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.22.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.23.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.24.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.25.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.26.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.27.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.28.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.29.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.30.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.31.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.32.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.33.target | 18 +++++++-------- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++-------- .../org.eclipse.jgit.target/maven/dependencies.tpd | 16 ++++++------- pom.xml | 2 +- 21 files changed, 180 insertions(+), 188 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 1e73782592..46993dd476 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -246,62 +246,54 @@ maven_jar( sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", ) -JETTY_VER = "12.0.13" +JETTY_VER = "12.0.14" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, - sha1 = "e1cb00629ed0d4091caad7e4ee542878d60978d2", - src_sha1 = "15c9b6eced1fc9fb55450b43410acdef03903282", + sha1 = "900856dd4429c9d65404d487b04bd6d4fb11c402", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "c71b4755750198d3639cd26b55c32c87be568cce", - src_sha1 = "6a181480c9c2075abfb75d03abf0ff00a7545e58", + sha1 = "7541e45e2228663655d9a446ef727fd83f8dbb50", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "f7e2f539dacb3426fef1bcd66ca7a5c13d5f6409", - src_sha1 = "be6cb0c0c3a7abc9b835fe1c918af3fef9cb3689", + sha1 = "d28162468454f3b59bc0e7bff9fbc5fc69b5e83e", ) maven_jar( name = "jetty-session", artifact = "org.eclipse.jetty:jetty-session:" + JETTY_VER, - sha1 = "dd79f830f79bd827ba8d7c9e3fd35e03315afbd8", - src_sha1 = "970836d155c4b5e6d273ad32d40a384ceda2f2e8", + sha1 = "06e4b224a0e9d4bf1441eee65916820f3a56ad1d", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "4cc207e1006a747796cb99072087d58182193ad8", - src_sha1 = "3e047c2f4842cf6a9e3b68db36a1a667aefa6a1d", + sha1 = "6598be473f9ca74b668056affc750bb1988e62ba", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "a8377234b4a3967ee9ecc65ee25ef93dcffeb0f8", - src_sha1 = "ad84fef838609a88d50a0ced859972a8f4dc0f19", + sha1 = "1ae0bfaf9b900aa7041a71c62b6e674e76c6101f", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "ad63179e37e1037b901feaa9d7423c27f70fcdfe", - src_sha1 = "93354fb32122f3be1ea23c6c44c00bbf58ac506a", + sha1 = "6aea45fc3a7078ee55f3921ec6b0dc660701df85", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "d5caa4713c49aa2984505849b7bcab0c57b1d4c6", - src_sha1 = "dd4630c8b243725a6715caf268a8230ff9b6083a", + sha1 = "6f4beb9b482ea0d9db9db0564742aa2e4e0bf3c4", ) BOUNCYCASTLE_VER = "1.78.1" 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 588dfd37ae..d2006b8d60 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 ff1273c703..882f4e1313 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 c538cc1ef4..60e0f8f76f 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 7d55a95e33..b0601e8909 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 657f57091b..bd3625d4f5 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 a080f951aa..5006956a61 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 69c87ad04b..68124f196b 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 4275429bed..9d26a8930c 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 7064c466ac..6ad784208f 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 0ffc4d089e..8bff6b28c2 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 7bc490c360..ef4a71aa3e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index da784ea7b1..14e81823c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 18fb243fcc..7e121c4d2a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 5925e02403..2ccc22db58 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 1fb2c0b0eb..dfedead946 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 6b9f65983b..96ed4f1b80 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 82e6953cb6..8b4a174f12 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 9b5bd088fe..2ec0ba4fa6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-http - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-io - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-security - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-server - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-session - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util - 12.0.13 + 12.0.14 jar org.eclipse.jetty jetty-util-ajax - 12.0.13 + 12.0.14 jar 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 d840043ae5..e2889b87c6 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 @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.13" + version = "12.0.14" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.13" + version = "12.0.14" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.13" + version = "12.0.14" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.13" + version = "12.0.14" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.13" + version = "12.0.14" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.13" + version = "12.0.14" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.13" + version = "12.0.14" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.13" + version = "12.0.14" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 8108fecef4..c83ee3eaaf 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.27.1 6.0.0 6.1.0 - 12.0.13 + 12.0.14 0.21.2 4.5.14 4.4.16 -- cgit v1.2.3 From 9e1cd8aece4fbba301edb1eddbd0e7d36d3bb40c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Sep 2024 08:30:39 +0200 Subject: NoteMapMerger: remove unnecessary cast Change-Id: I3be4963f506529bbadc5b6dfc0b625ee85effc1f --- org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java index 79ceb1316a..30512c17b8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/notes/NoteMapMerger.java @@ -199,7 +199,7 @@ public class NoteMapMerger { if (child == null) return; if (child instanceof InMemoryNoteBucket) - b.setBucket(cell, ((InMemoryNoteBucket) child).writeTree(inserter)); + b.setBucket(cell, child.writeTree(inserter)); else b.setBucket(cell, child.getTreeId()); } -- cgit v1.2.3 From a2e477296461e006ea0b6383fa73017242d18775 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Sep 2024 08:32:55 +0200 Subject: ApacheSshProtocol2Test: remove unnecessary cast Change-Id: Ie8e7b097e48342a9cda6873e8595146a1b3f1427 --- org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF | 1 + .../tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 64c40628b1..b8073e202e 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -24,6 +24,7 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)", org.apache.sshd.server.forward;version="[2.12.0,2.13.0)", org.eclipse.jgit.api;version="[6.10.1,6.11.0)", org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.10.1,6.11.0)", org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java index eef0402b07..69bd5c501a 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/transport/sshd/ApacheSshProtocol2Test.java @@ -17,7 +17,6 @@ import java.util.Arrays; import org.eclipse.jgit.junit.ssh.SshBasicTestBase; import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.transport.SshSessionFactory; import org.eclipse.jgit.util.FS; @@ -52,7 +51,8 @@ public class ApacheSshProtocol2Test extends SshBasicTestBase { @Override public void setUp() throws Exception { super.setUp(); - StoredConfig config = ((Repository) db).getConfig(); + @SuppressWarnings("restriction") + StoredConfig config = db.getConfig(); config.setInt("protocol", null, "version", 2); config.save(); } -- cgit v1.2.3 From 72652ff65bcddf6ff3d9f2bed7027c9287ba86e6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Sep 2024 08:35:30 +0200 Subject: JSchSshProtocol2Test: remove unnecessary cast Change-Id: Id3767f43cbbfd0c05f9a7f0d5620943da874df92 --- org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF | 1 + .../tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 50168d8158..5cece2dc59 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", org.eclipse.jgit.junit.ssh;version="[6.10.1,6.11.0)", org.eclipse.jgit.lib;version="[6.10.1,6.11.0)", diff --git a/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java b/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java index 611d4e8bcb..8aa33e3235 100644 --- a/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java +++ b/org.eclipse.jgit.ssh.jsch.test/tst/org/eclipse/jgit/transport/ssh/jsch/JSchSshProtocol2Test.java @@ -22,7 +22,6 @@ import java.util.Arrays; import org.eclipse.jgit.errors.TransportException; import org.eclipse.jgit.junit.ssh.SshBasicTestBase; import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; import org.eclipse.jgit.transport.CredentialsProvider; import org.eclipse.jgit.transport.RemoteSession; @@ -89,7 +88,8 @@ public class JSchSshProtocol2Test extends SshBasicTestBase { @Override public void setUp() throws Exception { super.setUp(); - StoredConfig config = ((Repository) db).getConfig(); + @SuppressWarnings("restriction") + StoredConfig config = db.getConfig(); config.setInt("protocol", null, "version", 2); config.save(); } -- cgit v1.2.3 From ed0835856609fda246fd2f296ad5baae7ba28e3b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 16 Sep 2024 08:36:31 +0200 Subject: LfsConnectionFactoryTest: remove unnecessary cast Change-Id: I08ed51b13aa269a4f6b64ac723b6bd7649c6591c --- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 1 + .../tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 45192f51dd..509a0d7283 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.eclipse.jgit.api;version="[6.10.1,6.11.0)", org.eclipse.jgit.attributes;version="[6.10.1,6.11.0)", org.eclipse.jgit.internal.storage.dfs;version="[6.10.1,6.11.0)", + org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", org.eclipse.jgit.junit;version="[6.10.1,6.11.0)", org.eclipse.jgit.lfs;version="[6.10.1,6.11.0)", org.eclipse.jgit.lfs.errors;version="[6.10.1,6.11.0)", diff --git a/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java b/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java index badcb7d7e5..ee8e893b3e 100644 --- a/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java +++ b/org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/internal/LfsConnectionFactoryTest.java @@ -97,7 +97,8 @@ public class LfsConnectionFactoryTest extends RepositoryTestCase { public void lfsUrlFromLocalConfig() throws Exception { addRemoteUrl("https://localhost/repo"); - StoredConfig cfg = ((Repository) db).getConfig(); + @SuppressWarnings("restriction") + StoredConfig cfg = db.getConfig(); cfg.setString(ConfigConstants.CONFIG_SECTION_LFS, null, ConfigConstants.CONFIG_KEY_URL, @@ -111,7 +112,8 @@ public class LfsConnectionFactoryTest extends RepositoryTestCase { public void lfsUrlFromOriginConfig() throws Exception { addRemoteUrl("https://localhost/repo"); - StoredConfig cfg = ((Repository) db).getConfig(); + @SuppressWarnings("restriction") + StoredConfig cfg = db.getConfig(); cfg.setString(ConfigConstants.CONFIG_SECTION_LFS, org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME, ConfigConstants.CONFIG_KEY_URL, -- cgit v1.2.3 From eeccc5a92e78d6bef5908a61481e159e6c38288a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 9 Oct 2024 02:04:55 +0200 Subject: Update Apache sshd to 2.14.0 This fixes an 'incorrect signature' error when trying to use the keys generated by SSHD during server init with an OpenSSH client. This also includes a few other changes since 2.13.2: * GH-524 Performance improvements * GH-533 Fix multi-step authentication * GH-582 Fix filtering in NamedFactory * GH-587 Prevent NullPointerExceptionon closed channel in NettyIoSession * GH-590 Better support for FIPS * GH-597 Pass on Charset in ClientSession.executeRemoteCommand() https://github.com/apache/mina-sshd/releases/tag/sshd-2.14.0 Change-Id: I76909fd56e70ee4ce16a075bd40ed6b2a609cc47 --- WORKSPACE | 6 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 50 +++++----- .../org.eclipse.jgit.target/jgit-4.17.target | 6 +- .../org.eclipse.jgit.target/jgit-4.18.target | 6 +- .../org.eclipse.jgit.target/jgit-4.19.target | 6 +- .../org.eclipse.jgit.target/jgit-4.20.target | 6 +- .../org.eclipse.jgit.target/jgit-4.21.target | 6 +- .../org.eclipse.jgit.target/jgit-4.22.target | 6 +- .../org.eclipse.jgit.target/jgit-4.23.target | 6 +- .../org.eclipse.jgit.target/jgit-4.24.target | 6 +- .../org.eclipse.jgit.target/jgit-4.25.target | 6 +- .../org.eclipse.jgit.target/jgit-4.26.target | 6 +- .../org.eclipse.jgit.target/jgit-4.27.target | 6 +- .../org.eclipse.jgit.target/jgit-4.28.target | 6 +- .../org.eclipse.jgit.target/jgit-4.29.target | 6 +- .../org.eclipse.jgit.target/jgit-4.30.target | 6 +- .../org.eclipse.jgit.target/jgit-4.31.target | 6 +- .../org.eclipse.jgit.target/jgit-4.32.target | 6 +- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 28 +++--- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 104 ++++++++++----------- pom.xml | 2 +- 22 files changed, 145 insertions(+), 145 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index bceb668576..ecaa82a556 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -110,18 +110,18 @@ maven_jar( sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", ) -SSHD_VERS = "2.12.1" +SSHD_VERS = "2.14.0" maven_jar( name = "sshd-osgi", artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, - sha1 = "45b0501857603881ab472c927852ffa406932aef", + sha1 = "6ef66228a088f8ac1383b2ff28f3102f80ebc01a", ) maven_jar( name = "sshd-sftp", artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, - sha1 = "3ef6ded49799618c9438aa1044c6bf01124133bb", + sha1 = "c070ac920e72023ae9ab0a3f3a866bece284b470", ) JNA_VERS = "5.14.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index e704f2cecf..a46383870f 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -8,31 +8,31 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.file.virtualfs;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.threads;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.gss;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.keyboard;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth.password;version="[2.12.0,2.13.0)", - org.apache.sshd.server.command;version="[2.12.0,2.13.0)", - org.apache.sshd.server.session;version="[2.12.0,2.13.0)", - org.apache.sshd.server.shell;version="[2.12.0,2.13.0)", - org.apache.sshd.server.subsystem;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.server;version="[2.12.0,2.13.0)", +Import-Package: org.apache.sshd.common;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.common.file.virtualfs;version="[2.14.0,2.15.0)", + org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", + org.apache.sshd.common.io;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", + org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", + org.apache.sshd.common.session;version="[2.14.0,2.15.0)", + org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.threads;version="[2.14.0,2.15.0)", + org.apache.sshd.core;version="[2.14.0,2.15.0)", + org.apache.sshd.server;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth.gss;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth.keyboard;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth.password;version="[2.14.0,2.15.0)", + org.apache.sshd.server.command;version="[2.14.0,2.15.0)", + org.apache.sshd.server.session;version="[2.14.0,2.15.0)", + org.apache.sshd.server.shell;version="[2.14.0,2.15.0)", + org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)", org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", org.eclipse.jgit.api;version="[6.10.1,6.11.0)", org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", 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 357a5158f6..8b4cb40836 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 4164742e6d..79f5200c33 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 c3f24679a9..7eca94891f 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 7412a7d5ff..453b635041 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 c4144d65cb..0e92133e60 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 b3625fa0d8..2b3071c0ee 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 6f1e2ede1c..4cd69ada22 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 db79a5abe9..9b54c0c960 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 3d164c0ed8..8b072cbdda 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 63fe49222d..1c056a6f2b 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 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index ee8b3d7bdd..66bc3145e1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index ee4845d006..4a59b0657a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 5cb731e771..3d2a578bfb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 488373d3e2..ddad08e693 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 5bbcd3ce97..17babd84b6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index b0bd4d3f2e..b25472597a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.12.1 + 2.14.0 jar org.apache.sshd sshd-sftp - 2.12.1 + 2.14.0 jar 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 3d47632ffd..7aae03be00 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 @@ -233,12 +233,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.12.1" + version = "2.14.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.12.1" + version = "2.14.0" } } diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index b8073e202e..6f2af63fc6 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,20 +8,20 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)", - org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.net;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server;version="[2.12.0,2.13.0)", - org.apache.sshd.server.forward;version="[2.12.0,2.13.0)", +Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", + org.apache.sshd.common;version="[2.14.0,2.15.0)", + org.apache.sshd.common.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", + org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", + org.apache.sshd.common.session;version="[2.14.0,2.15.0)", + org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", + org.apache.sshd.core;version="[2.14.0,2.15.0)", + org.apache.sshd.server;version="[2.14.0,2.15.0)", + org.apache.sshd.server.forward;version="[2.14.0,2.15.0)", org.eclipse.jgit.api;version="[6.10.1,6.11.0)", org.eclipse.jgit.api.errors;version="[6.10.1,6.11.0)", org.eclipse.jgit.internal.storage.file;version="[6.10.1,6.11.0)", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 404129d0f3..e9d88455c7 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -37,58 +37,58 @@ Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.10.1";x-inte org.eclipse.jgit.transport.sshd.agent;version="6.10.1", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.12.0,2.13.0)", - org.apache.sshd.client;version="[2.12.0,2.13.0)", - org.apache.sshd.client.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.client.auth.keyboard;version="[2.12.0,2.13.0)", - org.apache.sshd.client.auth.password;version="[2.12.0,2.13.0)", - org.apache.sshd.client.auth.pubkey;version="[2.12.0,2.13.0)", - org.apache.sshd.client.channel;version="[2.12.0,2.13.0)", - org.apache.sshd.client.config.hosts;version="[2.12.0,2.13.0)", - org.apache.sshd.client.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.client.future;version="[2.12.0,2.13.0)", - org.apache.sshd.client.keyverifier;version="[2.12.0,2.13.0)", - org.apache.sshd.client.session;version="[2.12.0,2.13.0)", - org.apache.sshd.client.session.forward;version="[2.12.0,2.13.0)", - org.apache.sshd.common;version="[2.12.0,2.13.0)", - org.apache.sshd.common.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.common.channel;version="[2.12.0,2.13.0)", - org.apache.sshd.common.cipher;version="[2.12.0,2.13.0)", - org.apache.sshd.common.compression;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys.loader;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.12.0,2.13.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.12.0,2.13.0)", - org.apache.sshd.common.digest;version="[2.12.0,2.13.0)", - org.apache.sshd.common.forward;version="[2.12.0,2.13.0)", - org.apache.sshd.common.future;version="[2.12.0,2.13.0)", - org.apache.sshd.common.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex.extension;version="[2.12.0,2.13.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.12.0,2.13.0)", - org.apache.sshd.common.keyprovider;version="[2.12.0,2.13.0)", - org.apache.sshd.common.mac;version="[2.12.0,2.13.0)", - org.apache.sshd.common.random;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session;version="[2.12.0,2.13.0)", - org.apache.sshd.common.session.helpers;version="[2.12.0,2.13.0)", - org.apache.sshd.common.signature;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.closeable;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.io;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.io.der;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.io.functors;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.io.resource;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.logging;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.net;version="[2.12.0,2.13.0)", - org.apache.sshd.common.util.security;version="[2.12.0,2.13.0)", - org.apache.sshd.core;version="[2.12.0,2.13.0)", - org.apache.sshd.server.auth;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.client;version="[2.12.0,2.13.0)", - org.apache.sshd.sftp.common;version="[2.12.0,2.13.0)", + org.apache.sshd.agent;version="[2.14.0,2.15.0)", + org.apache.sshd.client;version="[2.14.0,2.15.0)", + org.apache.sshd.client.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.client.auth.keyboard;version="[2.14.0,2.15.0)", + org.apache.sshd.client.auth.password;version="[2.14.0,2.15.0)", + org.apache.sshd.client.auth.pubkey;version="[2.14.0,2.15.0)", + org.apache.sshd.client.channel;version="[2.14.0,2.15.0)", + org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", + org.apache.sshd.client.config.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.client.future;version="[2.14.0,2.15.0)", + org.apache.sshd.client.keyverifier;version="[2.14.0,2.15.0)", + org.apache.sshd.client.session;version="[2.14.0,2.15.0)", + org.apache.sshd.client.session.forward;version="[2.14.0,2.15.0)", + org.apache.sshd.common;version="[2.14.0,2.15.0)", + org.apache.sshd.common.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.common.channel;version="[2.14.0,2.15.0)", + org.apache.sshd.common.cipher;version="[2.14.0,2.15.0)", + org.apache.sshd.common.compression;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys.loader;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.14.0,2.15.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.14.0,2.15.0)", + org.apache.sshd.common.digest;version="[2.14.0,2.15.0)", + org.apache.sshd.common.forward;version="[2.14.0,2.15.0)", + org.apache.sshd.common.future;version="[2.14.0,2.15.0)", + org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", + org.apache.sshd.common.io;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex.extension;version="[2.14.0,2.15.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.14.0,2.15.0)", + org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", + org.apache.sshd.common.mac;version="[2.14.0,2.15.0)", + org.apache.sshd.common.random;version="[2.14.0,2.15.0)", + org.apache.sshd.common.session;version="[2.14.0,2.15.0)", + org.apache.sshd.common.session.helpers;version="[2.14.0,2.15.0)", + org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.closeable;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.io;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.io.der;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.io.functors;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.io.resource;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", + org.apache.sshd.core;version="[2.14.0,2.15.0)", + org.apache.sshd.server.auth;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)", + org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)", org.eclipse.jgit.annotations;version="[6.10.1,6.11.0)", org.eclipse.jgit.errors;version="[6.10.1,6.11.0)", org.eclipse.jgit.fnmatch;version="[6.10.1,6.11.0)", diff --git a/pom.xml b/pom.xml index f960a3ed5d..4c9159b95d 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 6.9.0.202403050737-r 1.10.14 - 2.12.1 + 2.14.0 0.1.55 1.1.3 1.2.3 -- cgit v1.2.3 From 2f15177e56d6fff79a84f178bfb0b33c926ddece Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 9 Oct 2024 01:41:30 +0200 Subject: UploadPack: suppress resource warning for DepthWalk.RevWalk which borrows the ObjectReader from `walk` which is closed by UploadPack#close. Change-Id: Idb91f025c2872421702034381bb55d292d0e74ed --- org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 3772c00819..8945f6e67f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -2369,7 +2369,8 @@ public class UploadPack implements Closeable { : req.getDepth() - 1; pw.setShallowPack(req.getDepth(), unshallowCommits); - // Ownership is transferred below + // dw borrows the reader from walk which is closed by #close + @SuppressWarnings("resource") DepthWalk.RevWalk dw = new DepthWalk.RevWalk( walk.getObjectReader(), walkDepth); dw.setDeepenSince(req.getDeepenSince()); -- cgit v1.2.3 From c9586d19ab97e46239f1f9a4a522b914a5016107 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 11 Oct 2024 13:25:57 -0700 Subject: DfsReaderOptions: read loadRevIndexInParallel from config The options have the field but it isn't loaded from the config. This forces a workaround downstream. Read the option from the config, as the others. Change-Id: I7720812e0577d8f45f6b7f5b8495a8b64729125e --- Documentation/config-options.md | 1 + .../org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java | 4 ++++ org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index 78930e6267..eeb78ff550 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -31,6 +31,7 @@ For details on native git options see also the official [git config documentatio | `core.dfs.blockSize` | `64 kiB` | ⃞ | Size in bytes of a single window read in from the pack file into the DFS block cache. | | `core.dfs.concurrencyLevel` | `32` | ⃞ | The estimated number of threads concurrently accessing the DFS block cache. | | `core.dfs.deltaBaseCacheLimit` | `10 MiB` | ⃞ | Maximum number of bytes to hold in per-reader DFS delta base cache. | +| `core.dfs.loadRevIndexInParallel` | false; | ⃞ | Try to load the reverse index in parallel with the bitmap index. | | `core.dfs.streamFileThreshold` | `50 MiB` | ⃞ | The size threshold beyond which objects must be streamed. | | `core.dfs.streamBuffer` | Block size of the pack | ⃞ | Number of bytes to use for buffering when streaming a pack file during copying. If 0 the block size of the pack is used| | `core.dfs.streamRatio` | `0.30` | ⃞ | Ratio of DFS block cache to occupy with a copied pack. Values between `0` and `1.0`. | diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java index 5f5e81977b..c3974691a1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReaderOptions.java @@ -13,6 +13,7 @@ package org.eclipse.jgit.internal.storage.dfs; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_CORE_SECTION; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_DFS_SECTION; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_DELTA_BASE_CACHE_LIMIT; +import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_LOAD_REV_INDEX_IN_PARALLEL; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_BUFFER; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_FILE_THRESHOLD; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_USE_OBJECT_SIZE_INDEX; @@ -197,6 +198,9 @@ public class DfsReaderOptions { setUseObjectSizeIndex(rc.getBoolean(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, CONFIG_KEY_USE_OBJECT_SIZE_INDEX, false)); + setLoadRevIndexInParallel( + rc.getBoolean(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_LOAD_REV_INDEX_IN_PARALLEL, false)); return this; } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index acb54d7405..c5f27688be 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -1027,4 +1027,11 @@ public final class ConfigConstants { * @since 7.0 */ public static final String CONFIG_KEY_USE_OBJECT_SIZE_INDEX = "useObjectSizeIndex"; + + /** + * The "loadRevIndexInParallel" key + * + * @since 7.1 + */ + public static final String CONFIG_KEY_LOAD_REV_INDEX_IN_PARALLEL = "loadRevIndexInParallel"; } -- cgit v1.2.3 From 1519c147948eb1108bdf45f2aeed84746dacff9c Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Mon, 7 Oct 2024 23:16:58 +0100 Subject: Align request policies with CGit CGit defines the SHA request policies using a bitmask that represents which policy is implied by another policy. For example, in CGit the ALLOW_TIP_SHA1 is 0x01 and ALLOW_REACHABLE_SHA1 is 0x02, which are associated to two different bit in a 3-bit value. The ALLOW_ANY_SHA1 value is 0x07 which denotes a different policy that implies the previous two ones, because is represented with a 3-bit bitmask having all ones. Associate the JGit RequestPolicy enum to the same CGit bitmask values and use the same logic for the purpose of advertising the server capabilities. The JGit code becomes easier to read and associate with its counterpart in CGit, especially during the capabilities advertising phase. Also add a new utility method RequestPolicy.implies() which is more readable than a direct bitmask and operator. Bug: jgit-68 Change-Id: I6b2649b06623a3b8226ee8413e4f1f58ad8ea28b --- .../src/org/eclipse/jgit/transport/UploadPack.java | 38 ++++++++++++++-------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 8945f6e67f..216cde1e37 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -117,13 +117,13 @@ public class UploadPack implements Closeable { /** Policy the server uses to validate client requests */ public enum RequestPolicy { /** Client may only ask for objects the server advertised a reference for. */ - ADVERTISED, + ADVERTISED(0x08), /** * Client may ask for any commit reachable from a reference advertised by * the server. */ - REACHABLE_COMMIT, + REACHABLE_COMMIT(0x02), /** * Client may ask for objects that are the tip of any reference, even if not @@ -133,18 +133,34 @@ public class UploadPack implements Closeable { * * @since 3.1 */ - TIP, + TIP(0x01), /** * Client may ask for any commit reachable from any reference, even if that - * reference wasn't advertised. + * reference wasn't advertised, implies REACHABLE_COMMIT and TIP. * * @since 3.1 */ - REACHABLE_COMMIT_TIP, + REACHABLE_COMMIT_TIP(0x03), - /** Client may ask for any SHA-1 in the repository. */ - ANY; + /** Client may ask for any SHA-1 in the repository, implies REACHABLE_COMMIT_TIP. */ + ANY(0x07); + + private final int bitmask; + + RequestPolicy(int bitmask) { + this.bitmask = bitmask; + } + + /** + * Check if the current policy implies another, based on its bitmask. + * + * @param implied the implied policy based on its bitmask. + * @return true if the policy is implied. + */ + public boolean implies(RequestPolicy implied) { + return (bitmask & implied.bitmask) != 0; + } } /** @@ -1582,13 +1598,9 @@ public class UploadPack implements Closeable { if (!biDirectionalPipe) adv.advertiseCapability(OPTION_NO_DONE); RequestPolicy policy = getRequestPolicy(); - if (policy == RequestPolicy.TIP - || policy == RequestPolicy.REACHABLE_COMMIT_TIP - || policy == null) + if (policy == null || policy.implies(RequestPolicy.TIP)) adv.advertiseCapability(OPTION_ALLOW_TIP_SHA1_IN_WANT); - if (policy == RequestPolicy.REACHABLE_COMMIT - || policy == RequestPolicy.REACHABLE_COMMIT_TIP - || policy == null) + if (policy == null || policy.implies(RequestPolicy.REACHABLE_COMMIT)) adv.advertiseCapability(OPTION_ALLOW_REACHABLE_SHA1_IN_WANT); adv.advertiseCapability(OPTION_AGENT, UserAgent.get()); if (transferConfig.isAllowFilter()) { -- cgit v1.2.3 From 5583f6a10eafc8c2627e0fb4833cb8ffe422f69a Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Fri, 11 Oct 2024 22:40:16 +0100 Subject: Test advertised capabilities with protocol V0 and allow*Sha1InWant The advertised capabilities with protocol V0 were untested leading to potential regressions when advertising what SHA1 should or should not be on the list of capabilities. Verify that allow-tip-sha1-in-want and allow-reachable-sha1-in-want are properly advertised with the allow*Sha1InWant is set in jgit.config. Change-Id: I99d062a5a630b02ca3d1fe83bf6cdf3c284ae941 --- .../org/eclipse/jgit/transport/UploadPackTest.java | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java index def73acadd..017104c527 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -563,6 +564,47 @@ public class UploadPackTest { assertThat(lines, hasItems("ls-refs", "fetch", "server-option")); } + @Test + public void testV0CapabilitiesAllowAnySha1InWant() throws Exception { + checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack", + "allowanysha1inwant", "allow-reachable-sha1-in-want", + "allow-tip-sha1-in-want"); + } + + @Test + public void testV0CapabilitiesAllowReachableSha1InWant() throws Exception { + checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack", + "allowreachablesha1inwant", "allow-reachable-sha1-in-want"); + } + + @Test + public void testV0CapabilitiesAllowTipSha1InWant() throws Exception { + checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack", + "allowtipsha1inwant", "allow-tip-sha1-in-want"); + } + + private void checkAvertisedCapabilityProtocolV0IfAllowed( + String configSection, String configName, String... capabilities) + throws Exception { + server.getConfig().setBoolean(configSection, null, configName, true); + ByteArrayInputStream recvStream = uploadPackSetup( + TransferConfig.ProtocolVersion.V0.version(), null, + PacketLineIn.end()); + PacketLineIn pckIn = new PacketLineIn(recvStream); + + String line; + while (!PacketLineIn.isEnd((line = pckIn.readString()))) { + if (line.contains("capabilities")) { + List linesCapabilities = Arrays.asList(line.substring( + line.indexOf(" ", line.indexOf("capabilities")) + 1) + .split(" ")); + assertThat(linesCapabilities, hasItems(capabilities)); + return; + } + } + fail("Server side protocol did not contain any capabilities'"); + } + @Test public void testV2CapabilitiesAllowFilter() throws Exception { checkAdvertisedIfAllowed("uploadpack", "allowfilter", "filter"); -- cgit v1.2.3 From 6a169f10835c780e65b4e920dce3bed5006dc68d Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Mon, 29 Jul 2024 16:12:15 -0700 Subject: DfsBlockCacheConfigs: add debug configuration print This will write out configuration values on a line by line basis to a given PrintWriter. Primary usage is as a semi-formatted debug print of the configuration values used by dfs block cache. Change-Id: I96724262245e4aa3423734a8b10de83322c4f89f --- .../storage/dfs/DfsBlockCacheConfigTest.java | 44 ++++++++++++++++++ .../internal/storage/dfs/DfsBlockCacheConfig.java | 54 +++++++++++++++++++++- 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java index 4b7aae05f0..65774e6d6c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java @@ -54,7 +54,12 @@ import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThrows; +import java.io.ByteArrayOutputStream; +import java.io.PrintWriter; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import org.eclipse.jgit.internal.JGitText; @@ -250,6 +255,45 @@ public class DfsBlockCacheConfigTest { () -> new DfsBlockCacheConfig().fromConfig(config)); } + @Test + public void writeConfigurationDebug_writesConfigsToWriter() + throws Exception { + Config config = new Config(); + config.setLong(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_BLOCK_LIMIT, 50 * 1024); + config.setInt(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_BLOCK_SIZE, 1024); + config.setInt(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_CONCURRENCY_LEVEL, 3); + config.setString(CONFIG_CORE_SECTION, CONFIG_DFS_SECTION, + CONFIG_KEY_STREAM_RATIO, "0.5"); + addPackExtConfigEntry(config, "pack", List.of(PackExt.PACK), + /* blockLimit= */ 20 * 512, /* blockSize= */ 512); + + DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig() + .fromConfig(config); + Map hotmap = Map.of(PackExt.PACK, 10); + cacheConfig.setCacheHotMap(hotmap); + + ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); + cacheConfig.print(new PrintWriter(byteArrayOutputStream, true, + StandardCharsets.UTF_8)); + + String writenConfig = byteArrayOutputStream + .toString(StandardCharsets.UTF_8); + + List writenLines = Arrays.asList(writenConfig.split("\n")); + assertThat(writenLines, + equalTo(List.of("Name: dfs", " BlockLimit: " + (50 * 1024), + " BlockSize: 1024", " StreamRatio: 0.5", + " ConcurrencyLevel: 3", + " CacheHotMapEntry: " + PackExt.PACK + " : " + 10, + " Name: dfs.pack", " BlockLimit: " + 20 * 512, + " BlockSize: 512", " StreamRatio: 0.3", + " ConcurrencyLevel: 32", + " PackExts: " + List.of(PackExt.PACK)))); + } + private static void addPackExtConfigEntry(Config config, String configName, List packExts, long blockLimit, int blockSize) { String packExtConfigName = CONFIG_DFS_CACHE_PREFIX + configName; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index 52eb9e0785..0d56689a67 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -19,6 +19,7 @@ import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_CONCURRENCY_LEVEL; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_PACK_EXTENSIONS; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_STREAM_RATIO; +import java.io.PrintWriter; import java.text.MessageFormat; import java.time.Duration; import java.util.ArrayList; @@ -82,6 +83,51 @@ public class DfsBlockCacheConfig { packExtCacheConfigurations = Collections.emptyList(); } + /** + * Print the current cache configuration to the given {@link PrintWriter}. + * + * @param writer + * {@link PrintWriter} to write the cache's configuration to. + */ + public void print(PrintWriter writer) { + print(/* linePrefix= */ "", /* pad= */ " ", writer); + } + + /** + * Print the current cache configuration to the given {@link PrintWriter}. + * + * @param linePrefix + * prefix to prepend all writen lines with. Ex a string of 0 or + * more " " entries. + * @param pad + * filler used to extend linePrefix. Ex a multiple of " ". + * @param writer + * {@link PrintWriter} to write the cache's configuration to. + */ + private void print(String linePrefix, String pad, PrintWriter writer) { + String currentPrefixLevel = linePrefix; + if (!name.isEmpty() || !packExtCacheConfigurations.isEmpty()) { + String name = this.name; + if (name.isEmpty()) { + name = ""; + } + writer.println(linePrefix + "Name: " + name); + currentPrefixLevel += pad; + } + writer.println(currentPrefixLevel + "BlockLimit: " + blockLimit); + writer.println(currentPrefixLevel + "BlockSize: " + blockSize); + writer.println(currentPrefixLevel + "StreamRatio: " + streamRatio); + writer.println( + currentPrefixLevel + "ConcurrencyLevel: " + concurrencyLevel); + for (Map.Entry entry : cacheHotMap.entrySet()) { + writer.println(currentPrefixLevel + "CacheHotMapEntry: " + + entry.getKey() + " : " + entry.getValue()); + } + for (DfsBlockCachePackExtConfig extConfig : packExtCacheConfigurations) { + extConfig.print(currentPrefixLevel, pad, writer); + } + } + /** * Get the name for the block cache configured by this cache config. * @@ -531,5 +577,11 @@ public class DfsBlockCacheConfig { return new DfsBlockCachePackExtConfig(EnumSet.copyOf(packExts), dfsBlockCacheConfig); } + + void print(String linePrefix, String pad, PrintWriter writer) { + packExtCacheConfiguration.print(linePrefix, pad, writer); + writer.println(linePrefix + pad + "PackExts: " + + packExts.stream().sorted().toList()); + } } -} \ No newline at end of file +} -- cgit v1.2.3 From fe8919d107cbfbc52b84f9b8e9fe55668dfbebb1 Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Wed, 16 Oct 2024 15:16:00 -0700 Subject: DfsBlockCache: refactor stats implementations. The stats interface has an implementation in the interface itself and another inside the PackExtBlockCache class. This asymmetry gets on the way to implement stats-per-table later. Make DfsBlockCacheStats (the stats of a single table) a top-level class and create an aggregator class to combine multiple stats. This makes the stats classes mirror the table classes structure (singles tables + composite). This change is part of a refactor to support providing detailed stats breakdowns for cache implementations using multiple table instances while keeping the existing "aggregated" view of cache stats. Change-Id: I79c11e4ea24afe4b449efdbb47bc81eed363ffd3 --- .../storage/dfs/AggregatedBlockCacheStatsTest.java | 215 +++++++++++++++++++++ .../storage/dfs/PackExtBlockCacheTableTest.java | 1 - .../storage/dfs/AggregatedBlockCacheStats.java | 127 ++++++++++++ .../internal/storage/dfs/DfsBlockCacheStats.java | 197 +++++++++++++++++++ .../internal/storage/dfs/DfsBlockCacheTable.java | 194 +------------------ .../storage/dfs/PackExtBlockCacheTable.java | 100 +--------- 6 files changed, 547 insertions(+), 287 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStatsTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStats.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheStats.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStatsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStatsTest.java new file mode 100644 index 0000000000..ac769498e2 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStatsTest.java @@ -0,0 +1,215 @@ +/* + * Copyright (c) 2024, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.dfs; + +import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheTable.BlockCacheStats; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertArrayEquals; + +import java.util.List; + +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.junit.Test; + +public class AggregatedBlockCacheStatsTest { + @Test + public void getName() { + BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats + .fromStatsList("name", List.of()); + + assertThat(aggregatedBlockCacheStats.getName(), equalTo("name")); + } + + @Test + public void getCurrentSize_aggregatesCurrentSizes() { + long[] currentSizes = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + packStats.addToLiveBytes(new TestKey(PackExt.PACK), 5); + currentSizes[PackExt.PACK.getPosition()] = 5; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + bitmapStats.addToLiveBytes(new TestKey(PackExt.BITMAP_INDEX), 6); + currentSizes[PackExt.BITMAP_INDEX.getPosition()] = 6; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + indexStats.addToLiveBytes(new TestKey(PackExt.INDEX), 7); + currentSizes[PackExt.INDEX.getPosition()] = 7; + + BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats + .fromStatsList("name", + List.of(packStats, bitmapStats, indexStats)); + + assertArrayEquals(aggregatedBlockCacheStats.getCurrentSize(), + currentSizes); + } + + @Test + public void getHitCount_aggregatesHitCounts() { + long[] hitCounts = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, + () -> packStats.incrementHit(new TestKey(PackExt.PACK))); + hitCounts[PackExt.PACK.getPosition()] = 5; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> bitmapStats + .incrementHit(new TestKey(PackExt.BITMAP_INDEX))); + hitCounts[PackExt.BITMAP_INDEX.getPosition()] = 6; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, + () -> indexStats.incrementHit(new TestKey(PackExt.INDEX))); + hitCounts[PackExt.INDEX.getPosition()] = 7; + + BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats + .fromStatsList("name", + List.of(packStats, bitmapStats, indexStats)); + + assertArrayEquals(aggregatedBlockCacheStats.getHitCount(), hitCounts); + } + + @Test + public void getMissCount_aggregatesMissCounts() { + long[] missCounts = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, + () -> packStats.incrementMiss(new TestKey(PackExt.PACK))); + missCounts[PackExt.PACK.getPosition()] = 5; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> bitmapStats + .incrementMiss(new TestKey(PackExt.BITMAP_INDEX))); + missCounts[PackExt.BITMAP_INDEX.getPosition()] = 6; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, + () -> indexStats.incrementMiss(new TestKey(PackExt.INDEX))); + missCounts[PackExt.INDEX.getPosition()] = 7; + + BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats + .fromStatsList("name", + List.of(packStats, bitmapStats, indexStats)); + + assertArrayEquals(aggregatedBlockCacheStats.getMissCount(), missCounts); + } + + @Test + public void getTotalRequestCount_aggregatesRequestCounts() { + long[] totalRequestCounts = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, () -> { + packStats.incrementHit(new TestKey(PackExt.PACK)); + packStats.incrementMiss(new TestKey(PackExt.PACK)); + }); + totalRequestCounts[PackExt.PACK.getPosition()] = 10; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> { + bitmapStats.incrementHit(new TestKey(PackExt.BITMAP_INDEX)); + bitmapStats.incrementMiss(new TestKey(PackExt.BITMAP_INDEX)); + }); + totalRequestCounts[PackExt.BITMAP_INDEX.getPosition()] = 12; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, () -> { + indexStats.incrementHit(new TestKey(PackExt.INDEX)); + indexStats.incrementMiss(new TestKey(PackExt.INDEX)); + }); + totalRequestCounts[PackExt.INDEX.getPosition()] = 14; + + BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats + .fromStatsList("name", + List.of(packStats, bitmapStats, indexStats)); + + assertArrayEquals(aggregatedBlockCacheStats.getTotalRequestCount(), + totalRequestCounts); + } + + @Test + public void getHitRatio_aggregatesHitRatios() { + long[] hitRatios = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, + () -> packStats.incrementHit(new TestKey(PackExt.PACK))); + hitRatios[PackExt.PACK.getPosition()] = 100; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> { + bitmapStats.incrementHit(new TestKey(PackExt.BITMAP_INDEX)); + bitmapStats.incrementMiss(new TestKey(PackExt.BITMAP_INDEX)); + }); + hitRatios[PackExt.BITMAP_INDEX.getPosition()] = 50; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, + () -> indexStats.incrementMiss(new TestKey(PackExt.INDEX))); + hitRatios[PackExt.INDEX.getPosition()] = 0; + + BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats + .fromStatsList("Name", + List.of(packStats, bitmapStats, indexStats)); + + assertArrayEquals(aggregatedBlockCacheStats.getHitRatio(), hitRatios); + } + + @Test + public void getEvictions_aggregatesEvictions() { + long[] evictions = createEmptyStatsArray(); + + DfsBlockCacheStats packStats = new DfsBlockCacheStats(); + incrementCounter(5, + () -> packStats.incrementEvict(new TestKey(PackExt.PACK))); + evictions[PackExt.PACK.getPosition()] = 5; + + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats(); + incrementCounter(6, () -> bitmapStats + .incrementEvict(new TestKey(PackExt.BITMAP_INDEX))); + evictions[PackExt.BITMAP_INDEX.getPosition()] = 6; + + DfsBlockCacheStats indexStats = new DfsBlockCacheStats(); + incrementCounter(7, + () -> indexStats.incrementEvict(new TestKey(PackExt.INDEX))); + evictions[PackExt.INDEX.getPosition()] = 7; + + BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats + .fromStatsList("Name", + List.of(packStats, bitmapStats, indexStats)); + + assertArrayEquals(aggregatedBlockCacheStats.getEvictions(), evictions); + } + + private static void incrementCounter(int amount, Runnable fn) { + for (int i = 0; i < amount; i++) { + fn.run(); + } + } + + private static long[] createEmptyStatsArray() { + return new long[PackExt.values().length]; + } + + private static class TestKey extends DfsStreamKey { + TestKey(PackExt packExt) { + super(0, packExt); + } + + @Override + public boolean equals(Object o) { + return false; + } + } +} \ No newline at end of file diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java index f2a5abcacd..c5c964bcab 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java @@ -31,7 +31,6 @@ import java.util.Map; import org.eclipse.jgit.internal.storage.dfs.DfsBlockCache.Ref; import org.eclipse.jgit.internal.storage.dfs.DfsBlockCache.RefLoader; import org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.DfsBlockCachePackExtConfig; -import org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheTable.DfsBlockCacheStats; import org.eclipse.jgit.internal.storage.pack.PackExt; import org.junit.Test; import org.mockito.Mockito; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStats.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStats.java new file mode 100644 index 0000000000..743f4606c4 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStats.java @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2024, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.dfs; + +import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheTable.BlockCacheStats; + +import java.util.List; + +import org.eclipse.jgit.internal.storage.pack.PackExt; + +/** + * Aggregates values for all given {@link BlockCacheStats}. + */ +class AggregatedBlockCacheStats implements BlockCacheStats { + private final String name; + + private final List blockCacheStats; + + static BlockCacheStats fromStatsList(String name, + List blockCacheStats) { + if (blockCacheStats.size() == 1) { + return blockCacheStats.get(0); + } + return new AggregatedBlockCacheStats(name, blockCacheStats); + } + + private AggregatedBlockCacheStats(String name, + List blockCacheStats) { + this.name = name; + this.blockCacheStats = blockCacheStats; + } + + @Override + public String getName() { + return name; + } + + @Override + public long[] getCurrentSize() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getCurrentSize()); + } + return sums; + } + + @Override + public long[] getHitCount() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getHitCount()); + } + return sums; + } + + @Override + public long[] getMissCount() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getMissCount()); + } + return sums; + } + + @Override + public long[] getTotalRequestCount() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getTotalRequestCount()); + } + return sums; + } + + @Override + public long[] getHitRatio() { + long[] hit = getHitCount(); + long[] miss = getMissCount(); + long[] ratio = new long[Math.max(hit.length, miss.length)]; + for (int i = 0; i < ratio.length; i++) { + if (i >= hit.length) { + ratio[i] = 0; + } else if (i >= miss.length) { + ratio[i] = 100; + } else { + long total = hit[i] + miss[i]; + ratio[i] = total == 0 ? 0 : hit[i] * 100 / total; + } + } + return ratio; + } + + @Override + public long[] getEvictions() { + long[] sums = emptyPackStats(); + for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { + sums = add(sums, blockCacheStatsEntry.getEvictions()); + } + return sums; + } + + private static long[] emptyPackStats() { + return new long[PackExt.values().length]; + } + + private static long[] add(long[] first, long[] second) { + long[] sums = new long[Integer.max(first.length, second.length)]; + int i; + for (i = 0; i < Integer.min(first.length, second.length); i++) { + sums[i] = first[i] + second[i]; + } + for (int j = i; j < first.length; j++) { + sums[j] = first[i]; + } + for (int j = i; j < second.length; j++) { + sums[j] = second[i]; + } + return sums; + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheStats.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheStats.java new file mode 100644 index 0000000000..518db8c82d --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheStats.java @@ -0,0 +1,197 @@ +/* + * Copyright (c) 2024, Google LLC and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * http://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.dfs; + +import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheTable.BlockCacheStats; + +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; + +import org.eclipse.jgit.internal.storage.pack.PackExt; + +/** + * Keeps track of stats for a Block Cache table. + */ +class DfsBlockCacheStats implements BlockCacheStats { + private final String name; + + /** + * Number of times a block was found in the cache, per pack file extension. + */ + private final AtomicReference statHit; + + /** + * Number of times a block was not found, and had to be loaded, per pack + * file extension. + */ + private final AtomicReference statMiss; + + /** + * Number of blocks evicted due to cache being full, per pack file + * extension. + */ + private final AtomicReference statEvict; + + /** + * Number of bytes currently loaded in the cache, per pack file extension. + */ + private final AtomicReference liveBytes; + + DfsBlockCacheStats() { + this(""); + } + + DfsBlockCacheStats(String name) { + this.name = name; + statHit = new AtomicReference<>(newCounters()); + statMiss = new AtomicReference<>(newCounters()); + statEvict = new AtomicReference<>(newCounters()); + liveBytes = new AtomicReference<>(newCounters()); + } + + @Override + public String getName() { + return name; + } + + /** + * Increment the {@code statHit} count. + * + * @param key + * key identifying which liveBytes entry to update. + */ + void incrementHit(DfsStreamKey key) { + getStat(statHit, key).incrementAndGet(); + } + + /** + * Increment the {@code statMiss} count. + * + * @param key + * key identifying which liveBytes entry to update. + */ + void incrementMiss(DfsStreamKey key) { + getStat(statMiss, key).incrementAndGet(); + } + + /** + * Increment the {@code statEvict} count. + * + * @param key + * key identifying which liveBytes entry to update. + */ + void incrementEvict(DfsStreamKey key) { + getStat(statEvict, key).incrementAndGet(); + } + + /** + * Add {@code size} to the {@code liveBytes} count. + * + * @param key + * key identifying which liveBytes entry to update. + * @param size + * amount to increment the count by. + */ + void addToLiveBytes(DfsStreamKey key, long size) { + getStat(liveBytes, key).addAndGet(size); + } + + @Override + public long[] getCurrentSize() { + return getStatVals(liveBytes); + } + + @Override + public long[] getHitCount() { + return getStatVals(statHit); + } + + @Override + public long[] getMissCount() { + return getStatVals(statMiss); + } + + @Override + public long[] getTotalRequestCount() { + AtomicLong[] hit = statHit.get(); + AtomicLong[] miss = statMiss.get(); + long[] cnt = new long[Math.max(hit.length, miss.length)]; + for (int i = 0; i < hit.length; i++) { + cnt[i] += hit[i].get(); + } + for (int i = 0; i < miss.length; i++) { + cnt[i] += miss[i].get(); + } + return cnt; + } + + @Override + public long[] getHitRatio() { + AtomicLong[] hit = statHit.get(); + AtomicLong[] miss = statMiss.get(); + long[] ratio = new long[Math.max(hit.length, miss.length)]; + for (int i = 0; i < ratio.length; i++) { + if (i >= hit.length) { + ratio[i] = 0; + } else if (i >= miss.length) { + ratio[i] = 100; + } else { + long hitVal = hit[i].get(); + long missVal = miss[i].get(); + long total = hitVal + missVal; + ratio[i] = total == 0 ? 0 : hitVal * 100 / total; + } + } + return ratio; + } + + @Override + public long[] getEvictions() { + return getStatVals(statEvict); + } + + private static AtomicLong[] newCounters() { + AtomicLong[] ret = new AtomicLong[PackExt.values().length]; + for (int i = 0; i < ret.length; i++) { + ret[i] = new AtomicLong(); + } + return ret; + } + + private static long[] getStatVals(AtomicReference stat) { + AtomicLong[] stats = stat.get(); + long[] cnt = new long[stats.length]; + for (int i = 0; i < stats.length; i++) { + cnt[i] = stats[i].get(); + } + return cnt; + } + + private static AtomicLong getStat(AtomicReference stats, + DfsStreamKey key) { + int pos = key.packExtPos; + while (true) { + AtomicLong[] vals = stats.get(); + if (pos < vals.length) { + return vals[pos]; + } + AtomicLong[] expect = vals; + vals = new AtomicLong[Math.max(pos + 1, PackExt.values().length)]; + System.arraycopy(expect, 0, vals, 0, expect.length); + for (int i = expect.length; i < vals.length; i++) { + vals[i] = new AtomicLong(); + } + if (stats.compareAndSet(expect, vals)) { + return vals[pos]; + } + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java index de5dc23963..43ba8c36ab 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java @@ -11,10 +11,6 @@ package org.eclipse.jgit.internal.storage.dfs; import java.io.IOException; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; - -import org.eclipse.jgit.internal.storage.pack.PackExt; /** * Block cache table. @@ -148,6 +144,12 @@ public interface DfsBlockCacheTable { * Provides methods used with Block Cache statistics. */ interface BlockCacheStats { + + /** + * Get the name of the block cache generating this instance. + * + * @return this cache's name. + */ String getName(); /** @@ -199,186 +201,4 @@ public interface DfsBlockCacheTable { */ long[] getEvictions(); } - - /** - * Keeps track of stats for a Block Cache table. - */ - class DfsBlockCacheStats implements BlockCacheStats { - private final String name; - - /** - * Number of times a block was found in the cache, per pack file - * extension. - */ - private final AtomicReference statHit; - - /** - * Number of times a block was not found, and had to be loaded, per pack - * file extension. - */ - private final AtomicReference statMiss; - - /** - * Number of blocks evicted due to cache being full, per pack file - * extension. - */ - private final AtomicReference statEvict; - - /** - * Number of bytes currently loaded in the cache, per pack file - * extension. - */ - private final AtomicReference liveBytes; - - DfsBlockCacheStats() { - this(""); - } - - DfsBlockCacheStats(String name) { - this.name = name; - statHit = new AtomicReference<>(newCounters()); - statMiss = new AtomicReference<>(newCounters()); - statEvict = new AtomicReference<>(newCounters()); - liveBytes = new AtomicReference<>(newCounters()); - } - - @Override - public String getName() { - return name; - } - - /** - * Increment the {@code statHit} count. - * - * @param key - * key identifying which liveBytes entry to update. - */ - void incrementHit(DfsStreamKey key) { - getStat(statHit, key).incrementAndGet(); - } - - /** - * Increment the {@code statMiss} count. - * - * @param key - * key identifying which liveBytes entry to update. - */ - void incrementMiss(DfsStreamKey key) { - getStat(statMiss, key).incrementAndGet(); - } - - /** - * Increment the {@code statEvict} count. - * - * @param key - * key identifying which liveBytes entry to update. - */ - void incrementEvict(DfsStreamKey key) { - getStat(statEvict, key).incrementAndGet(); - } - - /** - * Add {@code size} to the {@code liveBytes} count. - * - * @param key - * key identifying which liveBytes entry to update. - * @param size - * amount to increment the count by. - */ - void addToLiveBytes(DfsStreamKey key, long size) { - getStat(liveBytes, key).addAndGet(size); - } - - @Override - public long[] getCurrentSize() { - return getStatVals(liveBytes); - } - - @Override - public long[] getHitCount() { - return getStatVals(statHit); - } - - @Override - public long[] getMissCount() { - return getStatVals(statMiss); - } - - @Override - public long[] getTotalRequestCount() { - AtomicLong[] hit = statHit.get(); - AtomicLong[] miss = statMiss.get(); - long[] cnt = new long[Math.max(hit.length, miss.length)]; - for (int i = 0; i < hit.length; i++) { - cnt[i] += hit[i].get(); - } - for (int i = 0; i < miss.length; i++) { - cnt[i] += miss[i].get(); - } - return cnt; - } - - @Override - public long[] getHitRatio() { - AtomicLong[] hit = statHit.get(); - AtomicLong[] miss = statMiss.get(); - long[] ratio = new long[Math.max(hit.length, miss.length)]; - for (int i = 0; i < ratio.length; i++) { - if (i >= hit.length) { - ratio[i] = 0; - } else if (i >= miss.length) { - ratio[i] = 100; - } else { - long hitVal = hit[i].get(); - long missVal = miss[i].get(); - long total = hitVal + missVal; - ratio[i] = total == 0 ? 0 : hitVal * 100 / total; - } - } - return ratio; - } - - @Override - public long[] getEvictions() { - return getStatVals(statEvict); - } - - private static AtomicLong[] newCounters() { - AtomicLong[] ret = new AtomicLong[PackExt.values().length]; - for (int i = 0; i < ret.length; i++) { - ret[i] = new AtomicLong(); - } - return ret; - } - - private static long[] getStatVals(AtomicReference stat) { - AtomicLong[] stats = stat.get(); - long[] cnt = new long[stats.length]; - for (int i = 0; i < stats.length; i++) { - cnt[i] = stats[i].get(); - } - return cnt; - } - - private static AtomicLong getStat(AtomicReference stats, - DfsStreamKey key) { - int pos = key.packExtPos; - while (true) { - AtomicLong[] vals = stats.get(); - if (pos < vals.length) { - return vals[pos]; - } - AtomicLong[] expect = vals; - vals = new AtomicLong[Math.max(pos + 1, - PackExt.values().length)]; - System.arraycopy(expect, 0, vals, 0, expect.length); - for (int i = expect.length; i < vals.length; i++) { - vals[i] = new AtomicLong(); - } - if (stats.compareAndSet(expect, vals)) { - return vals[pos]; - } - } - } - } -} \ No newline at end of file +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java index 7f21b3f10a..e45643be84 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java @@ -189,7 +189,7 @@ class PackExtBlockCacheTable implements DfsBlockCacheTable { @Override public BlockCacheStats getBlockCacheStats() { - return new CacheStats(name, + return AggregatedBlockCacheStats.fromStatsList(name, blockCacheTableList.stream() .map(DfsBlockCacheTable::getBlockCacheStats) .collect(Collectors.toList())); @@ -213,102 +213,4 @@ class PackExtBlockCacheTable implements DfsBlockCacheTable { private static PackExt getPackExt(DfsStreamKey key) { return PackExt.values()[key.packExtPos]; } - - private static class CacheStats implements BlockCacheStats { - private final String name; - - private final List blockCacheStats; - - private CacheStats(String name, List blockCacheStats) { - this.name = name; - this.blockCacheStats = blockCacheStats; - } - - @Override - public String getName() { - return name; - } - - @Override - public long[] getCurrentSize() { - long[] sums = emptyPackStats(); - for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { - sums = add(sums, blockCacheStatsEntry.getCurrentSize()); - } - return sums; - } - - @Override - public long[] getHitCount() { - long[] sums = emptyPackStats(); - for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { - sums = add(sums, blockCacheStatsEntry.getHitCount()); - } - return sums; - } - - @Override - public long[] getMissCount() { - long[] sums = emptyPackStats(); - for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { - sums = add(sums, blockCacheStatsEntry.getMissCount()); - } - return sums; - } - - @Override - public long[] getTotalRequestCount() { - long[] sums = emptyPackStats(); - for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { - sums = add(sums, blockCacheStatsEntry.getTotalRequestCount()); - } - return sums; - } - - @Override - public long[] getHitRatio() { - long[] hit = getHitCount(); - long[] miss = getMissCount(); - long[] ratio = new long[Math.max(hit.length, miss.length)]; - for (int i = 0; i < ratio.length; i++) { - if (i >= hit.length) { - ratio[i] = 0; - } else if (i >= miss.length) { - ratio[i] = 100; - } else { - long total = hit[i] + miss[i]; - ratio[i] = total == 0 ? 0 : hit[i] * 100 / total; - } - } - return ratio; - } - - @Override - public long[] getEvictions() { - long[] sums = emptyPackStats(); - for (BlockCacheStats blockCacheStatsEntry : blockCacheStats) { - sums = add(sums, blockCacheStatsEntry.getEvictions()); - } - return sums; - } - - private static long[] emptyPackStats() { - return new long[PackExt.values().length]; - } - - private static long[] add(long[] first, long[] second) { - long[] sums = new long[Integer.max(first.length, second.length)]; - int i; - for (i = 0; i < Integer.min(first.length, second.length); i++) { - sums[i] = first[i] + second[i]; - } - for (int j = i; j < first.length; j++) { - sums[j] = first[i]; - } - for (int j = i; j < second.length; j++) { - sums[j] = second[i]; - } - return sums; - } - } } -- cgit v1.2.3 From 6406793274876b973da2a7e1f1052e1edca1d4ef Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Mon, 21 Oct 2024 15:59:43 -0700 Subject: DfsBlockCacheConfig: update stream.toList to collect(toList) This change updates usage of stream's list collector to support older jdk versions. Change-Id: Ia066d36aef8ab166efd837d5f6f01e5d1fdd3cb7 --- .../src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index 0d56689a67..acd7add5a9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -581,7 +581,7 @@ public class DfsBlockCacheConfig { void print(String linePrefix, String pad, PrintWriter writer) { packExtCacheConfiguration.print(linePrefix, pad, writer); writer.println(linePrefix + pad + "PackExts: " - + packExts.stream().sorted().toList()); + + packExts.stream().sorted().collect(Collectors.toList())); } } } -- cgit v1.2.3 From 4c7801a48c0fef26e6c513a583b1e030e09fe849 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 20 Sep 2024 21:59:49 +0200 Subject: ssh: add a factory for KeyPasswordProvider Introduce a global default factory to create KeyPasswordProvider. Previously, their creation was tied to the SSH session, but for SSH signatures, we will need to be able to create KeyPasswordProviders without having an SSH session. Change-Id: If4a69c4d4c4e8de390cb1ef3b65966d0e39c24ff Signed-off-by: Thomas Wolf --- .../transport/sshd/KeyPasswordProviderFactory.java | 69 ++++++++++++++++++++++ .../jgit/transport/sshd/SshdSessionFactory.java | 22 +++++-- 2 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/KeyPasswordProviderFactory.java diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/KeyPasswordProviderFactory.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/KeyPasswordProviderFactory.java new file mode 100644 index 0000000000..0537300b24 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/KeyPasswordProviderFactory.java @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.transport.sshd; + +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Function; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.transport.CredentialsProvider; + +/** + * Maintains a static singleton instance of a factory to create a + * {@link KeyPasswordProvider} from a {@link CredentialsProvider}. + * + * @since 7.1 + */ +public final class KeyPasswordProviderFactory { + + /** + * Creates a {@link KeyPasswordProvider} from a {@link CredentialsProvider}. + */ + @FunctionalInterface + public interface KeyPasswordProviderCreator + extends Function { + // Nothing + } + + private static final KeyPasswordProviderCreator DEFAULT = IdentityPasswordProvider::new; + + private static AtomicReference INSTANCE = new AtomicReference<>( + DEFAULT); + + private KeyPasswordProviderFactory() { + // No instantiation + } + + /** + * Retrieves the currently set {@link KeyPasswordProviderCreator}. + * + * @return the {@link KeyPasswordProviderCreator} + */ + @NonNull + public static KeyPasswordProviderCreator getInstance() { + return INSTANCE.get(); + } + + /** + * Sets a new {@link KeyPasswordProviderCreator}. + * + * @param provider + * to set; if {@code null}, sets a default provider. + * @return the previously set {@link KeyPasswordProviderCreator} + */ + @NonNull + public static KeyPasswordProviderCreator setInstance( + KeyPasswordProviderCreator provider) { + if (provider == null) { + return INSTANCE.getAndSet(DEFAULT); + } + return INSTANCE.getAndSet(provider); + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java index 2c3cbe55c9..4a2eb9c3dd 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/transport/sshd/SshdSessionFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2022 Thomas Wolf and others + * Copyright (C) 2018, 2024 Thomas Wolf and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -210,7 +210,7 @@ public class SshdSessionFactory extends SshSessionFactory implements Closeable { home, sshDir); KeyIdentityProvider defaultKeysProvider = toKeyIdentityProvider( getDefaultKeys(sshDir)); - Supplier keyPasswordProvider = () -> createKeyPasswordProvider( + Supplier keyPasswordProvider = newKeyPasswordProvider( credentialsProvider); SshClient client = ClientBuilder.builder() .factory(JGitSshClient::new) @@ -574,12 +574,24 @@ public class SshdSessionFactory extends SshSessionFactory implements Closeable { * @param provider * the {@link CredentialsProvider} to delegate to for user * interactions - * @return a new {@link KeyPasswordProvider} + * @return a new {@link KeyPasswordProvider}, or {@code null} to use the + * global {@link KeyPasswordProviderFactory} */ - @NonNull protected KeyPasswordProvider createKeyPasswordProvider( CredentialsProvider provider) { - return new IdentityPasswordProvider(provider); + return null; + } + + private Supplier newKeyPasswordProvider( + CredentialsProvider credentials) { + return () -> { + KeyPasswordProvider provider = createKeyPasswordProvider( + credentials); + if (provider != null) { + return provider; + } + return KeyPasswordProviderFactory.getInstance().apply(credentials); + }; } /** -- cgit v1.2.3 From d4ef88dae905a8d8bca76671674e0423aa37f0bf Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 28 Sep 2024 15:50:45 +0200 Subject: SSH signing: prepare config Include the SSH specifics in the GpgConfig so that we will have access to these configs later on. Change-Id: Iad3d6f2bdb5ba879e1672368c82d367b8ccd246c Signed-off-by: Thomas Wolf --- .../src/org/eclipse/jgit/lib/ConfigConstants.java | 29 +++++++++++++ .../src/org/eclipse/jgit/lib/GpgConfig.java | 50 ++++++++++++++++++++++ 2 files changed, 79 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index c5f27688be..a57f1b714a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -205,8 +205,37 @@ public final class ConfigConstants { */ public static final String CONFIG_KEY_SIGNINGKEY = "signingKey"; + /** + * The "ssh" subsection key. + * + * @since 7.1 + */ + public static final String CONFIG_SSH_SUBSECTION = "ssh"; + + /** + * The "defaultKeyCommand" key. + * + * @since 7.1 + */ + public static final String CONFIG_KEY_SSH_DEFAULT_KEY_COMMAND = "defaultKeyCommand"; + + /** + * The "allowedSignersFile" key. + * + * @since 7.1 + */ + public static final String CONFIG_KEY_SSH_ALLOWED_SIGNERS_FILE = "allowedSignersFile"; + + /** + * The "revocationFile" key, + * + * @since 7.1 + */ + public static final String CONFIG_KEY_SSH_REVOCATION_FILE = "revocationFile"; + /** * The "commit" section + * * @since 5.2 */ public static final String CONFIG_COMMIT_SECTION = "commit"; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java index fb5c904215..76ed36a6e5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java @@ -61,6 +61,12 @@ public class GpgConfig { private final boolean forceAnnotated; + private final String sshDefaultKeyCommand; + + private final String sshAllowedSignersFile; + + private final String sshRevocationFile; + /** * Create a new GPG config that reads the configuration from config. * @@ -88,6 +94,17 @@ public class GpgConfig { ConfigConstants.CONFIG_KEY_GPGSIGN, false); forceAnnotated = config.getBoolean(ConfigConstants.CONFIG_TAG_SECTION, ConfigConstants.CONFIG_KEY_FORCE_SIGN_ANNOTATED, false); + sshDefaultKeyCommand = config.getString( + ConfigConstants.CONFIG_GPG_SECTION, + ConfigConstants.CONFIG_SSH_SUBSECTION, + ConfigConstants.CONFIG_KEY_SSH_DEFAULT_KEY_COMMAND); + sshAllowedSignersFile = config.getString( + ConfigConstants.CONFIG_GPG_SECTION, + ConfigConstants.CONFIG_SSH_SUBSECTION, + ConfigConstants.CONFIG_KEY_SSH_ALLOWED_SIGNERS_FILE); + sshRevocationFile = config.getString(ConfigConstants.CONFIG_GPG_SECTION, + ConfigConstants.CONFIG_SSH_SUBSECTION, + ConfigConstants.CONFIG_KEY_SSH_REVOCATION_FILE); } /** @@ -151,4 +168,37 @@ public class GpgConfig { public boolean isSignAnnotated() { return forceAnnotated; } + + /** + * Retrieves the value of git config {@code gpg.ssh.defaultKeyCommand}. + * + * @return the value of {@code gpg.ssh.defaultKeyCommand} + * + * @since 7.1 + */ + public String getSshDefaultKeyCommand() { + return sshDefaultKeyCommand; + } + + /** + * Retrieves the value of git config {@code gpg.ssh.allowedSignersFile}. + * + * @return the value of {@code gpg.ssh.allowedSignersFile} + * + * @since 7.1 + */ + public String getSshAllowedSignersFile() { + return sshAllowedSignersFile; + } + + /** + * Retrieves the value of git config {@code gpg.ssh.revocationFile}. + * + * @return the value of {@code gpg.ssh.revocationFile} + * + * @since 7.1 + */ + public String getSshRevocationFile() { + return sshRevocationFile; + } } -- cgit v1.2.3 From 06485d5275f22bda5bcd5a95ecd0ce33719db3aa Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 28 Sep 2024 15:52:31 +0200 Subject: SSH signing: make OpenSSH pattern matching public SSH signing needs the same pattern matching algorithm as is used for host matching in host entries in ~/.ssh/config. So make that pattern matching available via a static method. Change-Id: Ia26f23666f323f44ce66f769fbcd6c85965eb219 Signed-off-by: Thomas Wolf --- .../internal/transport/ssh/OpenSshConfigFile.java | 43 +++++++++++++++------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java index 3e75a9dde3..542d6e94f3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/transport/ssh/OpenSshConfigFile.java @@ -427,7 +427,35 @@ public class OpenSshConfigFile implements SshConfigStore { return value; } - private static boolean patternMatchesHost(String pattern, String name) { + /** + * Tells whether a given {@code name} matches the given list of patterns, + * accounting for negative matches. + * + * @param patterns + * to test {@code name} against; any pattern starting with an + * exclamation mark is a negative pattern + * @param name + * to test + * @return {@code true} if the {@code name} matches at least one of the + * non-negative patterns and none of the negative patterns, + * {@code false} otherwise + * @since 7.1 + */ + public static boolean patternMatch(Iterable patterns, String name) { + boolean doesMatch = false; + for (String pattern : patterns) { + if (pattern.startsWith("!")) { //$NON-NLS-1$ + if (patternMatches(pattern.substring(1), name)) { + return false; + } + } else if (!doesMatch && patternMatches(pattern, name)) { + doesMatch = true; + } + } + return doesMatch; + } + + private static boolean patternMatches(String pattern, String name) { if (pattern.indexOf('*') >= 0 || pattern.indexOf('?') >= 0) { final FileNameMatcher fn; try { @@ -680,18 +708,7 @@ public class OpenSshConfigFile implements SshConfigStore { } boolean matches(String hostName) { - boolean doesMatch = false; - for (String pattern : patterns) { - if (pattern.startsWith("!")) { //$NON-NLS-1$ - if (patternMatchesHost(pattern.substring(1), hostName)) { - return false; - } - } else if (!doesMatch - && patternMatchesHost(pattern, hostName)) { - doesMatch = true; - } - } - return doesMatch; + return patternMatch(patterns, hostName); } private static String toKey(String key) { -- cgit v1.2.3 From a202d970651f5292c47e8bbf3505bea50d328081 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 6 Oct 2024 17:10:38 +0200 Subject: SSH signing: don't require a session in PasswordProviderWrapper To read passphrase-protected private keys SSH signing will need to use a PasswordProviderWrapper without SSH session. Change-Id: I3ecac6c099f3ed1565fb4f0d56d55aee16edb9fc Signed-off-by: Thomas Wolf --- .../internal/transport/sshd/PasswordProviderWrapper.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/PasswordProviderWrapper.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/PasswordProviderWrapper.java index 2cd0669842..900c9fba24 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/PasswordProviderWrapper.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/PasswordProviderWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2020 Thomas Wolf and others + * Copyright (C) 2018, 2024 Thomas Wolf and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -47,6 +47,8 @@ public class PasswordProviderWrapper implements FilePasswordProvider { private final Supplier factory; + private PerSessionState noSessionState; + /** * Creates a new {@link PasswordProviderWrapper}. * @@ -59,13 +61,18 @@ public class PasswordProviderWrapper implements FilePasswordProvider { } private PerSessionState getState(SessionContext context) { - PerSessionState state = context.getAttribute(STATE); + PerSessionState state = context != null ? context.getAttribute(STATE) + : noSessionState; if (state == null) { state = new PerSessionState(); state.delegate = factory.get(); state.delegate.setAttempts( PASSWORD_PROMPTS.getRequiredDefault().intValue()); - context.setAttribute(STATE, state); + if (context != null) { + context.setAttribute(STATE, state); + } else { + noSessionState = state; + } } return state; } -- cgit v1.2.3 From 4902b2baf8dde2f6249eb0aeb7f1164921ce5a86 Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Fri, 20 Sep 2024 08:47:13 +0200 Subject: Add `numberOfPackFilesAfterBitmap` to RepoStatistics Introduce a `numberOfPackFilesAfterBitmap` that contains the number of packfiles created since the latest bitmap generation. Notes: * the `repo.getObjectDatabase().getPacks()` that obtains the list of packs (in the existing `getStatistics` function) uses `PackDirectory.scanPacks` that boils down to call to `PackDirectory.scanPacksImpl` which is sorting packs prior returning them therefore the `numberOfPackFilesAfterBitmap` is just all packs before the one that has bitmap attached * the improved version of `packAndPrune` function (one that skips non-existent packfiles) was introduced for testing Change-Id: I608011462f104fc002ac527aa405f492a8a4b0c2 --- ...NumberOfPackFilesAfterBitmapStatisticsTest.java | 180 +++++++++++++++++++++ .../org/eclipse/jgit/internal/storage/file/GC.java | 10 ++ 2 files changed, 190 insertions(+) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java new file mode 100644 index 0000000000..820f0c768d --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java @@ -0,0 +1,180 @@ +/* + * Copyright (c) 2024 Jacek Centkowski and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import static org.junit.Assert.assertEquals; + +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.StreamSupport; + +import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackWriter; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.util.FileUtils; +import org.junit.Test; + +public class GcNumberOfPackFilesAfterBitmapStatisticsTest extends GcTestCase { + @Test + public void testShouldReportZeroObjectsForInitializedRepo() + throws IOException { + assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap); + } + + @Test + public void testShouldReportAllPackFilesWhenNoGcWasPerformed() + throws Exception { + packAndPrune(); + long result = gc.getStatistics().numberOfPackFilesAfterBitmap; + + assertEquals(repo.getObjectDatabase().getPacks().size(), result); + } + + @Test + public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception { + // given + addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap); + } + + @Test + public void testShouldReportNewObjectsAfterGcWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap); + } + + @Test + public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & gc + parent = addCommit(parent); + gc.gc().get(); + assertEquals(2L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap); + } + + private void packAndPrune() throws Exception { + try (SkipNonExistingFilesTestRepository testRepo = new SkipNonExistingFilesTestRepository( + repo)) { + testRepo.packAndPrune(); + } + } + + private RevCommit addCommit(RevCommit parent) throws Exception { + PersonIdent ident = new PersonIdent("repo-metrics", "repo@metrics.com"); + TestRepository.CommitBuilder builder = tr.commit() + .author(ident); + if (parent != null) { + builder.parent(parent); + } + RevCommit commit = builder.create(); + tr.update("master", commit); + parent = commit; + return parent; + } + + private long repositoryBitmapFiles() throws IOException { + return StreamSupport + .stream(Files + .newDirectoryStream(repo.getObjectDatabase() + .getPackDirectory().toPath(), "pack-*.bitmap") + .spliterator(), false) + .count(); + } + + /** + * The TestRepository has a {@link TestRepository#packAndPrune()} function + * but it fails in the last step after GC was performed as it doesn't + * SKIP_MISSING files. In order to circumvent it was copied and improved + * here. + */ + private static class SkipNonExistingFilesTestRepository + extends TestRepository { + private final FileRepository repo; + + private SkipNonExistingFilesTestRepository(FileRepository db) throws IOException { + super(db); + repo = db; + } + + @Override + public void packAndPrune() throws Exception { + ObjectDirectory odb = repo.getObjectDatabase(); + NullProgressMonitor m = NullProgressMonitor.INSTANCE; + + final PackFile pack, idx; + try (PackWriter pw = new PackWriter(repo)) { + Set all = new HashSet<>(); + for (Ref r : repo.getRefDatabase().getRefs()) + all.add(r.getObjectId()); + pw.preparePack(m, all, PackWriter.NONE); + + pack = new PackFile(odb.getPackDirectory(), pw.computeName(), + PackExt.PACK); + try (OutputStream out = new BufferedOutputStream( + new FileOutputStream(pack))) { + pw.writePack(m, m, out); + } + pack.setReadOnly(); + + idx = pack.create(PackExt.INDEX); + try (OutputStream out = new BufferedOutputStream( + new FileOutputStream(idx))) { + pw.writeIndex(out); + } + idx.setReadOnly(); + } + + odb.openPack(pack); + updateServerInfo(); + + // alternative packAndPrune implementation that skips missing files + // after GC. + for (Pack p : odb.getPacks()) { + for (MutableEntry e : p) + FileUtils.delete(odb.fileFor(e.toObjectId()), + FileUtils.SKIP_MISSING); + } + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 4fafc5a088..34b5ec01e1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1508,6 +1508,12 @@ public class GC { */ public long numberOfPackFiles; + /** + * The number of pack files that were created after the last bitmap + * generation. + */ + public long numberOfPackFilesAfterBitmap; + /** * The number of objects stored as loose objects. */ @@ -1543,6 +1549,8 @@ public class GC { final StringBuilder b = new StringBuilder(); b.append("numberOfPackedObjects=").append(numberOfPackedObjects); //$NON-NLS-1$ b.append(", numberOfPackFiles=").append(numberOfPackFiles); //$NON-NLS-1$ + b.append(", numberOfPackFilesAfterBitmap=") //$NON-NLS-1$ + .append(numberOfPackFilesAfterBitmap); b.append(", numberOfLooseObjects=").append(numberOfLooseObjects); //$NON-NLS-1$ b.append(", numberOfLooseRefs=").append(numberOfLooseRefs); //$NON-NLS-1$ b.append(", numberOfPackedRefs=").append(numberOfPackedRefs); //$NON-NLS-1$ @@ -1569,6 +1577,8 @@ public class GC { ret.sizeOfPackedObjects += p.getPackFile().length(); if (p.getBitmapIndex() != null) ret.numberOfBitmaps += p.getBitmapIndex().getBitmapCount(); + else + ret.numberOfPackFilesAfterBitmap++; } File objDir = repo.getObjectsDirectory(); String[] fanout = objDir.list(); -- cgit v1.2.3 From 52405358a588b6453c7568e7430456826f2ce3b4 Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Mon, 7 Oct 2024 15:20:26 -0700 Subject: PackIndexWriter: create interface to write indexes PackWriter assumes that the primary index goes to a file in a well-known format. This cannot accomodate implementations in other storages or formats (e.g. in a database). Create an interface to write the index (PackIndexWriter). This interface will be implemented by the existing pack index writer classes (PackIndexWriterV1 etc.). As the "PackIndexWriter" name was used by the previous superclass of the file writers, we rename that class to "BasePackIndexWriter". Change-Id: Ia7348395315e458fc7adc75a8db5dcb903e2a4a1 --- .../internal/storage/file/AbbreviationTest.java | 1 + .../internal/storage/file/BasePackWriterTest.java | 1079 ++++++++++++++++++++ .../jgit/internal/storage/file/PackWriterTest.java | 1079 -------------------- .../jgit/internal/storage/dfs/DfsInserter.java | 4 +- .../internal/storage/file/BasePackIndexWriter.java | 269 +++++ .../storage/file/ObjectDirectoryPackParser.java | 7 +- .../jgit/internal/storage/file/PackIndex.java | 2 +- .../internal/storage/file/PackIndexWriter.java | 267 ----- .../internal/storage/file/PackIndexWriterV1.java | 4 +- .../internal/storage/file/PackIndexWriterV2.java | 4 +- .../jgit/internal/storage/file/PackInserter.java | 4 +- .../internal/storage/pack/PackIndexWriter.java | 40 + .../jgit/internal/storage/pack/PackWriter.java | 8 +- .../org/eclipse/jgit/storage/pack/PackConfig.java | 6 +- 14 files changed, 1410 insertions(+), 1364 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackIndexWriter.java delete mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriter.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackIndexWriter.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java index bd36337f35..41a33df0e4 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/AbbreviationTest.java @@ -29,6 +29,7 @@ import java.util.List; import org.eclipse.jgit.errors.AmbiguousObjectException; import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackIndexWriter; import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.lib.AbbreviatedObjectId; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java new file mode 100644 index 0000000000..92d7465376 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BasePackWriterTest.java @@ -0,0 +1,1079 @@ +/* + * Copyright (C) 2008, Marek Zawirski and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import static org.eclipse.jgit.internal.storage.pack.PackWriter.NONE; +import static org.eclipse.jgit.lib.Constants.INFO_ALTERNATES; +import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackWriter; +import org.eclipse.jgit.junit.JGitTestUtil; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.junit.TestRepository.BranchBuilder; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.ObjectIdSet; +import org.eclipse.jgit.lib.ObjectInserter; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.Sets; +import org.eclipse.jgit.revwalk.DepthWalk; +import org.eclipse.jgit.revwalk.ObjectWalk; +import org.eclipse.jgit.revwalk.RevBlob; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevObject; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.storage.pack.PackConfig; +import org.eclipse.jgit.storage.pack.PackStatistics; +import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; +import org.eclipse.jgit.transport.PackParser; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mockito; + +public class BasePackWriterTest extends SampleDataRepositoryTestCase { + + private static final List EMPTY_LIST_REVS = Collections + . emptyList(); + + private static final Set EMPTY_ID_SET = Collections + . emptySet(); + + private PackConfig config; + + private PackWriter writer; + + private ByteArrayOutputStream os; + + private Pack pack; + + private ObjectInserter inserter; + + private FileRepository dst; + + private RevBlob contentA; + + private RevBlob contentB; + + private RevBlob contentC; + + private RevBlob contentD; + + private RevBlob contentE; + + private RevCommit c1; + + private RevCommit c2; + + private RevCommit c3; + + private RevCommit c4; + + private RevCommit c5; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + os = new ByteArrayOutputStream(); + config = new PackConfig(db); + + dst = createBareRepository(); + File alt = new File(dst.getObjectDatabase().getDirectory(), INFO_ALTERNATES); + alt.getParentFile().mkdirs(); + write(alt, db.getObjectDatabase().getDirectory().getAbsolutePath() + "\n"); + } + + @Override + @After + public void tearDown() throws Exception { + if (writer != null) { + writer.close(); + writer = null; + } + if (inserter != null) { + inserter.close(); + inserter = null; + } + super.tearDown(); + } + + /** + * Test constructor for exceptions, default settings, initialization. + * + * @throws IOException + */ + @Test + public void testContructor() throws IOException { + writer = new PackWriter(config, db.newObjectReader()); + assertFalse(writer.isDeltaBaseAsOffset()); + assertTrue(config.isReuseDeltas()); + assertTrue(config.isReuseObjects()); + assertEquals(0, writer.getObjectCount()); + } + + /** + * Change default settings and verify them. + */ + @Test + public void testModifySettings() { + config.setReuseDeltas(false); + config.setReuseObjects(false); + config.setDeltaBaseAsOffset(false); + assertFalse(config.isReuseDeltas()); + assertFalse(config.isReuseObjects()); + assertFalse(config.isDeltaBaseAsOffset()); + + writer = new PackWriter(config, db.newObjectReader()); + writer.setDeltaBaseAsOffset(true); + assertTrue(writer.isDeltaBaseAsOffset()); + assertFalse(config.isDeltaBaseAsOffset()); + } + + /** + * Write empty pack by providing empty sets of interesting/uninteresting + * objects and check for correct format. + * + * @throws IOException + */ + @Test + public void testWriteEmptyPack1() throws IOException { + createVerifyOpenPack(NONE, NONE, false, false); + + assertEquals(0, writer.getObjectCount()); + assertEquals(0, pack.getObjectCount()); + assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", writer + .computeName().name()); + } + + /** + * Write empty pack by providing empty iterator of objects to write and + * check for correct format. + * + * @throws IOException + */ + @Test + public void testWriteEmptyPack2() throws IOException { + createVerifyOpenPack(EMPTY_LIST_REVS); + + assertEquals(0, writer.getObjectCount()); + assertEquals(0, pack.getObjectCount()); + } + + /** + * Try to pass non-existing object as uninteresting, with non-ignoring + * setting. + * + * @throws IOException + */ + @Test + public void testNotIgnoreNonExistingObjects() throws IOException { + final ObjectId nonExisting = ObjectId + .fromString("0000000000000000000000000000000000000001"); + try { + createVerifyOpenPack(NONE, haves(nonExisting), false, false); + fail("Should have thrown MissingObjectException"); + } catch (MissingObjectException x) { + // expected + } + } + + /** + * Try to pass non-existing object as uninteresting, with ignoring setting. + * + * @throws IOException + */ + @Test + public void testIgnoreNonExistingObjects() throws IOException { + final ObjectId nonExisting = ObjectId + .fromString("0000000000000000000000000000000000000001"); + createVerifyOpenPack(NONE, haves(nonExisting), false, true); + // shouldn't throw anything + } + + /** + * Try to pass non-existing object as uninteresting, with ignoring setting. + * Use a repo with bitmap indexes because then PackWriter will use + * PackWriterBitmapWalker which had problems with this situation. + * + * @throws Exception + */ + @Test + public void testIgnoreNonExistingObjectsWithBitmaps() throws Exception { + final ObjectId nonExisting = ObjectId + .fromString("0000000000000000000000000000000000000001"); + new GC(db).gc().get(); + createVerifyOpenPack(NONE, haves(nonExisting), false, true, true); + // shouldn't throw anything + } + + /** + * Create pack basing on only interesting objects, then precisely verify + * content. No delta reuse here. + * + * @throws IOException + */ + @Test + public void testWritePack1() throws IOException { + config.setReuseDeltas(false); + writeVerifyPack1(); + } + + /** + * Test writing pack without object reuse. Pack content/preparation as in + * {@link #testWritePack1()}. + * + * @throws IOException + */ + @Test + public void testWritePack1NoObjectReuse() throws IOException { + config.setReuseDeltas(false); + config.setReuseObjects(false); + writeVerifyPack1(); + } + + /** + * Create pack basing on both interesting and uninteresting objects, then + * precisely verify content. No delta reuse here. + * + * @throws IOException + */ + @Test + public void testWritePack2() throws IOException { + writeVerifyPack2(false); + } + + /** + * Test pack writing with deltas reuse, delta-base first rule. Pack + * content/preparation as in {@link #testWritePack2()}. + * + * @throws IOException + */ + @Test + public void testWritePack2DeltasReuseRefs() throws IOException { + writeVerifyPack2(true); + } + + /** + * Test pack writing with delta reuse. Delta bases referred as offsets. Pack + * configuration as in {@link #testWritePack2DeltasReuseRefs()}. + * + * @throws IOException + */ + @Test + public void testWritePack2DeltasReuseOffsets() throws IOException { + config.setDeltaBaseAsOffset(true); + writeVerifyPack2(true); + } + + /** + * Test pack writing with delta reuse. Raw-data copy (reuse) is made on a + * pack with CRC32 index. Pack configuration as in + * {@link #testWritePack2DeltasReuseRefs()}. + * + * @throws IOException + */ + @Test + public void testWritePack2DeltasCRC32Copy() throws IOException { + final File packDir = db.getObjectDatabase().getPackDirectory(); + final PackFile crc32Pack = new PackFile(packDir, + "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.pack"); + final PackFile crc32Idx = new PackFile(packDir, + "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idx"); + copyFile(JGitTestUtil.getTestResourceFile( + "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idxV2"), + crc32Idx); + db.openPack(crc32Pack); + + writeVerifyPack2(true); + } + + /** + * Create pack basing on fixed objects list, then precisely verify content. + * No delta reuse here. + * + * @throws IOException + * @throws MissingObjectException + * + */ + @Test + public void testWritePack3() throws MissingObjectException, IOException { + config.setReuseDeltas(false); + final ObjectId forcedOrder[] = new ObjectId[] { + ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), + ObjectId.fromString("c59759f143fb1fe21c197981df75a7ee00290799"), + ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), + ObjectId.fromString("902d5476fa249b7abc9d84c611577a81381f0327"), + ObjectId.fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3") , + ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; + try (RevWalk parser = new RevWalk(db)) { + final RevObject forcedOrderRevs[] = new RevObject[forcedOrder.length]; + for (int i = 0; i < forcedOrder.length; i++) + forcedOrderRevs[i] = parser.parseAny(forcedOrder[i]); + + createVerifyOpenPack(Arrays.asList(forcedOrderRevs)); + } + + assertEquals(forcedOrder.length, writer.getObjectCount()); + verifyObjectsOrder(forcedOrder); + assertEquals("ed3f96b8327c7c66b0f8f70056129f0769323d86", writer + .computeName().name()); + } + + /** + * Another pack creation: basing on both interesting and uninteresting + * objects. No delta reuse possible here, as this is a specific case when we + * write only 1 commit, associated with 1 tree, 1 blob. + * + * @throws IOException + */ + @Test + public void testWritePack4() throws IOException { + writeVerifyPack4(false); + } + + /** + * Test thin pack writing: 1 blob delta base is on objects edge. Pack + * configuration as in {@link #testWritePack4()}. + * + * @throws IOException + */ + @Test + public void testWritePack4ThinPack() throws IOException { + writeVerifyPack4(true); + } + + /** + * Compare sizes of packs created using {@link #testWritePack2()} and + * {@link #testWritePack2DeltasReuseRefs()}. The pack using deltas should + * be smaller. + * + * @throws Exception + */ + @Test + public void testWritePack2SizeDeltasVsNoDeltas() throws Exception { + config.setReuseDeltas(false); + config.setDeltaCompress(false); + testWritePack2(); + final long sizePack2NoDeltas = os.size(); + tearDown(); + setUp(); + testWritePack2DeltasReuseRefs(); + final long sizePack2DeltasRefs = os.size(); + + assertTrue(sizePack2NoDeltas > sizePack2DeltasRefs); + } + + /** + * Compare sizes of packs created using + * {@link #testWritePack2DeltasReuseRefs()} and + * {@link #testWritePack2DeltasReuseOffsets()}. The pack with delta bases + * written as offsets should be smaller. + * + * @throws Exception + */ + @Test + public void testWritePack2SizeOffsetsVsRefs() throws Exception { + testWritePack2DeltasReuseRefs(); + final long sizePack2DeltasRefs = os.size(); + tearDown(); + setUp(); + testWritePack2DeltasReuseOffsets(); + final long sizePack2DeltasOffsets = os.size(); + + assertTrue(sizePack2DeltasRefs > sizePack2DeltasOffsets); + } + + /** + * Compare sizes of packs created using {@link #testWritePack4()} and + * {@link #testWritePack4ThinPack()}. Obviously, the thin pack should be + * smaller. + * + * @throws Exception + */ + @Test + public void testWritePack4SizeThinVsNoThin() throws Exception { + testWritePack4(); + final long sizePack4 = os.size(); + tearDown(); + setUp(); + testWritePack4ThinPack(); + final long sizePack4Thin = os.size(); + + assertTrue(sizePack4 > sizePack4Thin); + } + + @Test + public void testDeltaStatistics() throws Exception { + config.setDeltaCompress(true); + // TestRepository will close repo + FileRepository repo = createBareRepository(); + ArrayList blobs = new ArrayList<>(); + try (TestRepository testRepo = new TestRepository<>( + repo)) { + blobs.add(testRepo.blob(genDeltableData(1000))); + blobs.add(testRepo.blob(genDeltableData(1005))); + try (PackWriter pw = new PackWriter(repo)) { + NullProgressMonitor m = NullProgressMonitor.INSTANCE; + pw.preparePack(blobs.iterator()); + pw.writePack(m, m, os); + PackStatistics stats = pw.getStatistics(); + assertEquals(1, stats.getTotalDeltas()); + assertTrue("Delta bytes not set.", + stats.byObjectType(OBJ_BLOB).getDeltaBytes() > 0); + } + } + } + + // Generate consistent junk data for building files that delta well + private String genDeltableData(int length) { + assertTrue("Generated data must have a length > 0", length > 0); + char[] data = {'a', 'b', 'c', '\n'}; + StringBuilder builder = new StringBuilder(length); + for (int i = 0; i < length; i++) { + builder.append(data[i % 4]); + } + return builder.toString(); + } + + + @Test + public void testWriteIndex() throws Exception { + config.setIndexVersion(2); + writeVerifyPack4(false); + + PackFile packFile = pack.getPackFile(); + PackFile indexFile = packFile.create(PackExt.INDEX); + + // Validate that IndexPack came up with the right CRC32 value. + final PackIndex idx1 = PackIndex.open(indexFile); + assertTrue(idx1 instanceof PackIndexV2); + assertEquals(0x4743F1E4L, idx1.findCRC32(ObjectId + .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"))); + + // Validate that an index written by PackWriter is the same. + final File idx2File = new File(indexFile.getAbsolutePath() + ".2"); + try (FileOutputStream is = new FileOutputStream(idx2File)) { + writer.writeIndex(is); + } + final PackIndex idx2 = PackIndex.open(idx2File); + assertTrue(idx2 instanceof PackIndexV2); + assertEquals(idx1.getObjectCount(), idx2.getObjectCount()); + assertEquals(idx1.getOffset64Count(), idx2.getOffset64Count()); + + for (int i = 0; i < idx1.getObjectCount(); i++) { + final ObjectId id = idx1.getObjectId(i); + assertEquals(id, idx2.getObjectId(i)); + assertEquals(idx1.findOffset(id), idx2.findOffset(id)); + assertEquals(idx1.findCRC32(id), idx2.findCRC32(id)); + } + } + + @Test + public void testWriteObjectSizeIndex_noDeltas() throws Exception { + config.setMinBytesForObjSizeIndex(0); + HashSet interesting = new HashSet<>(); + interesting.add(ObjectId + .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7")); + + NullProgressMonitor m1 = NullProgressMonitor.INSTANCE; + writer = new PackWriter(config, db.newObjectReader()); + writer.setUseBitmaps(false); + writer.setThin(false); + writer.setIgnoreMissingUninteresting(false); + writer.preparePack(m1, interesting, NONE); + writer.writePack(m1, m1, os); + + PackIndex idx; + try (ByteArrayOutputStream is = new ByteArrayOutputStream()) { + writer.writeIndex(is); + idx = PackIndex.read(new ByteArrayInputStream(is.toByteArray())); + } + + PackObjectSizeIndex objSizeIdx; + try (ByteArrayOutputStream objSizeStream = new ByteArrayOutputStream()) { + writer.writeObjectSizeIndex(objSizeStream); + objSizeIdx = PackObjectSizeIndexLoader.load( + new ByteArrayInputStream(objSizeStream.toByteArray())); + } + writer.close(); + + ObjectId knownBlob1 = ObjectId + .fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259"); + ObjectId knownBlob2 = ObjectId + .fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3"); + assertEquals(18009, objSizeIdx.getSize(idx.findPosition(knownBlob1))); + assertEquals(18787, objSizeIdx.getSize(idx.findPosition(knownBlob2))); + } + + @Test + public void testWriteReverseIndexConfig() { + assertFalse(config.isWriteReverseIndex()); + config.setWriteReverseIndex(true); + assertTrue(config.isWriteReverseIndex()); + } + + @Test + public void testWriteReverseIndexOff() throws Exception { + config.setWriteReverseIndex(false); + writer = new PackWriter(config, db.newObjectReader()); + ByteArrayOutputStream reverseIndexOutput = new ByteArrayOutputStream(); + + writer.writeReverseIndex(reverseIndexOutput); + + assertEquals(0, reverseIndexOutput.size()); + } + + @Test + public void testWriteReverseIndexOn() throws Exception { + config.setWriteReverseIndex(true); + writeVerifyPack4(false); + ByteArrayOutputStream reverseIndexOutput = new ByteArrayOutputStream(); + int headerBytes = 12; + int bodyBytes = 12; + int footerBytes = 40; + + writer.writeReverseIndex(reverseIndexOutput); + + assertTrue(reverseIndexOutput.size() == headerBytes + bodyBytes + + footerBytes); + } + + @Test + public void testExclude() throws Exception { + // TestRepository closes repo + FileRepository repo = createBareRepository(); + + try (TestRepository testRepo = new TestRepository<>( + repo)) { + BranchBuilder bb = testRepo.branch("refs/heads/master"); + contentA = testRepo.blob("A"); + c1 = bb.commit().add("f", contentA).create(); + testRepo.getRevWalk().parseHeaders(c1); + PackIndex pf1 = writePack(repo, wants(c1), EMPTY_ID_SET); + assertContent(pf1, Arrays.asList(c1.getId(), c1.getTree().getId(), + contentA.getId())); + contentB = testRepo.blob("B"); + c2 = bb.commit().add("f", contentB).create(); + testRepo.getRevWalk().parseHeaders(c2); + PackIndex pf2 = writePack(repo, wants(c2), + Sets.of((ObjectIdSet) pf1)); + assertContent(pf2, Arrays.asList(c2.getId(), c2.getTree().getId(), + contentB.getId())); + } + } + + private static void assertContent(PackIndex pi, List expected) { + assertEquals("Pack index has wrong size.", expected.size(), + pi.getObjectCount()); + for (int i = 0; i < pi.getObjectCount(); i++) + assertTrue( + "Pack index didn't contain the expected id " + + pi.getObjectId(i), + expected.contains(pi.getObjectId(i))); + } + + @Test + public void testShallowIsMinimalDepth1() throws Exception { + try (FileRepository repo = setupRepoForShallowFetch()) { + PackIndex idx = writeShallowPack(repo, 1, wants(c2), NONE, NONE); + assertContent(idx, Arrays.asList(c2.getId(), c2.getTree().getId(), + contentA.getId(), contentB.getId())); + + // Client already has blobs A and B, verify those are not packed. + idx = writeShallowPack(repo, 1, wants(c5), haves(c2), shallows(c2)); + assertContent(idx, Arrays.asList(c5.getId(), c5.getTree().getId(), + contentC.getId(), contentD.getId(), contentE.getId())); + } + } + + @Test + public void testShallowIsMinimalDepth2() throws Exception { + try (FileRepository repo = setupRepoForShallowFetch()) { + PackIndex idx = writeShallowPack(repo, 2, wants(c2), NONE, NONE); + assertContent(idx, + Arrays.asList(c1.getId(), c2.getId(), c1.getTree().getId(), + c2.getTree().getId(), contentA.getId(), + contentB.getId())); + + // Client already has blobs A and B, verify those are not packed. + idx = writeShallowPack(repo, 2, wants(c5), haves(c1, c2), + shallows(c1)); + assertContent(idx, + Arrays.asList(c4.getId(), c5.getId(), c4.getTree().getId(), + c5.getTree().getId(), contentC.getId(), + contentD.getId(), contentE.getId())); + } + } + + @Test + public void testShallowFetchShallowParentDepth1() throws Exception { + try (FileRepository repo = setupRepoForShallowFetch()) { + PackIndex idx = writeShallowPack(repo, 1, wants(c5), NONE, NONE); + assertContent(idx, Arrays.asList(c5.getId(), c5.getTree().getId(), + contentA.getId(), contentB.getId(), contentC.getId(), + contentD.getId(), contentE.getId())); + + idx = writeShallowPack(repo, 1, wants(c4), haves(c5), shallows(c5)); + assertContent(idx, Arrays.asList(c4.getId(), c4.getTree().getId())); + } + } + + @Test + public void testShallowFetchShallowParentDepth2() throws Exception { + try (FileRepository repo = setupRepoForShallowFetch()) { + PackIndex idx = writeShallowPack(repo, 2, wants(c5), NONE, NONE); + assertContent(idx, + Arrays.asList(c4.getId(), c5.getId(), c4.getTree().getId(), + c5.getTree().getId(), contentA.getId(), + contentB.getId(), contentC.getId(), + contentD.getId(), contentE.getId())); + + idx = writeShallowPack(repo, 2, wants(c3), haves(c4, c5), + shallows(c4)); + assertContent(idx, Arrays.asList(c2.getId(), c3.getId(), + c2.getTree().getId(), c3.getTree().getId())); + } + } + + @Test + public void testShallowFetchShallowAncestorDepth1() throws Exception { + try (FileRepository repo = setupRepoForShallowFetch()) { + PackIndex idx = writeShallowPack(repo, 1, wants(c5), NONE, NONE); + assertContent(idx, Arrays.asList(c5.getId(), c5.getTree().getId(), + contentA.getId(), contentB.getId(), contentC.getId(), + contentD.getId(), contentE.getId())); + + idx = writeShallowPack(repo, 1, wants(c3), haves(c5), shallows(c5)); + assertContent(idx, Arrays.asList(c3.getId(), c3.getTree().getId())); + } + } + + @Test + public void testShallowFetchShallowAncestorDepth2() throws Exception { + try (FileRepository repo = setupRepoForShallowFetch()) { + PackIndex idx = writeShallowPack(repo, 2, wants(c5), NONE, NONE); + assertContent(idx, + Arrays.asList(c4.getId(), c5.getId(), c4.getTree().getId(), + c5.getTree().getId(), contentA.getId(), + contentB.getId(), contentC.getId(), + contentD.getId(), contentE.getId())); + + idx = writeShallowPack(repo, 2, wants(c2), haves(c4, c5), + shallows(c4)); + assertContent(idx, Arrays.asList(c1.getId(), c2.getId(), + c1.getTree().getId(), c2.getTree().getId())); + } + } + + @Test + public void testTotalPackFilesScanWhenSearchForReuseTimeoutNotSet() + throws Exception { + FileRepository fileRepository = setUpRepoWithMultiplePackfiles(); + PackWriter mockedPackWriter = Mockito + .spy(new PackWriter(config, fileRepository.newObjectReader())); + + doNothing().when(mockedPackWriter).select(any(), any()); + + try (FileOutputStream packOS = new FileOutputStream( + getPackFileToWrite(fileRepository, mockedPackWriter))) { + mockedPackWriter.writePack(NullProgressMonitor.INSTANCE, + NullProgressMonitor.INSTANCE, packOS); + } + + long numberOfPackFiles = new GC(fileRepository) + .getStatistics().numberOfPackFiles; + int expectedSelectCalls = + // Objects contained in multiple packfiles * number of packfiles + 2 * (int) numberOfPackFiles + + // Objects in single packfile + 1; + verify(mockedPackWriter, times(expectedSelectCalls)).select(any(), + any()); + } + + @Test + public void testTotalPackFilesScanWhenSkippingSearchForReuseTimeoutCheck() + throws Exception { + FileRepository fileRepository = setUpRepoWithMultiplePackfiles(); + PackConfig packConfig = new PackConfig(); + packConfig.setSearchForReuseTimeout(Duration.ofSeconds(-1)); + PackWriter mockedPackWriter = Mockito.spy( + new PackWriter(packConfig, fileRepository.newObjectReader())); + + doNothing().when(mockedPackWriter).select(any(), any()); + + try (FileOutputStream packOS = new FileOutputStream( + getPackFileToWrite(fileRepository, mockedPackWriter))) { + mockedPackWriter.writePack(NullProgressMonitor.INSTANCE, + NullProgressMonitor.INSTANCE, packOS); + } + + long numberOfPackFiles = new GC(fileRepository) + .getStatistics().numberOfPackFiles; + int expectedSelectCalls = + // Objects contained in multiple packfiles * number of packfiles + 2 * (int) numberOfPackFiles + + // Objects contained in single packfile + 1; + verify(mockedPackWriter, times(expectedSelectCalls)).select(any(), + any()); + } + + @Test + public void testPartialPackFilesScanWhenDoingSearchForReuseTimeoutCheck() + throws Exception { + FileRepository fileRepository = setUpRepoWithMultiplePackfiles(); + PackConfig packConfig = new PackConfig(); + packConfig.setSearchForReuseTimeout(Duration.ofSeconds(-1)); + PackWriter mockedPackWriter = Mockito.spy( + new PackWriter(packConfig, fileRepository.newObjectReader())); + mockedPackWriter.enableSearchForReuseTimeout(); + + doNothing().when(mockedPackWriter).select(any(), any()); + + try (FileOutputStream packOS = new FileOutputStream( + getPackFileToWrite(fileRepository, mockedPackWriter))) { + mockedPackWriter.writePack(NullProgressMonitor.INSTANCE, + NullProgressMonitor.INSTANCE, packOS); + } + + int expectedSelectCalls = 3; // Objects in packfiles + verify(mockedPackWriter, times(expectedSelectCalls)).select(any(), + any()); + } + + /** + * Creates objects and packfiles in the following order: + *

    + *
  • Creates 2 objects (C1 = commit, T1 = tree) + *
  • Creates packfile P1 (containing C1, T1) + *
  • Creates 1 object (C2 commit) + *
  • Creates packfile P2 (containing C1, T1, C2) + *
  • Create 1 object (C3 commit) + *
+ * + * @throws Exception + */ + private FileRepository setUpRepoWithMultiplePackfiles() throws Exception { + FileRepository fileRepository = createWorkRepository(); + addRepoToClose(fileRepository); + try (Git git = new Git(fileRepository)) { + // Creates 2 objects (C1 = commit, T1 = tree) + git.commit().setMessage("First commit").call(); + GC gc = new GC(fileRepository); + gc.setPackExpireAgeMillis(Long.MAX_VALUE); + gc.setExpireAgeMillis(Long.MAX_VALUE); + // Creates packfile P1 (containing C1, T1) + gc.gc().get(); + // Creates 1 object (C2 commit) + git.commit().setMessage("Second commit").call(); + // Creates packfile P2 (containing C1, T1, C2) + gc.gc().get(); + // Create 1 object (C3 commit) + git.commit().setMessage("Third commit").call(); + } + return fileRepository; + } + + private PackFile getPackFileToWrite(FileRepository fileRepository, + PackWriter mockedPackWriter) throws IOException { + File packdir = fileRepository.getObjectDatabase().getPackDirectory(); + PackFile packFile = new PackFile(packdir, + mockedPackWriter.computeName(), PackExt.PACK); + + Set all = new HashSet<>(); + for (Ref r : fileRepository.getRefDatabase().getRefs()) { + all.add(r.getObjectId()); + } + + mockedPackWriter.preparePack(NullProgressMonitor.INSTANCE, all, + PackWriter.NONE); + return packFile; + } + + private FileRepository setupRepoForShallowFetch() throws Exception { + FileRepository repo = createBareRepository(); + // TestRepository will close the repo, but we need to return an open + // one! + repo.incrementOpen(); + try (TestRepository r = new TestRepository<>(repo)) { + BranchBuilder bb = r.branch("refs/heads/master"); + contentA = r.blob("A"); + contentB = r.blob("B"); + contentC = r.blob("C"); + contentD = r.blob("D"); + contentE = r.blob("E"); + c1 = bb.commit().add("a", contentA).create(); + c2 = bb.commit().add("b", contentB).create(); + c3 = bb.commit().add("c", contentC).create(); + c4 = bb.commit().add("d", contentD).create(); + c5 = bb.commit().add("e", contentE).create(); + r.getRevWalk().parseHeaders(c5); // fully initialize the tip RevCommit + return repo; + } + } + + private static PackIndex writePack(FileRepository repo, + Set want, Set excludeObjects) + throws IOException { + try (RevWalk walk = new RevWalk(repo)) { + return writePack(repo, walk, 0, want, NONE, excludeObjects); + } + } + + private static PackIndex writeShallowPack(FileRepository repo, int depth, + Set want, Set have, + Set shallow) throws IOException { + // During negotiation, UploadPack would have set up a DepthWalk and + // marked the client's "shallow" commits. Emulate that here. + try (DepthWalk.RevWalk walk = new DepthWalk.RevWalk(repo, depth - 1)) { + walk.assumeShallow(shallow); + return writePack(repo, walk, depth, want, have, EMPTY_ID_SET); + } + } + + private static PackIndex writePack(FileRepository repo, RevWalk walk, + int depth, Set want, + Set have, Set excludeObjects) + throws IOException { + try (PackWriter pw = new PackWriter(repo)) { + pw.setDeltaBaseAsOffset(true); + pw.setReuseDeltaCommits(false); + for (ObjectIdSet idx : excludeObjects) { + pw.excludeObjects(idx); + } + if (depth > 0) { + pw.setShallowPack(depth, null); + } + // ow doesn't need to be closed; caller closes walk. + ObjectWalk ow = walk.toObjectWalkWithSameObjects(); + + pw.preparePack(NullProgressMonitor.INSTANCE, ow, want, have, NONE); + File packdir = repo.getObjectDatabase().getPackDirectory(); + PackFile packFile = new PackFile(packdir, pw.computeName(), + PackExt.PACK); + try (FileOutputStream packOS = new FileOutputStream(packFile)) { + pw.writePack(NullProgressMonitor.INSTANCE, + NullProgressMonitor.INSTANCE, packOS); + } + PackFile idxFile = packFile.create(PackExt.INDEX); + try (FileOutputStream idxOS = new FileOutputStream(idxFile)) { + pw.writeIndex(idxOS); + } + return PackIndex.open(idxFile); + } + } + + // TODO: testWritePackDeltasCycle() + // TODO: testWritePackDeltasDepth() + + private void writeVerifyPack1() throws IOException { + final HashSet interestings = new HashSet<>(); + interestings.add(ObjectId + .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7")); + createVerifyOpenPack(interestings, NONE, false, false); + + final ObjectId expectedOrder[] = new ObjectId[] { + ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), + ObjectId.fromString("c59759f143fb1fe21c197981df75a7ee00290799"), + ObjectId.fromString("540a36d136cf413e4b064c2b0e0a4db60f77feab"), + ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), + ObjectId.fromString("902d5476fa249b7abc9d84c611577a81381f0327"), + ObjectId.fromString("4b825dc642cb6eb9a060e54bf8d69288fbee4904"), + ObjectId.fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3"), + ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; + + assertEquals(expectedOrder.length, writer.getObjectCount()); + verifyObjectsOrder(expectedOrder); + assertEquals("34be9032ac282b11fa9babdc2b2a93ca996c9c2f", writer + .computeName().name()); + } + + private void writeVerifyPack2(boolean deltaReuse) throws IOException { + config.setReuseDeltas(deltaReuse); + final HashSet interestings = new HashSet<>(); + interestings.add(ObjectId + .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7")); + final HashSet uninterestings = new HashSet<>(); + uninterestings.add(ObjectId + .fromString("540a36d136cf413e4b064c2b0e0a4db60f77feab")); + createVerifyOpenPack(interestings, uninterestings, false, false); + + final ObjectId expectedOrder[] = new ObjectId[] { + ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), + ObjectId.fromString("c59759f143fb1fe21c197981df75a7ee00290799"), + ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), + ObjectId.fromString("902d5476fa249b7abc9d84c611577a81381f0327"), + ObjectId.fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3") , + ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; + if (!config.isReuseDeltas() && !config.isDeltaCompress()) { + // If no deltas are in the file the final two entries swap places. + swap(expectedOrder, 4, 5); + } + assertEquals(expectedOrder.length, writer.getObjectCount()); + verifyObjectsOrder(expectedOrder); + assertEquals("ed3f96b8327c7c66b0f8f70056129f0769323d86", writer + .computeName().name()); + } + + private static void swap(ObjectId[] arr, int a, int b) { + ObjectId tmp = arr[a]; + arr[a] = arr[b]; + arr[b] = tmp; + } + + private void writeVerifyPack4(final boolean thin) throws IOException { + final HashSet interestings = new HashSet<>(); + interestings.add(ObjectId + .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7")); + final HashSet uninterestings = new HashSet<>(); + uninterestings.add(ObjectId + .fromString("c59759f143fb1fe21c197981df75a7ee00290799")); + createVerifyOpenPack(interestings, uninterestings, thin, false); + + final ObjectId writtenObjects[] = new ObjectId[] { + ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), + ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), + ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; + assertEquals(writtenObjects.length, writer.getObjectCount()); + ObjectId expectedObjects[]; + if (thin) { + expectedObjects = new ObjectId[4]; + System.arraycopy(writtenObjects, 0, expectedObjects, 0, + writtenObjects.length); + expectedObjects[3] = ObjectId + .fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3"); + + } else { + expectedObjects = writtenObjects; + } + verifyObjectsOrder(expectedObjects); + assertEquals("cded4b74176b4456afa456768b2b5aafb41c44fc", writer + .computeName().name()); + } + + private void createVerifyOpenPack(final Set interestings, + final Set uninterestings, final boolean thin, + final boolean ignoreMissingUninteresting) + throws MissingObjectException, IOException { + createVerifyOpenPack(interestings, uninterestings, thin, + ignoreMissingUninteresting, false); + } + + private void createVerifyOpenPack(final Set interestings, + final Set uninterestings, final boolean thin, + final boolean ignoreMissingUninteresting, boolean useBitmaps) + throws MissingObjectException, IOException { + NullProgressMonitor m = NullProgressMonitor.INSTANCE; + writer = new PackWriter(config, db.newObjectReader()); + writer.setUseBitmaps(useBitmaps); + writer.setThin(thin); + writer.setIgnoreMissingUninteresting(ignoreMissingUninteresting); + writer.preparePack(m, interestings, uninterestings); + writer.writePack(m, m, os); + writer.close(); + verifyOpenPack(thin); + } + + private void createVerifyOpenPack(List objectSource) + throws MissingObjectException, IOException { + NullProgressMonitor m = NullProgressMonitor.INSTANCE; + writer = new PackWriter(config, db.newObjectReader()); + writer.preparePack(objectSource.iterator()); + assertEquals(objectSource.size(), writer.getObjectCount()); + writer.writePack(m, m, os); + writer.close(); + verifyOpenPack(false); + } + + private void verifyOpenPack(boolean thin) throws IOException { + final byte[] packData = os.toByteArray(); + + if (thin) { + PackParser p = index(packData); + try { + p.parse(NullProgressMonitor.INSTANCE); + fail("indexer should grumble about missing object"); + } catch (IOException x) { + // expected + } + } + + ObjectDirectoryPackParser p = (ObjectDirectoryPackParser) index(packData); + p.setKeepEmpty(true); + p.setAllowThin(thin); + p.setIndexVersion(2); + p.parse(NullProgressMonitor.INSTANCE); + pack = p.getPack(); + assertNotNull("have PackFile after parsing", pack); + } + + private PackParser index(byte[] packData) throws IOException { + if (inserter == null) + inserter = dst.newObjectInserter(); + return inserter.newPackParser(new ByteArrayInputStream(packData)); + } + + private void verifyObjectsOrder(ObjectId objectsOrder[]) { + final List entries = new ArrayList<>(); + + for (MutableEntry me : pack) { + entries.add(me.cloneEntry()); + } + Collections.sort(entries, (MutableEntry o1, MutableEntry o2) -> Long + .signum(o1.getOffset() - o2.getOffset())); + + int i = 0; + for (MutableEntry me : entries) { + assertEquals(objectsOrder[i++].toObjectId(), me.toObjectId()); + } + } + + private static Set haves(ObjectId... objects) { + return Sets.of(objects); + } + + private static Set wants(ObjectId... objects) { + return Sets.of(objects); + } + + private static Set shallows(ObjectId... objects) { + return Sets.of(objects); + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java deleted file mode 100644 index 24a81b6715..0000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackWriterTest.java +++ /dev/null @@ -1,1079 +0,0 @@ -/* - * Copyright (C) 2008, Marek Zawirski and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package org.eclipse.jgit.internal.storage.file; - -import static org.eclipse.jgit.internal.storage.pack.PackWriter.NONE; -import static org.eclipse.jgit.lib.Constants.INFO_ALTERNATES; -import static org.eclipse.jgit.lib.Constants.OBJ_BLOB; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.time.Duration; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.eclipse.jgit.api.Git; -import org.eclipse.jgit.errors.MissingObjectException; -import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; -import org.eclipse.jgit.internal.storage.pack.PackExt; -import org.eclipse.jgit.internal.storage.pack.PackWriter; -import org.eclipse.jgit.junit.JGitTestUtil; -import org.eclipse.jgit.junit.TestRepository; -import org.eclipse.jgit.junit.TestRepository.BranchBuilder; -import org.eclipse.jgit.lib.NullProgressMonitor; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.ObjectIdSet; -import org.eclipse.jgit.lib.ObjectInserter; -import org.eclipse.jgit.lib.Ref; -import org.eclipse.jgit.lib.Repository; -import org.eclipse.jgit.lib.Sets; -import org.eclipse.jgit.revwalk.DepthWalk; -import org.eclipse.jgit.revwalk.ObjectWalk; -import org.eclipse.jgit.revwalk.RevBlob; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.revwalk.RevObject; -import org.eclipse.jgit.revwalk.RevWalk; -import org.eclipse.jgit.storage.pack.PackConfig; -import org.eclipse.jgit.storage.pack.PackStatistics; -import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; -import org.eclipse.jgit.transport.PackParser; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; - -public class PackWriterTest extends SampleDataRepositoryTestCase { - - private static final List EMPTY_LIST_REVS = Collections - . emptyList(); - - private static final Set EMPTY_ID_SET = Collections - . emptySet(); - - private PackConfig config; - - private PackWriter writer; - - private ByteArrayOutputStream os; - - private Pack pack; - - private ObjectInserter inserter; - - private FileRepository dst; - - private RevBlob contentA; - - private RevBlob contentB; - - private RevBlob contentC; - - private RevBlob contentD; - - private RevBlob contentE; - - private RevCommit c1; - - private RevCommit c2; - - private RevCommit c3; - - private RevCommit c4; - - private RevCommit c5; - - @Override - @Before - public void setUp() throws Exception { - super.setUp(); - os = new ByteArrayOutputStream(); - config = new PackConfig(db); - - dst = createBareRepository(); - File alt = new File(dst.getObjectDatabase().getDirectory(), INFO_ALTERNATES); - alt.getParentFile().mkdirs(); - write(alt, db.getObjectDatabase().getDirectory().getAbsolutePath() + "\n"); - } - - @Override - @After - public void tearDown() throws Exception { - if (writer != null) { - writer.close(); - writer = null; - } - if (inserter != null) { - inserter.close(); - inserter = null; - } - super.tearDown(); - } - - /** - * Test constructor for exceptions, default settings, initialization. - * - * @throws IOException - */ - @Test - public void testContructor() throws IOException { - writer = new PackWriter(config, db.newObjectReader()); - assertFalse(writer.isDeltaBaseAsOffset()); - assertTrue(config.isReuseDeltas()); - assertTrue(config.isReuseObjects()); - assertEquals(0, writer.getObjectCount()); - } - - /** - * Change default settings and verify them. - */ - @Test - public void testModifySettings() { - config.setReuseDeltas(false); - config.setReuseObjects(false); - config.setDeltaBaseAsOffset(false); - assertFalse(config.isReuseDeltas()); - assertFalse(config.isReuseObjects()); - assertFalse(config.isDeltaBaseAsOffset()); - - writer = new PackWriter(config, db.newObjectReader()); - writer.setDeltaBaseAsOffset(true); - assertTrue(writer.isDeltaBaseAsOffset()); - assertFalse(config.isDeltaBaseAsOffset()); - } - - /** - * Write empty pack by providing empty sets of interesting/uninteresting - * objects and check for correct format. - * - * @throws IOException - */ - @Test - public void testWriteEmptyPack1() throws IOException { - createVerifyOpenPack(NONE, NONE, false, false); - - assertEquals(0, writer.getObjectCount()); - assertEquals(0, pack.getObjectCount()); - assertEquals("da39a3ee5e6b4b0d3255bfef95601890afd80709", writer - .computeName().name()); - } - - /** - * Write empty pack by providing empty iterator of objects to write and - * check for correct format. - * - * @throws IOException - */ - @Test - public void testWriteEmptyPack2() throws IOException { - createVerifyOpenPack(EMPTY_LIST_REVS); - - assertEquals(0, writer.getObjectCount()); - assertEquals(0, pack.getObjectCount()); - } - - /** - * Try to pass non-existing object as uninteresting, with non-ignoring - * setting. - * - * @throws IOException - */ - @Test - public void testNotIgnoreNonExistingObjects() throws IOException { - final ObjectId nonExisting = ObjectId - .fromString("0000000000000000000000000000000000000001"); - try { - createVerifyOpenPack(NONE, haves(nonExisting), false, false); - fail("Should have thrown MissingObjectException"); - } catch (MissingObjectException x) { - // expected - } - } - - /** - * Try to pass non-existing object as uninteresting, with ignoring setting. - * - * @throws IOException - */ - @Test - public void testIgnoreNonExistingObjects() throws IOException { - final ObjectId nonExisting = ObjectId - .fromString("0000000000000000000000000000000000000001"); - createVerifyOpenPack(NONE, haves(nonExisting), false, true); - // shouldn't throw anything - } - - /** - * Try to pass non-existing object as uninteresting, with ignoring setting. - * Use a repo with bitmap indexes because then PackWriter will use - * PackWriterBitmapWalker which had problems with this situation. - * - * @throws Exception - */ - @Test - public void testIgnoreNonExistingObjectsWithBitmaps() throws Exception { - final ObjectId nonExisting = ObjectId - .fromString("0000000000000000000000000000000000000001"); - new GC(db).gc().get(); - createVerifyOpenPack(NONE, haves(nonExisting), false, true, true); - // shouldn't throw anything - } - - /** - * Create pack basing on only interesting objects, then precisely verify - * content. No delta reuse here. - * - * @throws IOException - */ - @Test - public void testWritePack1() throws IOException { - config.setReuseDeltas(false); - writeVerifyPack1(); - } - - /** - * Test writing pack without object reuse. Pack content/preparation as in - * {@link #testWritePack1()}. - * - * @throws IOException - */ - @Test - public void testWritePack1NoObjectReuse() throws IOException { - config.setReuseDeltas(false); - config.setReuseObjects(false); - writeVerifyPack1(); - } - - /** - * Create pack basing on both interesting and uninteresting objects, then - * precisely verify content. No delta reuse here. - * - * @throws IOException - */ - @Test - public void testWritePack2() throws IOException { - writeVerifyPack2(false); - } - - /** - * Test pack writing with deltas reuse, delta-base first rule. Pack - * content/preparation as in {@link #testWritePack2()}. - * - * @throws IOException - */ - @Test - public void testWritePack2DeltasReuseRefs() throws IOException { - writeVerifyPack2(true); - } - - /** - * Test pack writing with delta reuse. Delta bases referred as offsets. Pack - * configuration as in {@link #testWritePack2DeltasReuseRefs()}. - * - * @throws IOException - */ - @Test - public void testWritePack2DeltasReuseOffsets() throws IOException { - config.setDeltaBaseAsOffset(true); - writeVerifyPack2(true); - } - - /** - * Test pack writing with delta reuse. Raw-data copy (reuse) is made on a - * pack with CRC32 index. Pack configuration as in - * {@link #testWritePack2DeltasReuseRefs()}. - * - * @throws IOException - */ - @Test - public void testWritePack2DeltasCRC32Copy() throws IOException { - final File packDir = db.getObjectDatabase().getPackDirectory(); - final PackFile crc32Pack = new PackFile(packDir, - "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.pack"); - final PackFile crc32Idx = new PackFile(packDir, - "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idx"); - copyFile(JGitTestUtil.getTestResourceFile( - "pack-34be9032ac282b11fa9babdc2b2a93ca996c9c2f.idxV2"), - crc32Idx); - db.openPack(crc32Pack); - - writeVerifyPack2(true); - } - - /** - * Create pack basing on fixed objects list, then precisely verify content. - * No delta reuse here. - * - * @throws IOException - * @throws MissingObjectException - * - */ - @Test - public void testWritePack3() throws MissingObjectException, IOException { - config.setReuseDeltas(false); - final ObjectId forcedOrder[] = new ObjectId[] { - ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), - ObjectId.fromString("c59759f143fb1fe21c197981df75a7ee00290799"), - ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), - ObjectId.fromString("902d5476fa249b7abc9d84c611577a81381f0327"), - ObjectId.fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3") , - ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; - try (RevWalk parser = new RevWalk(db)) { - final RevObject forcedOrderRevs[] = new RevObject[forcedOrder.length]; - for (int i = 0; i < forcedOrder.length; i++) - forcedOrderRevs[i] = parser.parseAny(forcedOrder[i]); - - createVerifyOpenPack(Arrays.asList(forcedOrderRevs)); - } - - assertEquals(forcedOrder.length, writer.getObjectCount()); - verifyObjectsOrder(forcedOrder); - assertEquals("ed3f96b8327c7c66b0f8f70056129f0769323d86", writer - .computeName().name()); - } - - /** - * Another pack creation: basing on both interesting and uninteresting - * objects. No delta reuse possible here, as this is a specific case when we - * write only 1 commit, associated with 1 tree, 1 blob. - * - * @throws IOException - */ - @Test - public void testWritePack4() throws IOException { - writeVerifyPack4(false); - } - - /** - * Test thin pack writing: 1 blob delta base is on objects edge. Pack - * configuration as in {@link #testWritePack4()}. - * - * @throws IOException - */ - @Test - public void testWritePack4ThinPack() throws IOException { - writeVerifyPack4(true); - } - - /** - * Compare sizes of packs created using {@link #testWritePack2()} and - * {@link #testWritePack2DeltasReuseRefs()}. The pack using deltas should - * be smaller. - * - * @throws Exception - */ - @Test - public void testWritePack2SizeDeltasVsNoDeltas() throws Exception { - config.setReuseDeltas(false); - config.setDeltaCompress(false); - testWritePack2(); - final long sizePack2NoDeltas = os.size(); - tearDown(); - setUp(); - testWritePack2DeltasReuseRefs(); - final long sizePack2DeltasRefs = os.size(); - - assertTrue(sizePack2NoDeltas > sizePack2DeltasRefs); - } - - /** - * Compare sizes of packs created using - * {@link #testWritePack2DeltasReuseRefs()} and - * {@link #testWritePack2DeltasReuseOffsets()}. The pack with delta bases - * written as offsets should be smaller. - * - * @throws Exception - */ - @Test - public void testWritePack2SizeOffsetsVsRefs() throws Exception { - testWritePack2DeltasReuseRefs(); - final long sizePack2DeltasRefs = os.size(); - tearDown(); - setUp(); - testWritePack2DeltasReuseOffsets(); - final long sizePack2DeltasOffsets = os.size(); - - assertTrue(sizePack2DeltasRefs > sizePack2DeltasOffsets); - } - - /** - * Compare sizes of packs created using {@link #testWritePack4()} and - * {@link #testWritePack4ThinPack()}. Obviously, the thin pack should be - * smaller. - * - * @throws Exception - */ - @Test - public void testWritePack4SizeThinVsNoThin() throws Exception { - testWritePack4(); - final long sizePack4 = os.size(); - tearDown(); - setUp(); - testWritePack4ThinPack(); - final long sizePack4Thin = os.size(); - - assertTrue(sizePack4 > sizePack4Thin); - } - - @Test - public void testDeltaStatistics() throws Exception { - config.setDeltaCompress(true); - // TestRepository will close repo - FileRepository repo = createBareRepository(); - ArrayList blobs = new ArrayList<>(); - try (TestRepository testRepo = new TestRepository<>( - repo)) { - blobs.add(testRepo.blob(genDeltableData(1000))); - blobs.add(testRepo.blob(genDeltableData(1005))); - try (PackWriter pw = new PackWriter(repo)) { - NullProgressMonitor m = NullProgressMonitor.INSTANCE; - pw.preparePack(blobs.iterator()); - pw.writePack(m, m, os); - PackStatistics stats = pw.getStatistics(); - assertEquals(1, stats.getTotalDeltas()); - assertTrue("Delta bytes not set.", - stats.byObjectType(OBJ_BLOB).getDeltaBytes() > 0); - } - } - } - - // Generate consistent junk data for building files that delta well - private String genDeltableData(int length) { - assertTrue("Generated data must have a length > 0", length > 0); - char[] data = {'a', 'b', 'c', '\n'}; - StringBuilder builder = new StringBuilder(length); - for (int i = 0; i < length; i++) { - builder.append(data[i % 4]); - } - return builder.toString(); - } - - - @Test - public void testWriteIndex() throws Exception { - config.setIndexVersion(2); - writeVerifyPack4(false); - - PackFile packFile = pack.getPackFile(); - PackFile indexFile = packFile.create(PackExt.INDEX); - - // Validate that IndexPack came up with the right CRC32 value. - final PackIndex idx1 = PackIndex.open(indexFile); - assertTrue(idx1 instanceof PackIndexV2); - assertEquals(0x4743F1E4L, idx1.findCRC32(ObjectId - .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"))); - - // Validate that an index written by PackWriter is the same. - final File idx2File = new File(indexFile.getAbsolutePath() + ".2"); - try (FileOutputStream is = new FileOutputStream(idx2File)) { - writer.writeIndex(is); - } - final PackIndex idx2 = PackIndex.open(idx2File); - assertTrue(idx2 instanceof PackIndexV2); - assertEquals(idx1.getObjectCount(), idx2.getObjectCount()); - assertEquals(idx1.getOffset64Count(), idx2.getOffset64Count()); - - for (int i = 0; i < idx1.getObjectCount(); i++) { - final ObjectId id = idx1.getObjectId(i); - assertEquals(id, idx2.getObjectId(i)); - assertEquals(idx1.findOffset(id), idx2.findOffset(id)); - assertEquals(idx1.findCRC32(id), idx2.findCRC32(id)); - } - } - - @Test - public void testWriteObjectSizeIndex_noDeltas() throws Exception { - config.setMinBytesForObjSizeIndex(0); - HashSet interesting = new HashSet<>(); - interesting.add(ObjectId - .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7")); - - NullProgressMonitor m1 = NullProgressMonitor.INSTANCE; - writer = new PackWriter(config, db.newObjectReader()); - writer.setUseBitmaps(false); - writer.setThin(false); - writer.setIgnoreMissingUninteresting(false); - writer.preparePack(m1, interesting, NONE); - writer.writePack(m1, m1, os); - - PackIndex idx; - try (ByteArrayOutputStream is = new ByteArrayOutputStream()) { - writer.writeIndex(is); - idx = PackIndex.read(new ByteArrayInputStream(is.toByteArray())); - } - - PackObjectSizeIndex objSizeIdx; - try (ByteArrayOutputStream objSizeStream = new ByteArrayOutputStream()) { - writer.writeObjectSizeIndex(objSizeStream); - objSizeIdx = PackObjectSizeIndexLoader.load( - new ByteArrayInputStream(objSizeStream.toByteArray())); - } - writer.close(); - - ObjectId knownBlob1 = ObjectId - .fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259"); - ObjectId knownBlob2 = ObjectId - .fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3"); - assertEquals(18009, objSizeIdx.getSize(idx.findPosition(knownBlob1))); - assertEquals(18787, objSizeIdx.getSize(idx.findPosition(knownBlob2))); - } - - @Test - public void testWriteReverseIndexConfig() { - assertFalse(config.isWriteReverseIndex()); - config.setWriteReverseIndex(true); - assertTrue(config.isWriteReverseIndex()); - } - - @Test - public void testWriteReverseIndexOff() throws Exception { - config.setWriteReverseIndex(false); - writer = new PackWriter(config, db.newObjectReader()); - ByteArrayOutputStream reverseIndexOutput = new ByteArrayOutputStream(); - - writer.writeReverseIndex(reverseIndexOutput); - - assertEquals(0, reverseIndexOutput.size()); - } - - @Test - public void testWriteReverseIndexOn() throws Exception { - config.setWriteReverseIndex(true); - writeVerifyPack4(false); - ByteArrayOutputStream reverseIndexOutput = new ByteArrayOutputStream(); - int headerBytes = 12; - int bodyBytes = 12; - int footerBytes = 40; - - writer.writeReverseIndex(reverseIndexOutput); - - assertTrue(reverseIndexOutput.size() == headerBytes + bodyBytes - + footerBytes); - } - - @Test - public void testExclude() throws Exception { - // TestRepository closes repo - FileRepository repo = createBareRepository(); - - try (TestRepository testRepo = new TestRepository<>( - repo)) { - BranchBuilder bb = testRepo.branch("refs/heads/master"); - contentA = testRepo.blob("A"); - c1 = bb.commit().add("f", contentA).create(); - testRepo.getRevWalk().parseHeaders(c1); - PackIndex pf1 = writePack(repo, wants(c1), EMPTY_ID_SET); - assertContent(pf1, Arrays.asList(c1.getId(), c1.getTree().getId(), - contentA.getId())); - contentB = testRepo.blob("B"); - c2 = bb.commit().add("f", contentB).create(); - testRepo.getRevWalk().parseHeaders(c2); - PackIndex pf2 = writePack(repo, wants(c2), - Sets.of((ObjectIdSet) pf1)); - assertContent(pf2, Arrays.asList(c2.getId(), c2.getTree().getId(), - contentB.getId())); - } - } - - private static void assertContent(PackIndex pi, List expected) { - assertEquals("Pack index has wrong size.", expected.size(), - pi.getObjectCount()); - for (int i = 0; i < pi.getObjectCount(); i++) - assertTrue( - "Pack index didn't contain the expected id " - + pi.getObjectId(i), - expected.contains(pi.getObjectId(i))); - } - - @Test - public void testShallowIsMinimalDepth1() throws Exception { - try (FileRepository repo = setupRepoForShallowFetch()) { - PackIndex idx = writeShallowPack(repo, 1, wants(c2), NONE, NONE); - assertContent(idx, Arrays.asList(c2.getId(), c2.getTree().getId(), - contentA.getId(), contentB.getId())); - - // Client already has blobs A and B, verify those are not packed. - idx = writeShallowPack(repo, 1, wants(c5), haves(c2), shallows(c2)); - assertContent(idx, Arrays.asList(c5.getId(), c5.getTree().getId(), - contentC.getId(), contentD.getId(), contentE.getId())); - } - } - - @Test - public void testShallowIsMinimalDepth2() throws Exception { - try (FileRepository repo = setupRepoForShallowFetch()) { - PackIndex idx = writeShallowPack(repo, 2, wants(c2), NONE, NONE); - assertContent(idx, - Arrays.asList(c1.getId(), c2.getId(), c1.getTree().getId(), - c2.getTree().getId(), contentA.getId(), - contentB.getId())); - - // Client already has blobs A and B, verify those are not packed. - idx = writeShallowPack(repo, 2, wants(c5), haves(c1, c2), - shallows(c1)); - assertContent(idx, - Arrays.asList(c4.getId(), c5.getId(), c4.getTree().getId(), - c5.getTree().getId(), contentC.getId(), - contentD.getId(), contentE.getId())); - } - } - - @Test - public void testShallowFetchShallowParentDepth1() throws Exception { - try (FileRepository repo = setupRepoForShallowFetch()) { - PackIndex idx = writeShallowPack(repo, 1, wants(c5), NONE, NONE); - assertContent(idx, Arrays.asList(c5.getId(), c5.getTree().getId(), - contentA.getId(), contentB.getId(), contentC.getId(), - contentD.getId(), contentE.getId())); - - idx = writeShallowPack(repo, 1, wants(c4), haves(c5), shallows(c5)); - assertContent(idx, Arrays.asList(c4.getId(), c4.getTree().getId())); - } - } - - @Test - public void testShallowFetchShallowParentDepth2() throws Exception { - try (FileRepository repo = setupRepoForShallowFetch()) { - PackIndex idx = writeShallowPack(repo, 2, wants(c5), NONE, NONE); - assertContent(idx, - Arrays.asList(c4.getId(), c5.getId(), c4.getTree().getId(), - c5.getTree().getId(), contentA.getId(), - contentB.getId(), contentC.getId(), - contentD.getId(), contentE.getId())); - - idx = writeShallowPack(repo, 2, wants(c3), haves(c4, c5), - shallows(c4)); - assertContent(idx, Arrays.asList(c2.getId(), c3.getId(), - c2.getTree().getId(), c3.getTree().getId())); - } - } - - @Test - public void testShallowFetchShallowAncestorDepth1() throws Exception { - try (FileRepository repo = setupRepoForShallowFetch()) { - PackIndex idx = writeShallowPack(repo, 1, wants(c5), NONE, NONE); - assertContent(idx, Arrays.asList(c5.getId(), c5.getTree().getId(), - contentA.getId(), contentB.getId(), contentC.getId(), - contentD.getId(), contentE.getId())); - - idx = writeShallowPack(repo, 1, wants(c3), haves(c5), shallows(c5)); - assertContent(idx, Arrays.asList(c3.getId(), c3.getTree().getId())); - } - } - - @Test - public void testShallowFetchShallowAncestorDepth2() throws Exception { - try (FileRepository repo = setupRepoForShallowFetch()) { - PackIndex idx = writeShallowPack(repo, 2, wants(c5), NONE, NONE); - assertContent(idx, - Arrays.asList(c4.getId(), c5.getId(), c4.getTree().getId(), - c5.getTree().getId(), contentA.getId(), - contentB.getId(), contentC.getId(), - contentD.getId(), contentE.getId())); - - idx = writeShallowPack(repo, 2, wants(c2), haves(c4, c5), - shallows(c4)); - assertContent(idx, Arrays.asList(c1.getId(), c2.getId(), - c1.getTree().getId(), c2.getTree().getId())); - } - } - - @Test - public void testTotalPackFilesScanWhenSearchForReuseTimeoutNotSet() - throws Exception { - FileRepository fileRepository = setUpRepoWithMultiplePackfiles(); - PackWriter mockedPackWriter = Mockito - .spy(new PackWriter(config, fileRepository.newObjectReader())); - - doNothing().when(mockedPackWriter).select(any(), any()); - - try (FileOutputStream packOS = new FileOutputStream( - getPackFileToWrite(fileRepository, mockedPackWriter))) { - mockedPackWriter.writePack(NullProgressMonitor.INSTANCE, - NullProgressMonitor.INSTANCE, packOS); - } - - long numberOfPackFiles = new GC(fileRepository) - .getStatistics().numberOfPackFiles; - int expectedSelectCalls = - // Objects contained in multiple packfiles * number of packfiles - 2 * (int) numberOfPackFiles + - // Objects in single packfile - 1; - verify(mockedPackWriter, times(expectedSelectCalls)).select(any(), - any()); - } - - @Test - public void testTotalPackFilesScanWhenSkippingSearchForReuseTimeoutCheck() - throws Exception { - FileRepository fileRepository = setUpRepoWithMultiplePackfiles(); - PackConfig packConfig = new PackConfig(); - packConfig.setSearchForReuseTimeout(Duration.ofSeconds(-1)); - PackWriter mockedPackWriter = Mockito.spy( - new PackWriter(packConfig, fileRepository.newObjectReader())); - - doNothing().when(mockedPackWriter).select(any(), any()); - - try (FileOutputStream packOS = new FileOutputStream( - getPackFileToWrite(fileRepository, mockedPackWriter))) { - mockedPackWriter.writePack(NullProgressMonitor.INSTANCE, - NullProgressMonitor.INSTANCE, packOS); - } - - long numberOfPackFiles = new GC(fileRepository) - .getStatistics().numberOfPackFiles; - int expectedSelectCalls = - // Objects contained in multiple packfiles * number of packfiles - 2 * (int) numberOfPackFiles + - // Objects contained in single packfile - 1; - verify(mockedPackWriter, times(expectedSelectCalls)).select(any(), - any()); - } - - @Test - public void testPartialPackFilesScanWhenDoingSearchForReuseTimeoutCheck() - throws Exception { - FileRepository fileRepository = setUpRepoWithMultiplePackfiles(); - PackConfig packConfig = new PackConfig(); - packConfig.setSearchForReuseTimeout(Duration.ofSeconds(-1)); - PackWriter mockedPackWriter = Mockito.spy( - new PackWriter(packConfig, fileRepository.newObjectReader())); - mockedPackWriter.enableSearchForReuseTimeout(); - - doNothing().when(mockedPackWriter).select(any(), any()); - - try (FileOutputStream packOS = new FileOutputStream( - getPackFileToWrite(fileRepository, mockedPackWriter))) { - mockedPackWriter.writePack(NullProgressMonitor.INSTANCE, - NullProgressMonitor.INSTANCE, packOS); - } - - int expectedSelectCalls = 3; // Objects in packfiles - verify(mockedPackWriter, times(expectedSelectCalls)).select(any(), - any()); - } - - /** - * Creates objects and packfiles in the following order: - *
    - *
  • Creates 2 objects (C1 = commit, T1 = tree) - *
  • Creates packfile P1 (containing C1, T1) - *
  • Creates 1 object (C2 commit) - *
  • Creates packfile P2 (containing C1, T1, C2) - *
  • Create 1 object (C3 commit) - *
- * - * @throws Exception - */ - private FileRepository setUpRepoWithMultiplePackfiles() throws Exception { - FileRepository fileRepository = createWorkRepository(); - addRepoToClose(fileRepository); - try (Git git = new Git(fileRepository)) { - // Creates 2 objects (C1 = commit, T1 = tree) - git.commit().setMessage("First commit").call(); - GC gc = new GC(fileRepository); - gc.setPackExpireAgeMillis(Long.MAX_VALUE); - gc.setExpireAgeMillis(Long.MAX_VALUE); - // Creates packfile P1 (containing C1, T1) - gc.gc().get(); - // Creates 1 object (C2 commit) - git.commit().setMessage("Second commit").call(); - // Creates packfile P2 (containing C1, T1, C2) - gc.gc().get(); - // Create 1 object (C3 commit) - git.commit().setMessage("Third commit").call(); - } - return fileRepository; - } - - private PackFile getPackFileToWrite(FileRepository fileRepository, - PackWriter mockedPackWriter) throws IOException { - File packdir = fileRepository.getObjectDatabase().getPackDirectory(); - PackFile packFile = new PackFile(packdir, - mockedPackWriter.computeName(), PackExt.PACK); - - Set all = new HashSet<>(); - for (Ref r : fileRepository.getRefDatabase().getRefs()) { - all.add(r.getObjectId()); - } - - mockedPackWriter.preparePack(NullProgressMonitor.INSTANCE, all, - PackWriter.NONE); - return packFile; - } - - private FileRepository setupRepoForShallowFetch() throws Exception { - FileRepository repo = createBareRepository(); - // TestRepository will close the repo, but we need to return an open - // one! - repo.incrementOpen(); - try (TestRepository r = new TestRepository<>(repo)) { - BranchBuilder bb = r.branch("refs/heads/master"); - contentA = r.blob("A"); - contentB = r.blob("B"); - contentC = r.blob("C"); - contentD = r.blob("D"); - contentE = r.blob("E"); - c1 = bb.commit().add("a", contentA).create(); - c2 = bb.commit().add("b", contentB).create(); - c3 = bb.commit().add("c", contentC).create(); - c4 = bb.commit().add("d", contentD).create(); - c5 = bb.commit().add("e", contentE).create(); - r.getRevWalk().parseHeaders(c5); // fully initialize the tip RevCommit - return repo; - } - } - - private static PackIndex writePack(FileRepository repo, - Set want, Set excludeObjects) - throws IOException { - try (RevWalk walk = new RevWalk(repo)) { - return writePack(repo, walk, 0, want, NONE, excludeObjects); - } - } - - private static PackIndex writeShallowPack(FileRepository repo, int depth, - Set want, Set have, - Set shallow) throws IOException { - // During negotiation, UploadPack would have set up a DepthWalk and - // marked the client's "shallow" commits. Emulate that here. - try (DepthWalk.RevWalk walk = new DepthWalk.RevWalk(repo, depth - 1)) { - walk.assumeShallow(shallow); - return writePack(repo, walk, depth, want, have, EMPTY_ID_SET); - } - } - - private static PackIndex writePack(FileRepository repo, RevWalk walk, - int depth, Set want, - Set have, Set excludeObjects) - throws IOException { - try (PackWriter pw = new PackWriter(repo)) { - pw.setDeltaBaseAsOffset(true); - pw.setReuseDeltaCommits(false); - for (ObjectIdSet idx : excludeObjects) { - pw.excludeObjects(idx); - } - if (depth > 0) { - pw.setShallowPack(depth, null); - } - // ow doesn't need to be closed; caller closes walk. - ObjectWalk ow = walk.toObjectWalkWithSameObjects(); - - pw.preparePack(NullProgressMonitor.INSTANCE, ow, want, have, NONE); - File packdir = repo.getObjectDatabase().getPackDirectory(); - PackFile packFile = new PackFile(packdir, pw.computeName(), - PackExt.PACK); - try (FileOutputStream packOS = new FileOutputStream(packFile)) { - pw.writePack(NullProgressMonitor.INSTANCE, - NullProgressMonitor.INSTANCE, packOS); - } - PackFile idxFile = packFile.create(PackExt.INDEX); - try (FileOutputStream idxOS = new FileOutputStream(idxFile)) { - pw.writeIndex(idxOS); - } - return PackIndex.open(idxFile); - } - } - - // TODO: testWritePackDeltasCycle() - // TODO: testWritePackDeltasDepth() - - private void writeVerifyPack1() throws IOException { - final HashSet interestings = new HashSet<>(); - interestings.add(ObjectId - .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7")); - createVerifyOpenPack(interestings, NONE, false, false); - - final ObjectId expectedOrder[] = new ObjectId[] { - ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), - ObjectId.fromString("c59759f143fb1fe21c197981df75a7ee00290799"), - ObjectId.fromString("540a36d136cf413e4b064c2b0e0a4db60f77feab"), - ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), - ObjectId.fromString("902d5476fa249b7abc9d84c611577a81381f0327"), - ObjectId.fromString("4b825dc642cb6eb9a060e54bf8d69288fbee4904"), - ObjectId.fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3"), - ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; - - assertEquals(expectedOrder.length, writer.getObjectCount()); - verifyObjectsOrder(expectedOrder); - assertEquals("34be9032ac282b11fa9babdc2b2a93ca996c9c2f", writer - .computeName().name()); - } - - private void writeVerifyPack2(boolean deltaReuse) throws IOException { - config.setReuseDeltas(deltaReuse); - final HashSet interestings = new HashSet<>(); - interestings.add(ObjectId - .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7")); - final HashSet uninterestings = new HashSet<>(); - uninterestings.add(ObjectId - .fromString("540a36d136cf413e4b064c2b0e0a4db60f77feab")); - createVerifyOpenPack(interestings, uninterestings, false, false); - - final ObjectId expectedOrder[] = new ObjectId[] { - ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), - ObjectId.fromString("c59759f143fb1fe21c197981df75a7ee00290799"), - ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), - ObjectId.fromString("902d5476fa249b7abc9d84c611577a81381f0327"), - ObjectId.fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3") , - ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; - if (!config.isReuseDeltas() && !config.isDeltaCompress()) { - // If no deltas are in the file the final two entries swap places. - swap(expectedOrder, 4, 5); - } - assertEquals(expectedOrder.length, writer.getObjectCount()); - verifyObjectsOrder(expectedOrder); - assertEquals("ed3f96b8327c7c66b0f8f70056129f0769323d86", writer - .computeName().name()); - } - - private static void swap(ObjectId[] arr, int a, int b) { - ObjectId tmp = arr[a]; - arr[a] = arr[b]; - arr[b] = tmp; - } - - private void writeVerifyPack4(final boolean thin) throws IOException { - final HashSet interestings = new HashSet<>(); - interestings.add(ObjectId - .fromString("82c6b885ff600be425b4ea96dee75dca255b69e7")); - final HashSet uninterestings = new HashSet<>(); - uninterestings.add(ObjectId - .fromString("c59759f143fb1fe21c197981df75a7ee00290799")); - createVerifyOpenPack(interestings, uninterestings, thin, false); - - final ObjectId writtenObjects[] = new ObjectId[] { - ObjectId.fromString("82c6b885ff600be425b4ea96dee75dca255b69e7"), - ObjectId.fromString("aabf2ffaec9b497f0950352b3e582d73035c2035"), - ObjectId.fromString("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259") }; - assertEquals(writtenObjects.length, writer.getObjectCount()); - ObjectId expectedObjects[]; - if (thin) { - expectedObjects = new ObjectId[4]; - System.arraycopy(writtenObjects, 0, expectedObjects, 0, - writtenObjects.length); - expectedObjects[3] = ObjectId - .fromString("6ff87c4664981e4397625791c8ea3bbb5f2279a3"); - - } else { - expectedObjects = writtenObjects; - } - verifyObjectsOrder(expectedObjects); - assertEquals("cded4b74176b4456afa456768b2b5aafb41c44fc", writer - .computeName().name()); - } - - private void createVerifyOpenPack(final Set interestings, - final Set uninterestings, final boolean thin, - final boolean ignoreMissingUninteresting) - throws MissingObjectException, IOException { - createVerifyOpenPack(interestings, uninterestings, thin, - ignoreMissingUninteresting, false); - } - - private void createVerifyOpenPack(final Set interestings, - final Set uninterestings, final boolean thin, - final boolean ignoreMissingUninteresting, boolean useBitmaps) - throws MissingObjectException, IOException { - NullProgressMonitor m = NullProgressMonitor.INSTANCE; - writer = new PackWriter(config, db.newObjectReader()); - writer.setUseBitmaps(useBitmaps); - writer.setThin(thin); - writer.setIgnoreMissingUninteresting(ignoreMissingUninteresting); - writer.preparePack(m, interestings, uninterestings); - writer.writePack(m, m, os); - writer.close(); - verifyOpenPack(thin); - } - - private void createVerifyOpenPack(List objectSource) - throws MissingObjectException, IOException { - NullProgressMonitor m = NullProgressMonitor.INSTANCE; - writer = new PackWriter(config, db.newObjectReader()); - writer.preparePack(objectSource.iterator()); - assertEquals(objectSource.size(), writer.getObjectCount()); - writer.writePack(m, m, os); - writer.close(); - verifyOpenPack(false); - } - - private void verifyOpenPack(boolean thin) throws IOException { - final byte[] packData = os.toByteArray(); - - if (thin) { - PackParser p = index(packData); - try { - p.parse(NullProgressMonitor.INSTANCE); - fail("indexer should grumble about missing object"); - } catch (IOException x) { - // expected - } - } - - ObjectDirectoryPackParser p = (ObjectDirectoryPackParser) index(packData); - p.setKeepEmpty(true); - p.setAllowThin(thin); - p.setIndexVersion(2); - p.parse(NullProgressMonitor.INSTANCE); - pack = p.getPack(); - assertNotNull("have PackFile after parsing", pack); - } - - private PackParser index(byte[] packData) throws IOException { - if (inserter == null) - inserter = dst.newObjectInserter(); - return inserter.newPackParser(new ByteArrayInputStream(packData)); - } - - private void verifyObjectsOrder(ObjectId objectsOrder[]) { - final List entries = new ArrayList<>(); - - for (MutableEntry me : pack) { - entries.add(me.cloneEntry()); - } - Collections.sort(entries, (MutableEntry o1, MutableEntry o2) -> Long - .signum(o1.getOffset() - o2.getOffset())); - - int i = 0; - for (MutableEntry me : entries) { - assertEquals(objectsOrder[i++].toObjectId(), me.toObjectId()); - } - } - - private static Set haves(ObjectId... objects) { - return Sets.of(objects); - } - - private static Set wants(ObjectId... objects) { - return Sets.of(objects); - } - - private static Set shallows(ObjectId... objects) { - return Sets.of(objects); - } -} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java index 86fbd445be..8f09261674 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java @@ -42,7 +42,7 @@ import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.file.PackIndex; -import org.eclipse.jgit.internal.storage.file.PackIndexWriter; +import org.eclipse.jgit.internal.storage.file.BasePackIndexWriter; import org.eclipse.jgit.internal.storage.file.PackObjectSizeIndexWriter; import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.lib.AbbreviatedObjectId; @@ -333,7 +333,7 @@ public class DfsInserter extends ObjectInserter { private static void index(OutputStream out, byte[] packHash, List list) throws IOException { - PackIndexWriter.createVersion(out, INDEX_VERSION).write(list, packHash); + BasePackIndexWriter.createVersion(out, INDEX_VERSION).write(list, packHash); } void writeObjectSizeIndex(DfsPackDescription pack, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackIndexWriter.java new file mode 100644 index 0000000000..b89cc1ebf4 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/BasePackIndexWriter.java @@ -0,0 +1,269 @@ +/* + * Copyright (C) 2008, Robin Rosenberg + * Copyright (C) 2008, Shawn O. Pearce and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import java.io.BufferedOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.security.DigestOutputStream; +import java.text.MessageFormat; +import java.util.List; + +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.pack.PackIndexWriter; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.transport.PackedObjectInfo; +import org.eclipse.jgit.util.NB; + +/** + * Creates a table of contents to support random access by + * {@link org.eclipse.jgit.internal.storage.file.Pack}. + *

+ * Pack index files (the .idx suffix in a pack file pair) provides + * random access to any object in the pack by associating an ObjectId to the + * byte offset within the pack where the object's data can be read. + */ +public abstract class BasePackIndexWriter implements PackIndexWriter { + /** Magic constant indicating post-version 1 format. */ + protected static final byte[] TOC = { -1, 't', 'O', 'c' }; + + /** + * Create a new writer for the oldest (most widely understood) format. + *

+ * This method selects an index format that can accurate describe the + * supplied objects and that will be the most compatible format with older + * Git implementations. + *

+ * Index version 1 is widely recognized by all Git implementations, but + * index version 2 (and later) is not as well recognized as it was + * introduced more than a year later. Index version 1 can only be used if + * the resulting pack file is under 4 gigabytes in size; packs larger than + * that limit must use index version 2. + * + * @param dst + * the stream the index data will be written to. If not already + * buffered it will be automatically wrapped in a buffered + * stream. Callers are always responsible for closing the stream. + * @param objs + * the objects the caller needs to store in the index. Entries + * will be examined until a format can be conclusively selected. + * @return a new writer to output an index file of the requested format to + * the supplied stream. + * @throws java.lang.IllegalArgumentException + * no recognized pack index version can support the supplied + * objects. This is likely a bug in the implementation. + * @see #oldestPossibleFormat(List) + */ + public static PackIndexWriter createOldestPossible(final OutputStream dst, + final List objs) { + return createVersion(dst, oldestPossibleFormat(objs)); + } + + /** + * Return the oldest (most widely understood) index format. + *

+ * This method selects an index format that can accurate describe the + * supplied objects and that will be the most compatible format with older + * Git implementations. + *

+ * Index version 1 is widely recognized by all Git implementations, but + * index version 2 (and later) is not as well recognized as it was + * introduced more than a year later. Index version 1 can only be used if + * the resulting pack file is under 4 gigabytes in size; packs larger than + * that limit must use index version 2. + * + * @param objs + * the objects the caller needs to store in the index. Entries + * will be examined until a format can be conclusively selected. + * @return the index format. + * @throws java.lang.IllegalArgumentException + * no recognized pack index version can support the supplied + * objects. This is likely a bug in the implementation. + */ + public static int oldestPossibleFormat( + final List objs) { + for (PackedObjectInfo oe : objs) { + if (!PackIndexWriterV1.canStore(oe)) + return 2; + } + return 1; + } + + + /** + * Create a new writer instance for a specific index format version. + * + * @param dst + * the stream the index data will be written to. If not already + * buffered it will be automatically wrapped in a buffered + * stream. Callers are always responsible for closing the stream. + * @param version + * index format version number required by the caller. Exactly + * this formatted version will be written. + * @return a new writer to output an index file of the requested format to + * the supplied stream. + * @throws java.lang.IllegalArgumentException + * the version requested is not supported by this + * implementation. + */ + public static PackIndexWriter createVersion(final OutputStream dst, + final int version) { + switch (version) { + case 1: + return new PackIndexWriterV1(dst); + case 2: + return new PackIndexWriterV2(dst); + default: + throw new IllegalArgumentException(MessageFormat.format( + JGitText.get().unsupportedPackIndexVersion, + Integer.valueOf(version))); + } + } + + /** The index data stream we are responsible for creating. */ + protected final DigestOutputStream out; + + /** A temporary buffer for use during IO to {link #out}. */ + protected final byte[] tmp; + + /** The entries this writer must pack. */ + protected List entries; + + /** SHA-1 checksum for the entire pack data. */ + protected byte[] packChecksum; + + /** + * Create a new writer instance. + * + * @param dst + * the stream this instance outputs to. If not already buffered + * it will be automatically wrapped in a buffered stream. + */ + protected BasePackIndexWriter(OutputStream dst) { + out = new DigestOutputStream(dst instanceof BufferedOutputStream ? dst + : new BufferedOutputStream(dst), + Constants.newMessageDigest()); + tmp = new byte[4 + Constants.OBJECT_ID_LENGTH]; + } + + /** + * Write all object entries to the index stream. + *

+ * After writing the stream passed to the factory is flushed but remains + * open. Callers are always responsible for closing the output stream. + * + * @param toStore + * sorted list of objects to store in the index. The caller must + * have previously sorted the list using + * {@link org.eclipse.jgit.transport.PackedObjectInfo}'s native + * {@link java.lang.Comparable} implementation. + * @param packDataChecksum + * checksum signature of the entire pack data content. This is + * traditionally the last 20 bytes of the pack file's own stream. + * @throws java.io.IOException + * an error occurred while writing to the output stream, or this + * index format cannot store the object data supplied. + */ + @Override + public void write(final List toStore, + final byte[] packDataChecksum) throws IOException { + entries = toStore; + packChecksum = packDataChecksum; + writeImpl(); + out.flush(); + } + + /** + * Writes the index file to {@link #out}. + *

+ * Implementations should go something like: + * + * 

+	 * writeFanOutTable();
+	 * for (final PackedObjectInfo po : entries)
+	 * 	writeOneEntry(po);
+	 * writeChecksumFooter();
+	 *
+ * + *

+ * Where the logic for writeOneEntry is specific to the index + * format in use. Additional headers/footers may be used if necessary and + * the {@link #entries} collection may be iterated over more than once if + * necessary. Implementors therefore have complete control over the data. + * + * @throws java.io.IOException + * an error occurred while writing to the output stream, or this + * index format cannot store the object data supplied. + */ + protected abstract void writeImpl() throws IOException; + + /** + * Output the version 2 (and later) TOC header, with version number. + *

+ * Post version 1 all index files start with a TOC header that makes the + * file an invalid version 1 file, and then includes the version number. + * This header is necessary to recognize a version 1 from a version 2 + * formatted index. + * + * @param version + * version number of this index format being written. + * @throws java.io.IOException + * an error occurred while writing to the output stream. + */ + protected void writeTOC(int version) throws IOException { + out.write(TOC); + NB.encodeInt32(tmp, 0, version); + out.write(tmp, 0, 4); + } + + /** + * Output the standard 256 entry first-level fan-out table. + *

+ * The fan-out table is 4 KB in size, holding 256 32-bit unsigned integer + * counts. Each count represents the number of objects within this index + * whose {@link org.eclipse.jgit.lib.ObjectId#getFirstByte()} matches the + * count's position in the fan-out table. + * + * @throws java.io.IOException + * an error occurred while writing to the output stream. + */ + protected void writeFanOutTable() throws IOException { + final int[] fanout = new int[256]; + for (PackedObjectInfo po : entries) + fanout[po.getFirstByte() & 0xff]++; + for (int i = 1; i < 256; i++) + fanout[i] += fanout[i - 1]; + for (int n : fanout) { + NB.encodeInt32(tmp, 0, n); + out.write(tmp, 0, 4); + } + } + + /** + * Output the standard two-checksum index footer. + *

+ * The standard footer contains two checksums (20 byte SHA-1 values): + *

    + *
  1. Pack data checksum - taken from the last 20 bytes of the pack file.
    2. + *
  2. Index data checksum - checksum of all index bytes written, including + * the pack data checksum above.
    3. + *
+ * + * @throws java.io.IOException + * an error occurred while writing to the output stream. + */ + protected void writeChecksumFooter() throws IOException { + out.write(packChecksum); + out.on(false); + out.write(out.getMessageDigest().digest()); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java index 9f27f4bd6e..746e124e1f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/ObjectDirectoryPackParser.java @@ -28,6 +28,7 @@ import java.util.zip.Deflater; import org.eclipse.jgit.errors.LockFailedException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackIndexWriter; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.CoreConfig; @@ -110,7 +111,7 @@ public class ObjectDirectoryPackParser extends PackParser { * @param version * the version to write. The special version 0 designates the * oldest (most compatible) format available for the objects. - * @see PackIndexWriter + * @see BasePackIndexWriter */ public void setIndexVersion(int version) { indexVersion = version; @@ -386,9 +387,9 @@ public class ObjectDirectoryPackParser extends PackParser { try (FileOutputStream os = new FileOutputStream(tmpIdx)) { final PackIndexWriter iw; if (indexVersion <= 0) - iw = PackIndexWriter.createOldestPossible(os, list); + iw = BasePackIndexWriter.createOldestPossible(os, list); else - iw = PackIndexWriter.createVersion(os, indexVersion); + iw = BasePackIndexWriter.createVersion(os, indexVersion); iw.write(list, packHash); os.getChannel().force(true); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index dfea5c1c80..7189ce20a6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -109,7 +109,7 @@ public interface PackIndex } private static boolean isTOC(byte[] h) { - final byte[] toc = PackIndexWriter.TOC; + final byte[] toc = BasePackIndexWriter.TOC; for (int i = 0; i < toc.length; i++) if (h[i] != toc[i]) return false; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriter.java deleted file mode 100644 index 87e0b44d46..0000000000 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriter.java +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright (C) 2008, Robin Rosenberg - * Copyright (C) 2008, Shawn O. Pearce and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package org.eclipse.jgit.internal.storage.file; - -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.security.DigestOutputStream; -import java.text.MessageFormat; -import java.util.List; - -import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.transport.PackedObjectInfo; -import org.eclipse.jgit.util.NB; - -/** - * Creates a table of contents to support random access by - * {@link org.eclipse.jgit.internal.storage.file.Pack}. - *

- * Pack index files (the .idx suffix in a pack file pair) provides - * random access to any object in the pack by associating an ObjectId to the - * byte offset within the pack where the object's data can be read. - */ -public abstract class PackIndexWriter { - /** Magic constant indicating post-version 1 format. */ - protected static final byte[] TOC = { -1, 't', 'O', 'c' }; - - /** - * Create a new writer for the oldest (most widely understood) format. - *

- * This method selects an index format that can accurate describe the - * supplied objects and that will be the most compatible format with older - * Git implementations. - *

- * Index version 1 is widely recognized by all Git implementations, but - * index version 2 (and later) is not as well recognized as it was - * introduced more than a year later. Index version 1 can only be used if - * the resulting pack file is under 4 gigabytes in size; packs larger than - * that limit must use index version 2. - * - * @param dst - * the stream the index data will be written to. If not already - * buffered it will be automatically wrapped in a buffered - * stream. Callers are always responsible for closing the stream. - * @param objs - * the objects the caller needs to store in the index. Entries - * will be examined until a format can be conclusively selected. - * @return a new writer to output an index file of the requested format to - * the supplied stream. - * @throws java.lang.IllegalArgumentException - * no recognized pack index version can support the supplied - * objects. This is likely a bug in the implementation. - * @see #oldestPossibleFormat(List) - */ - public static PackIndexWriter createOldestPossible(final OutputStream dst, - final List objs) { - return createVersion(dst, oldestPossibleFormat(objs)); - } - - /** - * Return the oldest (most widely understood) index format. - *

- * This method selects an index format that can accurate describe the - * supplied objects and that will be the most compatible format with older - * Git implementations. - *

- * Index version 1 is widely recognized by all Git implementations, but - * index version 2 (and later) is not as well recognized as it was - * introduced more than a year later. Index version 1 can only be used if - * the resulting pack file is under 4 gigabytes in size; packs larger than - * that limit must use index version 2. - * - * @param objs - * the objects the caller needs to store in the index. Entries - * will be examined until a format can be conclusively selected. - * @return the index format. - * @throws java.lang.IllegalArgumentException - * no recognized pack index version can support the supplied - * objects. This is likely a bug in the implementation. - */ - public static int oldestPossibleFormat( - final List objs) { - for (PackedObjectInfo oe : objs) { - if (!PackIndexWriterV1.canStore(oe)) - return 2; - } - return 1; - } - - - /** - * Create a new writer instance for a specific index format version. - * - * @param dst - * the stream the index data will be written to. If not already - * buffered it will be automatically wrapped in a buffered - * stream. Callers are always responsible for closing the stream. - * @param version - * index format version number required by the caller. Exactly - * this formatted version will be written. - * @return a new writer to output an index file of the requested format to - * the supplied stream. - * @throws java.lang.IllegalArgumentException - * the version requested is not supported by this - * implementation. - */ - public static PackIndexWriter createVersion(final OutputStream dst, - final int version) { - switch (version) { - case 1: - return new PackIndexWriterV1(dst); - case 2: - return new PackIndexWriterV2(dst); - default: - throw new IllegalArgumentException(MessageFormat.format( - JGitText.get().unsupportedPackIndexVersion, - Integer.valueOf(version))); - } - } - - /** The index data stream we are responsible for creating. */ - protected final DigestOutputStream out; - - /** A temporary buffer for use during IO to {link #out}. */ - protected final byte[] tmp; - - /** The entries this writer must pack. */ - protected List entries; - - /** SHA-1 checksum for the entire pack data. */ - protected byte[] packChecksum; - - /** - * Create a new writer instance. - * - * @param dst - * the stream this instance outputs to. If not already buffered - * it will be automatically wrapped in a buffered stream. - */ - protected PackIndexWriter(OutputStream dst) { - out = new DigestOutputStream(dst instanceof BufferedOutputStream ? dst - : new BufferedOutputStream(dst), - Constants.newMessageDigest()); - tmp = new byte[4 + Constants.OBJECT_ID_LENGTH]; - } - - /** - * Write all object entries to the index stream. - *

- * After writing the stream passed to the factory is flushed but remains - * open. Callers are always responsible for closing the output stream. - * - * @param toStore - * sorted list of objects to store in the index. The caller must - * have previously sorted the list using - * {@link org.eclipse.jgit.transport.PackedObjectInfo}'s native - * {@link java.lang.Comparable} implementation. - * @param packDataChecksum - * checksum signature of the entire pack data content. This is - * traditionally the last 20 bytes of the pack file's own stream. - * @throws java.io.IOException - * an error occurred while writing to the output stream, or this - * index format cannot store the object data supplied. - */ - public void write(final List toStore, - final byte[] packDataChecksum) throws IOException { - entries = toStore; - packChecksum = packDataChecksum; - writeImpl(); - out.flush(); - } - - /** - * Writes the index file to {@link #out}. - *

- * Implementations should go something like: - * - * 

-	 * writeFanOutTable();
-	 * for (final PackedObjectInfo po : entries)
-	 * 	writeOneEntry(po);
-	 * writeChecksumFooter();
-	 *
- * - *

- * Where the logic for writeOneEntry is specific to the index - * format in use. Additional headers/footers may be used if necessary and - * the {@link #entries} collection may be iterated over more than once if - * necessary. Implementors therefore have complete control over the data. - * - * @throws java.io.IOException - * an error occurred while writing to the output stream, or this - * index format cannot store the object data supplied. - */ - protected abstract void writeImpl() throws IOException; - - /** - * Output the version 2 (and later) TOC header, with version number. - *

- * Post version 1 all index files start with a TOC header that makes the - * file an invalid version 1 file, and then includes the version number. - * This header is necessary to recognize a version 1 from a version 2 - * formatted index. - * - * @param version - * version number of this index format being written. - * @throws java.io.IOException - * an error occurred while writing to the output stream. - */ - protected void writeTOC(int version) throws IOException { - out.write(TOC); - NB.encodeInt32(tmp, 0, version); - out.write(tmp, 0, 4); - } - - /** - * Output the standard 256 entry first-level fan-out table. - *

- * The fan-out table is 4 KB in size, holding 256 32-bit unsigned integer - * counts. Each count represents the number of objects within this index - * whose {@link org.eclipse.jgit.lib.ObjectId#getFirstByte()} matches the - * count's position in the fan-out table. - * - * @throws java.io.IOException - * an error occurred while writing to the output stream. - */ - protected void writeFanOutTable() throws IOException { - final int[] fanout = new int[256]; - for (PackedObjectInfo po : entries) - fanout[po.getFirstByte() & 0xff]++; - for (int i = 1; i < 256; i++) - fanout[i] += fanout[i - 1]; - for (int n : fanout) { - NB.encodeInt32(tmp, 0, n); - out.write(tmp, 0, 4); - } - } - - /** - * Output the standard two-checksum index footer. - *

- * The standard footer contains two checksums (20 byte SHA-1 values): - *

    - *
  1. Pack data checksum - taken from the last 20 bytes of the pack file.
    2. - *
  2. Index data checksum - checksum of all index bytes written, including - * the pack data checksum above.
    3. - *
- * - * @throws java.io.IOException - * an error occurred while writing to the output stream. - */ - protected void writeChecksumFooter() throws IOException { - out.write(packChecksum); - out.on(false); - out.write(out.getMessageDigest().digest()); - } -} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriterV1.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriterV1.java index 7e28b5eb2b..f0b6193066 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriterV1.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriterV1.java @@ -21,10 +21,10 @@ import org.eclipse.jgit.util.NB; /** * Creates the version 1 (old style) pack table of contents files. * - * @see PackIndexWriter + * @see BasePackIndexWriter * @see PackIndexV1 */ -class PackIndexWriterV1 extends PackIndexWriter { +class PackIndexWriterV1 extends BasePackIndexWriter { static boolean canStore(PackedObjectInfo oe) { // We are limited to 4 GB per pack as offset is 32 bit unsigned int. // diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriterV2.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriterV2.java index fc5ef61912..b72b35a464 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriterV2.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndexWriterV2.java @@ -19,10 +19,10 @@ import org.eclipse.jgit.util.NB; /** * Creates the version 2 pack table of contents files. * - * @see PackIndexWriter + * @see BasePackIndexWriter * @see PackIndexV2 */ -class PackIndexWriterV2 extends PackIndexWriter { +class PackIndexWriterV2 extends BasePackIndexWriter { private static final int MAX_OFFSET_32 = 0x7fffffff; private static final int IS_OFFSET_64 = 0x80000000; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackInserter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackInserter.java index 1b092a3332..55e047bd43 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackInserter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackInserter.java @@ -77,6 +77,7 @@ import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackIndexWriter; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; @@ -320,7 +321,8 @@ public class PackInserter extends ObjectInserter { private static void writePackIndex(File idx, byte[] packHash, List list) throws IOException { try (OutputStream os = new FileOutputStream(idx)) { - PackIndexWriter w = PackIndexWriter.createVersion(os, INDEX_VERSION); + PackIndexWriter w = BasePackIndexWriter.createVersion(os, + INDEX_VERSION); w.write(list, packHash); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackIndexWriter.java new file mode 100644 index 0000000000..f69e68d4ba --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackIndexWriter.java @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2024, Google LLC. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.pack; + +import java.io.IOException; +import java.util.List; + +import org.eclipse.jgit.transport.PackedObjectInfo; + +/** + * Represents a function that accepts a collection of objects to write into a + * primary pack index storage format. + */ +public interface PackIndexWriter { + /** + * Write all object entries to the index stream. + * + * @param toStore + * sorted list of objects to store in the index. The caller must + * have previously sorted the list using + * {@link org.eclipse.jgit.transport.PackedObjectInfo}'s native + * {@link java.lang.Comparable} implementation. + * @param packDataChecksum + * checksum signature of the entire pack data content. This is + * traditionally the last 20 bytes of the pack file's own stream. + * @throws java.io.IOException + * an error occurred while writing to the output stream, or the + * underlying format cannot store the object data supplied. + */ + void write(List toStore, + byte[] packDataChecksum) throws IOException; +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index d3e30f3f6c..4fd2eb5798 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -58,7 +58,7 @@ import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.SearchForReuseTimeout; import org.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableException; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.internal.storage.file.PackIndexWriter; +import org.eclipse.jgit.internal.storage.file.BasePackIndexWriter; import org.eclipse.jgit.internal.storage.file.PackObjectSizeIndexWriter; import org.eclipse.jgit.internal.storage.file.PackReverseIndexWriter; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; @@ -1078,7 +1078,7 @@ public class PackWriter implements AutoCloseable { if (indexVersion <= 0) { for (BlockList objs : objectsLists) indexVersion = Math.max(indexVersion, - PackIndexWriter.oldestPossibleFormat(objs)); + BasePackIndexWriter.oldestPossibleFormat(objs)); } return indexVersion; } @@ -1103,8 +1103,8 @@ public class PackWriter implements AutoCloseable { throw new IOException(JGitText.get().cachedPacksPreventsIndexCreation); long writeStart = System.currentTimeMillis(); - final PackIndexWriter iw = PackIndexWriter.createVersion( - indexStream, getIndexVersion()); + PackIndexWriter iw = BasePackIndexWriter.createVersion(indexStream, + getIndexVersion()); iw.write(sortByName(), packcsum); stats.timeWriting += System.currentTimeMillis() - writeStart; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java index 8373d6809a..863b79466a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/storage/pack/PackConfig.java @@ -50,7 +50,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import java.util.zip.Deflater; -import org.eclipse.jgit.internal.storage.file.PackIndexWriter; +import org.eclipse.jgit.internal.storage.file.BasePackIndexWriter; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.Repository; @@ -995,7 +995,7 @@ public class PackConfig { * * @return the index version, the special version 0 designates the oldest * (most compatible) format available for the objects. - * @see PackIndexWriter + * @see BasePackIndexWriter */ public int getIndexVersion() { return indexVersion; @@ -1009,7 +1009,7 @@ public class PackConfig { * @param version * the version to write. The special version 0 designates the * oldest (most compatible) format available for the objects. - * @see PackIndexWriter + * @see BasePackIndexWriter */ public void setIndexVersion(int version) { indexVersion = version; -- cgit v1.2.3 From c9958e9b7a9b023acb214efcabfc89525859c588 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 28 Sep 2024 15:58:20 +0200 Subject: SSH signing: implement a Signer Implement a Signer and its factory, and publish the factory for the ServiceLoader. SSH signatures can be created directly if the key is given via a file in user.signingKey and the private key can be found. Otherwise, signing is delegated to an SSH agent, if available. If a certificate is used as public key, the signer verifies the certificate (correct signature, and valid at the commit time). SSH signatures are documented at [1]. [1] https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.sshsig Bug: jgit-44 Change-Id: I3848ccc06ba3be5e868f879bd5705fee1b39c632 Signed-off-by: Thomas Wolf --- org.eclipse.jgit.ssh.apache.test/.classpath | 5 + org.eclipse.jgit.ssh.apache.test/.gitattributes | 1 + org.eclipse.jgit.ssh.apache.test/BUILD | 47 +- .../META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 6 + .../org/eclipse/jgit/internal/signing/ssh/ca_key | 7 + .../eclipse/jgit/internal/signing/ssh/ca_key.pub | 1 + .../org/eclipse/jgit/internal/signing/ssh/ca_key2 | 7 + .../eclipse/jgit/internal/signing/ssh/ca_key2.pub | 1 + .../jgit/internal/signing/ssh/certs/expired.cert | 1 + .../internal/signing/ssh/certs/no_principals.cert | 1 + .../jgit/internal/signing/ssh/certs/other-ca.cert | 1 + .../jgit/internal/signing/ssh/certs/other.cert | 1 + .../jgit/internal/signing/ssh/certs/tester.cert | 1 + .../internal/signing/ssh/certs/two_principals.cert | 1 + .../eclipse/jgit/internal/signing/ssh/other_key | 7 + .../jgit/internal/signing/ssh/other_key-cert.pub | 1 + .../jgit/internal/signing/ssh/other_key.pub | 1 + .../eclipse/jgit/internal/signing/ssh/signing_key | 7 + .../jgit/internal/signing/ssh/signing_key-cert.pub | 1 + .../jgit/internal/signing/ssh/signing_key.pub | 1 + .../signing/ssh/AbstractSshSignatureTest.java | 115 +++++ .../signing/ssh/SshCertificateUtilsTest.java | 107 +++++ .../jgit/internal/signing/ssh/SshSignerTest.java | 62 +++ org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 5 +- .../services/org.eclipse.jgit.lib.SignerFactory | 1 + .../internal/transport/sshd/SshdText.properties | 22 + .../internal/signing/ssh/SshCertificateUtils.java | 175 ++++++++ .../signing/ssh/SshSignatureConstants.java | 38 ++ .../jgit/internal/signing/ssh/SshSigner.java | 485 +++++++++++++++++++++ .../jgit/internal/transport/sshd/SshdText.java | 22 + .../eclipse/jgit/signing/ssh/SshSignerFactory.java | 33 ++ 32 files changed, 1161 insertions(+), 11 deletions(-) create mode 100644 org.eclipse.jgit.ssh.apache.test/.gitattributes create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key2 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key2.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/expired.cert create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/no_principals.cert create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/other-ca.cert create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/other.cert create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/tester.cert create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/two_principals.cert create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshCertificateUtilsTest.java create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshSignerTest.java create mode 100644 org.eclipse.jgit.ssh.apache/resources/META-INF/services/org.eclipse.jgit.lib.SignerFactory create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshCertificateUtils.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSignatureConstants.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSigner.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SshSignerFactory.java diff --git a/org.eclipse.jgit.ssh.apache.test/.classpath b/org.eclipse.jgit.ssh.apache.test/.classpath index 6fdb99a4b2..5be47afffb 100644 --- a/org.eclipse.jgit.ssh.apache.test/.classpath +++ b/org.eclipse.jgit.ssh.apache.test/.classpath @@ -11,5 +11,10 @@ + + + + + diff --git a/org.eclipse.jgit.ssh.apache.test/.gitattributes b/org.eclipse.jgit.ssh.apache.test/.gitattributes new file mode 100644 index 0000000000..c1f1b7371a --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/.gitattributes @@ -0,0 +1 @@ +/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/repo.bundle binary \ No newline at end of file diff --git a/org.eclipse.jgit.ssh.apache.test/BUILD b/org.eclipse.jgit.ssh.apache.test/BUILD index b384464484..bb31f8b3c7 100644 --- a/org.eclipse.jgit.ssh.apache.test/BUILD +++ b/org.eclipse.jgit.ssh.apache.test/BUILD @@ -1,19 +1,48 @@ +load( + "@com_googlesource_gerrit_bazlets//tools:genrule2.bzl", + "genrule2", +) load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) +DEPS = [ + "//lib:eddsa", + "//lib:junit", + "//lib:sshd-osgi", + "//lib:sshd-sftp", + "//org.eclipse.jgit:jgit", + "//org.eclipse.jgit.junit:junit", + "//org.eclipse.jgit.junit.ssh:junit-ssh", + "//org.eclipse.jgit.ssh.apache:ssh-apache", +] + +HELPERS = ["tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java"] + junit_tests( name = "sshd_apache", - srcs = glob(["tst/**/*.java"]), + srcs = glob( + ["tst/**/*.java"], + exclude = HELPERS, + ), tags = ["sshd"], - deps = [ - "//lib:eddsa", - "//lib:junit", - "//lib:sshd-osgi", - "//lib:sshd-sftp", - "//org.eclipse.jgit:jgit", - "//org.eclipse.jgit.junit.ssh:junit-ssh", - "//org.eclipse.jgit.ssh.apache:ssh-apache", + runtime_deps = [":tst_rsrc"], + deps = DEPS + [ + ":helpers", ], ) + +java_library( + name = "helpers", + testonly = 1, + srcs = HELPERS, + deps = DEPS, +) + +genrule2( + name = "tst_rsrc", + srcs = glob(["tst-rsrc/**"]), + outs = ["tst_rsrc.jar"], + cmd = "tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd $$TMP && zip -qr $$ROOT/$@ .", +) diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 546dfd4a1d..c8300aa8c0 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -17,6 +17,7 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", org.apache.sshd.common.session;version="[2.14.0,2.15.0)", org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", + org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)", org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)", org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", org.apache.sshd.core;version="[2.14.0,2.15.0)", @@ -24,15 +25,20 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", org.apache.sshd.server.forward;version="[2.14.0,2.15.0)", org.eclipse.jgit.api;version="[7.1.0,7.2.0)", org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.1.0,7.2.0)", org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.1.0,7.2.0)", org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", org.eclipse.jgit.transport.sshd.agent;version="[7.1.0,7.2.0)", org.eclipse.jgit.util;version="[7.1.0,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", - org.junit.runner;version="[4.13,5.0.0)" + org.junit.rules;version="[4.13.0,5.0.0)", + org.junit.runner;version="[4.13,5.0.0)", + org.junit.runners;version="[4.13.0,5.0.0)", + org.slf4j;version="[1.7.0,2.0.0)" diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index b3e3d31eea..8e123867e4 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -91,6 +91,12 @@ src/ tst/ + + + tst-rsrc/ + + + org.apache.maven.plugins diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key new file mode 100644 index 0000000000..b8de8c3353 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACDHRJfojkxG39UQt7onBArYnfkmiDLAMO8K5VoTkE8gVQAAAJAhCMgzIQjI +MwAAAAtzc2gtZWQyNTUxOQAAACDHRJfojkxG39UQt7onBArYnfkmiDLAMO8K5VoTkE8gVQ +AAAEBmcXpast20+B4IzA0Xex2CKYiiWJj3NFJ5F0kil113vcdEl+iOTEbf1RC3uicECtid ++SaIMsAw7wrlWhOQTyBVAAAADVRIV09AU0VBR044MDA= +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key.pub new file mode 100644 index 0000000000..842415b0e8 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMdEl+iOTEbf1RC3uicECtid+SaIMsAw7wrlWhOQTyBV diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key2 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key2 new file mode 100644 index 0000000000..a4af0479bc --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key2 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACA7S4ycIB6oTx4UN8l9N+u016UgMzkrbT7E+2XbG35jgwAAAJAa2jfBGto3 +wQAAAAtzc2gtZWQyNTUxOQAAACA7S4ycIB6oTx4UN8l9N+u016UgMzkrbT7E+2XbG35jgw +AAAEBothGMqFaA5aTO8MLx9wm1oDRfzQCSsu7uJwrOiUFTTTtLjJwgHqhPHhQ3yX0367TX +pSAzOSttPsT7ZdsbfmODAAAADVRIV09AU0VBR044MDA= +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key2.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key2.pub new file mode 100644 index 0000000000..e46c87e83f --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/ca_key2.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDtLjJwgHqhPHhQ3yX0367TXpSAzOSttPsT7ZdsbfmOD diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/expired.cert b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/expired.cert new file mode 100644 index 0000000000..9da63ec900 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/expired.cert @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAINFZ5NKywAWh1G1P6BiBKArmYKs1BDhJBOawJKlS29VXAAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzOAAAAAAAAAAEAAAABAAAADGV4cGlyZWRfY2VydAAAAAAAAAAAZtOugAAAAABm1QAAAAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgx0SX6I5MRt/VELe6JwQK2J35JogywDDvCuVaE5BPIFUAAABTAAAAC3NzaC1lZDI1NTE5AAAAQNf8i5dhRqWRe06epIRrZ5V+QZHq3ZrlJtlx98UJya9GAeCrJ5oHwBjr5O5TL5wNJS5Hz+T1qsJNFU9d1wdcuwI= diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/no_principals.cert b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/no_principals.cert new file mode 100644 index 0000000000..101e37469d --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/no_principals.cert @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAILzuED1RSloB/enTghTEKSACVOuEARP0f8UVXSRwEXN6AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzOAAAAAAAAAAIAAAABAAAADW5vX3ByaW5jaXBhbHMAAAAAAAAAAGbTroAAAAAAZyLIgAAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIMdEl+iOTEbf1RC3uicECtid+SaIMsAw7wrlWhOQTyBVAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEBwEQ2D0OHn4QDHnsINlgWUWpmhukseQCJu3Adulz28fFtewp1LLqkBy50wR6vJe1ifYbY4hzReXOSyoTmHSXEN diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/other-ca.cert b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/other-ca.cert new file mode 100644 index 0000000000..752fee1778 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/other-ca.cert @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIHNW2bzSS61lvgHippv3Ymx4cVEAXBVCb8lFXHnVpsSyAAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzOAAAAAAAAAAYAAAABAAAAB3Rlc3RlcjIAAAAWAAAAEnRlc3RlckBleGFtcGxlLmNvbQAAAABm066AAAAAAGciyIAAAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACA7S4ycIB6oTx4UN8l9N+u016UgMzkrbT7E+2XbG35jgwAAAFMAAAALc3NoLWVkMjU1MTkAAABAuJ8zBazcaYTbUEr9QtoYox0MkVBg+8LANxJxc885M2vmg9yPHpTfV/emupqhBwuYcPJSskTxl7WX4TUNvhMsAA== diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/other.cert b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/other.cert new file mode 100644 index 0000000000..15825f6055 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/other.cert @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIGKXzyrvDzj9ObQ4SuzqytK6nomOV8DhgdzODfWuup1sAAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzOAAAAAAAAAAQAAAABAAAABW90aGVyAAAAFQAAABFvdGhlckBleGFtcGxlLmNvbQAAAABm066AAAAAAGciyIAAAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACDHRJfojkxG39UQt7onBArYnfkmiDLAMO8K5VoTkE8gVQAAAFMAAAALc3NoLWVkMjU1MTkAAABA1ycFqWehyC6pIISEkXSTtHbatLWl9HHAoUFouQiDdubAnMDRSkyHipXR62rq+8yEAvtqm1mXBzO8nLalkF9xAA== diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/tester.cert b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/tester.cert new file mode 100644 index 0000000000..a2b241c241 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/tester.cert @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAICSl1xsyTWb23YlKo21musxOzj4L4eD2coTkHbBw2uOyAAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzOAAAAAAAAAAMAAAABAAAABnRlc3RlcgAAABYAAAASdGVzdGVyQGV4YW1wbGUuY29tAAAAAGbTroAAAAAAZyLIgAAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIMdEl+iOTEbf1RC3uicECtid+SaIMsAw7wrlWhOQTyBVAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEDyjzq/0Egm1OxwrvqPZKUihE3w357Ji9Nd3j7VnUuvSYTXAdB9P0E+a2hyCcemmsil1MsvWTiCSSOsrHVB6FEO diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/two_principals.cert b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/two_principals.cert new file mode 100644 index 0000000000..5f7164a7fc --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/certs/two_principals.cert @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIFmWKr9gNSQT0vna7k3uOyUF9CTcMGw2zxTFBf2Ev8TzAAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzOAAAAAAAAAAgAAAABAAAABnRlc3RlcgAAACkAAAAPZm9vQGV4YW1wbGUuY29tAAAAEnRlc3RlckBleGFtcGxlLmNvbQAAAABm066AAAAAAGciyIAAAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACDHRJfojkxG39UQt7onBArYnfkmiDLAMO8K5VoTkE8gVQAAAFMAAAALc3NoLWVkMjU1MTkAAABAqlSX2GzLz5U+hN/gF9UUyAkE6h5BgVFYhsyf1MR/B7Hoxa29wGLbJpUplrqEHMxoud2zfH2Nhj00unc3lr5bBA== ./signing_key.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key new file mode 100644 index 0000000000..ee3f922c2f --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACA3ivU7wf37jE1ITC5KQjVeVlyFTkgWJxub8t380ovjiwAAAJDdMhQO3TIU +DgAAAAtzc2gtZWQyNTUxOQAAACA3ivU7wf37jE1ITC5KQjVeVlyFTkgWJxub8t380ovjiw +AAAEA4NlTFs3h2zqt5pSZ5S3dJb42GE7EjG16coKj70eELNDeK9TvB/fuMTUhMLkpCNV5W +XIVOSBYnG5vy3fzSi+OLAAAADVRIV09AU0VBR044MDA= +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key-cert.pub new file mode 100644 index 0000000000..2be08be740 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIGXo4+L/NyBl1VQDP39PxJP3LSzaqopqZGVP3cG0WoFAAAAAIDeK9TvB/fuMTUhMLkpCNV5WXIVOSBYnG5vy3fzSi+OLAAAAAAAAAAUAAAABAAAABnRlc3RlcgAAABYAAAASdGVzdGVyQGV4YW1wbGUuY29tAAAAAGbTroAAAAAAZyLIgAAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIMdEl+iOTEbf1RC3uicECtid+SaIMsAw7wrlWhOQTyBVAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEA/HwKB8J/kvkEsdxDou+UebnR9u30xPH6FEnbHLlfKbKMIXwLFIHnf9F6bTL36WhFDEDcSBGS19VBWBDRosM8L diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key.pub new file mode 100644 index 0000000000..0255005400 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/other_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDeK9TvB/fuMTUhMLkpCNV5WXIVOSBYnG5vy3fzSi+OL diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key new file mode 100644 index 0000000000..3dd37be6b2 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACBgEzmfD3DinWPe/H8yLLZ2dPhbnnyFiqe8EWcp0C3czgAAAJDhSMqA4UjK +gAAAAAtzc2gtZWQyNTUxOQAAACBgEzmfD3DinWPe/H8yLLZ2dPhbnnyFiqe8EWcp0C3czg +AAAEB1yC00NMYEAVzhDj9odGVL0EonaIkf5jdUZ/czJ0+SPWATOZ8PcOKdY978fzIstnZ0 ++FuefIWKp7wRZynQLdzOAAAADVRIV09AU0VBR044MDA= +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key-cert.pub new file mode 100644 index 0000000000..de191d1870 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIFEmoWkYraMju0JI0b/0RQtR6RYo/OVp53EVf48L/Pu/AAAAIBmHlkHFlA7HkoTZcau80PH5zduQu41m8BqnH/1v2BwVAAAAAAAAAAEAAAABAAAACGFfa2V5X2lkAAAAFgAAABJ0ZXN0ZXJAZXhhbXBsZS5jb20AAAAAZtOugAAAAABm1QAAAAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAg2ifM9NMuXwQf7H/H5LCMhMjVqugyyN+jmcMoJUL2YLAAAABTAAAAC3NzaC1lZDI1NTE5AAAAQG1kXUido46YOnmwvkJuIAKyp6Q9Gr+lbdOQvU0St/Hc9HTTIxgDGyLpv0alIJpHOuSYUUUxDufvGKtLJK1duwg= ./signing_key.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key.pub new file mode 100644 index 0000000000..e1210e72c0 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/signing_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java new file mode 100644 index 0000000000..e13379be72 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java @@ -0,0 +1,115 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.time.Instant; +import java.time.ZoneOffset; + +import org.eclipse.jgit.api.CommitCommand; +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.StoredConfig; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Before; +import org.junit.Rule; +import org.junit.rules.TemporaryFolder; + +/** + * Common setup for SSH signature tests. + */ +public abstract class AbstractSshSignatureTest extends RepositoryTestCase { + + @Rule + public TemporaryFolder keys = new TemporaryFolder(); + + protected File certs; + + protected Instant commitTime; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + copyResource("other_key", keys.getRoot()); + copyResource("other_key.pub", keys.getRoot()); + copyResource("other_key-cert.pub", keys.getRoot()); + copyResource("signing_key", keys.getRoot()); + copyResource("signing_key.pub", keys.getRoot()); + certs = keys.newFolder("certs"); + copyResource("certs/expired.cert", certs); + copyResource("certs/no_principals.cert", certs); + copyResource("certs/other.cert", certs); + copyResource("certs/other-ca.cert", certs); + copyResource("certs/tester.cert", certs); + copyResource("certs/two_principals.cert", certs); + Repository repo = db; + StoredConfig config = repo.getConfig(); + config.setString("gpg", null, "format", "ssh"); + config.save(); + // Run all tests with commit times on 2024-10-02T12:00:00Z. The test + // certificates are valid from 2024-09-01 to 2024-10-31, except the + // "expired" certificate which is valid only on 2024-09-01. + commitTime = Instant.parse("2024-10-02T12:00:00.00Z"); + } + + private void copyResource(String name, File directory) throws IOException { + try (InputStream in = this.getClass().getResourceAsStream(name)) { + int i = name.lastIndexOf('/'); + String fileName = i < 0 ? name : name.substring(i + 1); + Files.copy(in, directory.toPath().resolve(fileName)); + } + } + + protected RevCommit createSignedCommit(String certificate, + String signingKey) throws Exception { + Repository repo = db; + Path key = keys.getRoot().toPath().resolve(signingKey); + if (certificate != null) { + Files.copy(certs.toPath().resolve(certificate), + keys.getRoot().toPath().resolve(signingKey), + StandardCopyOption.REPLACE_EXISTING); + } + PersonIdent commitAuthor = new PersonIdent("tester", + "tester@example.com", commitTime, ZoneOffset.UTC); + try (Git git = Git.wrap(repo)) { + writeTrashFile("foo.txt", "foo"); + git.add().addFilepattern("foo.txt").call(); + CommitCommand commit = git.commit(); + commit.setAuthor(commitAuthor); + commit.setCommitter(commitAuthor); + commit.setMessage("Message"); + commit.setSign(Boolean.TRUE); + commit.setSigningKey(key.toAbsolutePath().toString()); + return commit.call(); + } + } + + protected RevCommit checkSshSignature(RevCommit c) { + byte[] sig = c.getRawGpgSignature(); + assertNotNull(sig); + String signature = new String(sig, StandardCharsets.US_ASCII); + assertTrue("Not an SSH signature:\n" + signature, + signature.startsWith(Constants.SSH_SIGNATURE_PREFIX)); + return c; + } +} diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshCertificateUtilsTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshCertificateUtilsTest.java new file mode 100644 index 0000000000..79ca21fa35 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshCertificateUtilsTest.java @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.io.InputStream; +import java.security.PublicKey; +import java.time.Instant; +import java.util.List; + +import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.config.keys.PublicKeyEntryResolver; +import org.apache.sshd.common.util.buffer.Buffer; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests for {@link SshCertificateUtils}. They use a certificate valid from + * 2024-09-01 00:00:00 to 2024-09-02 00:00:00 UTC. + */ +public class SshCertificateUtilsTest { + + private OpenSshCertificate certificate; + + @Before + public void loadCertificate() throws Exception { + try (InputStream in = this.getClass().getResourceAsStream( + "certs/expired.cert")) { + List keys = AuthorizedKeyEntry + .readAuthorizedKeys(in, true); + if (keys.isEmpty()) { + certificate = null; + } + PublicKey key = keys.get(0).resolvePublicKey(null, + PublicKeyEntryResolver.FAILING); + assertTrue( + "Expected an OpenSshKeyCertificate but got a " + + key.getClass().getName(), + key instanceof OpenSshCertificate); + certificate = (OpenSshCertificate) key; + } + } + + @Test + public void testValidUserCertificate() { + assertNull(SshCertificateUtils.verify(certificate, null)); + Instant validTime = Instant.parse("2024-09-01T00:00:00.00Z"); + assertNull(SshCertificateUtils.verify(certificate, validTime)); + assertNull(SshCertificateUtils.checkExpiration(certificate, validTime)); + } + + @Test + public void testCheckTooEarly() { + Instant invalidTime = Instant.parse("2024-08-31T23:59:59.00Z"); + assertNotNull( + SshCertificateUtils.checkExpiration(certificate, invalidTime)); + assertNotNull(SshCertificateUtils.verify(certificate, invalidTime)); + } + + @Test + public void testCheckExpired() { + Instant invalidTime = Instant.parse("2024-09-02T00:00:01.00Z"); + assertNotNull( + SshCertificateUtils.checkExpiration(certificate, invalidTime)); + assertNotNull(SshCertificateUtils.verify(certificate, invalidTime)); + } + + @Test + public void testInvalidSignature() throws Exception { + // Modify the serialized certificate, then re-load it again. To check that + // serialization per se works fine, also check an unmodified version. + Buffer buffer = new ByteArrayBuffer(); + buffer.putPublicKey(certificate); + int pos = buffer.rpos(); + PublicKey unchanged = buffer.getPublicKey(); + assertTrue( + "Expected an OpenSshCertificate but got a " + + unchanged.getClass().getName(), + unchanged instanceof OpenSshCertificate); + assertNull(SshCertificateUtils.verify((OpenSshCertificate) unchanged, + null)); + buffer.rpos(pos); + // Change a byte. The test certificate has the key ID at offset 128. + // Changing a byte in the key ID should still result in a successful + // deserialization, but then fail the signature check. + buffer.array()[pos + 128]++; + PublicKey changed = buffer.getPublicKey(); + assertTrue( + "Expected an OpenSshCertificate but got a " + + changed.getClass().getName(), + changed instanceof OpenSshCertificate); + assertNotNull( + SshCertificateUtils.verify((OpenSshCertificate) changed, null)); + } +} diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshSignerTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshSignerTest.java new file mode 100644 index 0000000000..b3a4482d23 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshSignerTest.java @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.fail; + +import org.junit.Test; + +/** + * Tests for the {@link SshSigner}. + */ +public class SshSignerTest extends AbstractSshSignatureTest { + + @Test + public void testPlainSignature() throws Exception { + checkSshSignature(createSignedCommit(null, "signing_key.pub")); + } + + @Test + public void testExpiredSignature() throws Exception { + Throwable t = assertThrows(Throwable.class, + () -> createSignedCommit("expired.cert", + "signing_key-cert.pub")); + // The exception or one of its causes should mention "[Ee]xpired" and + // "[Cc]ertificate" in the message + while (t != null) { + String message = t.getMessage(); + if (message.contains("xpired") && message.contains("ertificate")) { + return; + } + t = t.getCause(); + } + fail("Expected exception message not found"); + } + + @Test + public void testCertificateSignature() throws Exception { + checkSshSignature(createSignedCommit("tester.cert", "signing_key.pub")); + } + + @Test + public void testNoPrincipalsSignature() throws Exception { + // Certificate has no principals; should still work + checkSshSignature( + createSignedCommit("no_principals.cert", "signing_key.pub")); + } + + @Test + public void testOtherSignature() throws Exception { + // Certificate has a principal different that tester@example.com; should + // still work + checkSshSignature(createSignedCommit("other.cert", "signing_key.pub")); + } +} diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 69f23a5ebe..512c19f4c2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -8,7 +8,8 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -90,10 +91,12 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)", org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", org.eclipse.jgit.util;version="[7.1.0,7.2.0)", diff --git a/org.eclipse.jgit.ssh.apache/resources/META-INF/services/org.eclipse.jgit.lib.SignerFactory b/org.eclipse.jgit.ssh.apache/resources/META-INF/services/org.eclipse.jgit.lib.SignerFactory new file mode 100644 index 0000000000..80f22c055f --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/resources/META-INF/services/org.eclipse.jgit.lib.SignerFactory @@ -0,0 +1 @@ +org.eclipse.jgit.signing.ssh.SshSignerFactory \ No newline at end of file diff --git a/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties b/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties index 7da7181887..e51c80a5ac 100644 --- a/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties +++ b/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties @@ -125,4 +125,26 @@ sshClosingDown=Apache MINA sshd session factory is closing down; cannot create n sshCommandTimeout={0} timed out after {1} seconds while opening the channel sshProcessStillRunning={0} is not yet completed, cannot get exit code sshProxySessionCloseFailed=Error while closing proxy session {0} +signCertAlgorithmMismatch=Certificate of type {0} with CA key {1} uses an incompatible signature algorithm {2} +signCertAlgorithmUnknown=Certificate with CA key {0} is signed with an unknown algorithm {1} +signCertificateExpired=Expired certificate with CA key {0} +signCertificateInvalid=Certificate signature does not match on certificate with CA key {0} +signCertificateTooEarly=Certificate with CA key {0} was not valid yet +signDefaultKeyEmpty=git.ssh.defaultKeyCommand {0} returned no key +signDefaultKeyFailed=git.ssh.defaultKeyCommand {0} failed with exit code {1}\n{2} +signDefaultKeyInterrupted=git.ssh.defaultKeyCommand {0} was interrupted +signInvalidKeyDSA=SSH signatures with DSA keys or certificates are not supported; use a different signing key. +signLogFailure=SSH signature verification failed +signNoAgent=No connector for ssh-agent found; maybe include org.eclipse.jgit.ssh.apache.agent in the application. +signNoPublicKey=No public key found with signing key {0} +signNoSigningKey=Git config user.signingKey or gpg.ssh.defaultKeyCommand must be set for SSH signing. +signNotUserCertificate=Certificate with CA key {0} used for the SSH signature is not a user certificate. +signPublicKeyError=Cannot read public key {0} +signSeeLog=SSH signature verification failed; see the log for details +signSignatureError=Could not create the signature +signStderr=Cannot read stderr +signTooManyPrivateKeys=Private key file {0} must contain exactly one private key +signTooManyPublicKeys=Public key file {0} must contain exactly one public key +signUnknownHashAlgorithm=SSH Signature has an unknown hash algorithm {0} +signUnknownSignatureAlgorithm=SSH Signature has an unknown signature algorithm {0} unknownProxyProtocol=Ignoring unknown proxy protocol {0} \ No newline at end of file diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshCertificateUtils.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshCertificateUtils.java new file mode 100644 index 0000000000..040c6d4368 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshCertificateUtils.java @@ -0,0 +1,175 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.security.PublicKey; +import java.text.MessageFormat; +import java.time.Instant; + +import org.apache.sshd.common.config.keys.KeyUtils; +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.signature.BuiltinSignatures; +import org.apache.sshd.common.signature.Signature; +import org.apache.sshd.common.util.buffer.Buffer; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.internal.transport.sshd.SshdText; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Utility methods for working with OpenSSH certificates. + */ +final class SshCertificateUtils { + + private static final Logger LOG = LoggerFactory + .getLogger(SshCertificateUtils.class); + + /** + * Verifies a certificate: checks that it is a user certificate and has a + * valid signature, and if a time is given, that the certificate is valid at + * that time. + * + * @param certificate + * {@link OpenSshCertificate} to verify + * @param signatureTime + * {@link Instant} to check whether the certificate is valid at + * that time; maybe {@code null}, in which case the valid-time + * check is skipped. + * @return {@code null} if the certificate is valid; otherwise a descriptive + * message + */ + static String verify(OpenSshCertificate certificate, + Instant signatureTime) { + if (!OpenSshCertificate.Type.USER.equals(certificate.getType())) { + return MessageFormat.format(SshdText.get().signNotUserCertificate, + KeyUtils.getFingerPrint(certificate.getCaPubKey())); + } + String message = verifySignature(certificate); + if (message == null && signatureTime != null) { + message = checkExpiration(certificate, signatureTime); + } + return message; + } + + /** + * Verifies the signature on a certificate. + * + * @param certificate + * {@link OpenSshCertificate} to verify + * @return {@code null} if the signature is valid; otherwise a descriptive + * message + */ + static String verifySignature(OpenSshCertificate certificate) { + // Verify the signature on the certificate. + // + // Note that OpenSSH certificates do not support chaining. + // + // ssh-keygen refuses to create a certificate for a certificate, so the + // certified key cannot be another OpenSshCertificate. Additionally, + // when creating a certificate ssh-keygen loads the CA private key to + // make the signature and reconstructs the public key that it stores in + // the certificate from that, so the CA public key also cannot be an + // OpenSshCertificate. + PublicKey caKey = certificate.getCaPubKey(); + PublicKey certifiedKey = certificate.getCertPubKey(); + if (caKey == null + || caKey instanceof OpenSshCertificate + || certifiedKey == null + || certifiedKey instanceof OpenSshCertificate) { + return SshdText.get().signCertificateInvalid; + } + // Verify that key type and algorithm match + String keyType = KeyUtils.getKeyType(caKey); + String certAlgorithm = certificate.getSignatureAlgorithm(); + if (!KeyUtils.getCanonicalKeyType(keyType) + .equals(KeyUtils.getCanonicalKeyType(certAlgorithm))) { + return MessageFormat.format( + SshdText.get().signCertAlgorithmMismatch, keyType, + KeyUtils.getFingerPrint(certificate.getCaPubKey()), + certAlgorithm); + } + BuiltinSignatures factory = BuiltinSignatures + .fromFactoryName(certAlgorithm); + if (factory == null || !factory.isSupported()) { + return MessageFormat.format(SshdText.get().signCertAlgorithmUnknown, + KeyUtils.getFingerPrint(certificate.getCaPubKey()), + certAlgorithm); + } + Signature signer = factory.create(); + try { + signer.initVerifier(null, caKey); + signer.update(null, getBlob(certificate)); + if (signer.verify(null, certificate.getRawSignature())) { + return null; + } + } catch (Exception e) { + LOG.warn("{}", SshdText.get().signLogFailure, e); //$NON-NLS-1$ + return SshdText.get().signSeeLog; + } + return MessageFormat.format(SshdText.get().signCertificateInvalid, + KeyUtils.getFingerPrint(certificate.getCaPubKey())); + } + + private static byte[] getBlob(OpenSshCertificate certificate) { + // Theoretically, this should be just certificate.getMessage(). But + // Apache MINA sshd has a bug and may return additional bytes if the + // certificate is not the first thing in the buffer it was read from. + // As a work-around, re-create the signed blob from scratch. + // + // This may be replaced by return certificate.getMessage() once the + // upstream bug is fixed. + // + // See https://github.com/apache/mina-sshd/issues/618 + Buffer tmp = new ByteArrayBuffer(); + tmp.putString(certificate.getKeyType()); + tmp.putBytes(certificate.getNonce()); + tmp.putRawPublicKeyBytes(certificate.getCertPubKey()); + tmp.putLong(certificate.getSerial()); + tmp.putInt(certificate.getType().getCode()); + tmp.putString(certificate.getId()); + Buffer list = new ByteArrayBuffer(); + list.putStringList(certificate.getPrincipals(), false); + tmp.putBytes(list.getCompactData()); + tmp.putLong(certificate.getValidAfter()); + tmp.putLong(certificate.getValidBefore()); + tmp.putCertificateOptions(certificate.getCriticalOptions()); + tmp.putCertificateOptions(certificate.getExtensions()); + tmp.putString(certificate.getReserved()); + Buffer inner = new ByteArrayBuffer(); + inner.putRawPublicKey(certificate.getCaPubKey()); + tmp.putBytes(inner.getCompactData()); + return tmp.getCompactData(); + } + + /** + * Checks whether a certificate is valid at a given time. + * + * @param certificate + * {@link OpenSshCertificate} to check + * @param signatureTime + * {@link Instant} to check + * @return {@code null} if the certificate is valid at the given instant; + * otherwise a descriptive message + */ + static String checkExpiration(OpenSshCertificate certificate, + @NonNull Instant signatureTime) { + long instant = signatureTime.getEpochSecond(); + if (Long.compareUnsigned(instant, certificate.getValidAfter()) < 0) { + return MessageFormat.format(SshdText.get().signCertificateTooEarly, + KeyUtils.getFingerPrint(certificate.getCaPubKey())); + } else if (Long.compareUnsigned(instant, + certificate.getValidBefore()) > 0) { + return MessageFormat.format(SshdText.get().signCertificateExpired, + KeyUtils.getFingerPrint(certificate.getCaPubKey())); + } + return null; + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSignatureConstants.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSignatureConstants.java new file mode 100644 index 0000000000..bc72196a22 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSignatureConstants.java @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.nio.charset.StandardCharsets; + +import org.eclipse.jgit.lib.Constants; + +/** + * Defines common constants for SSH signatures. + */ +final class SshSignatureConstants { + + private static final String SIGNATURE_END = "-----END SSH SIGNATURE-----"; //$NON-NLS-1$ + + static final byte[] MAGIC = { 'S', 'S', 'H', 'S', 'I', 'G' }; + + static final int VERSION = 1; + + static final String NAMESPACE = "git"; //$NON-NLS-1$ + + static final byte[] ARMOR_HEAD = Constants.SSH_SIGNATURE_PREFIX + .getBytes(StandardCharsets.US_ASCII); + + static final byte[] ARMOR_END = SIGNATURE_END + .getBytes(StandardCharsets.US_ASCII); + + private SshSignatureConstants() { + // No instantiation + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSigner.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSigner.java new file mode 100644 index 0000000000..8cfe5f4766 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSigner.java @@ -0,0 +1,485 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.StreamCorruptedException; +import java.io.StringReader; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.GeneralSecurityException; +import java.security.KeyPair; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.text.MessageFormat; +import java.util.AbstractMap.SimpleImmutableEntry; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.sshd.client.auth.pubkey.PublicKeyIdentity; +import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; +import org.apache.sshd.common.config.keys.KeyUtils; +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.config.keys.PublicKeyEntryResolver; +import org.apache.sshd.common.config.keys.loader.KeyPairResourceParser; +import org.apache.sshd.common.keyprovider.KeyPairProvider; +import org.apache.sshd.common.session.SessionContext; +import org.apache.sshd.common.signature.BuiltinSignatures; +import org.apache.sshd.common.signature.Signature; +import org.apache.sshd.common.util.buffer.Buffer; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; +import org.apache.sshd.common.util.security.SecurityUtils; +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.errors.CanceledException; +import org.eclipse.jgit.api.errors.UnsupportedSigningFormatException; +import org.eclipse.jgit.internal.transport.sshd.AuthenticationCanceledException; +import org.eclipse.jgit.internal.transport.sshd.PasswordProviderWrapper; +import org.eclipse.jgit.internal.transport.sshd.SshdText; +import org.eclipse.jgit.internal.transport.sshd.agent.SshAgentClient; +import org.eclipse.jgit.lib.GpgConfig; +import org.eclipse.jgit.lib.GpgSignature; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.Signer; +import org.eclipse.jgit.transport.CredentialsProvider; +import org.eclipse.jgit.transport.sshd.KeyPasswordProviderFactory; +import org.eclipse.jgit.transport.sshd.agent.Connector; +import org.eclipse.jgit.transport.sshd.agent.ConnectorFactory; +import org.eclipse.jgit.util.Base64; +import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.FS.ExecutionResult; +import org.eclipse.jgit.util.StringUtils; +import org.eclipse.jgit.util.SystemReader; +import org.eclipse.jgit.util.TemporaryBuffer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link Signer} to create SSH signatures. + * + * @see PROTOCOL.sshsig + */ +public class SshSigner implements Signer { + + private static final Logger LOG = LoggerFactory.getLogger(SshSigner.class); + + private static final String GIT_KEY_PREFIX = "key::"; //$NON-NLS-1$ + + // Base64 encoded lines should not be longer than 75 characters, plus the + // newline. + private static final int LINE_LENGTH = 75; + + @Override + public GpgSignature sign(Repository repository, GpgConfig config, + byte[] data, PersonIdent committer, String signingKey, + CredentialsProvider credentialsProvider) throws CanceledException, + IOException, UnsupportedSigningFormatException { + byte[] hash; + try { + hash = MessageDigest.getInstance("SHA512").digest(data); //$NON-NLS-1$ + } catch (NoSuchAlgorithmException e) { + throw new UnsupportedSigningFormatException( + MessageFormat.format( + SshdText.get().signUnknownHashAlgorithm, "SHA512"), //$NON-NLS-1$ + e); + } + Buffer toSign = new ByteArrayBuffer(); + toSign.putRawBytes(SshSignatureConstants.MAGIC); + toSign.putString(SshSignatureConstants.NAMESPACE); + toSign.putUInt(0); // reserved: zero-length string + toSign.putString("sha512"); //$NON-NLS-1$ + toSign.putBytes(hash); + String key = signingKey; + if (StringUtils.isEmptyOrNull(key)) { + key = config.getSigningKey(); + } + if (StringUtils.isEmptyOrNull(key)) { + key = defaultKeyCommand(repository, config); + // According to documentation, this is supposed to return a + // valid SSH public key prefixed with "key::". We don't enforce + // this: there might be older command implementations (like just + // calling "ssh-add -L") that return keys without prefix. + } + PublicKeyIdentity identity; + try { + identity = getIdentity(key, committer, credentialsProvider); + } catch (GeneralSecurityException e) { + throw new UnsupportedSigningFormatException(MessageFormat + .format(SshdText.get().signPublicKeyError, key), e); + } + String algorithm = KeyUtils + .getKeyType(identity.getKeyIdentity().getPublic()); + switch (algorithm) { + case KeyPairProvider.SSH_DSS: + case KeyPairProvider.SSH_DSS_CERT: + throw new UnsupportedSigningFormatException( + SshdText.get().signInvalidKeyDSA); + case KeyPairProvider.SSH_RSA: + algorithm = KeyUtils.RSA_SHA512_KEY_TYPE_ALIAS; + break; + case KeyPairProvider.SSH_RSA_CERT: + algorithm = KeyUtils.RSA_SHA512_CERT_TYPE_ALIAS; + break; + default: + break; + } + + Map.Entry rawSignature; + try { + rawSignature = identity.sign(null, algorithm, + toSign.getCompactData()); + } catch (Exception e) { + throw new UnsupportedSigningFormatException( + SshdText.get().signSignatureError, e); + } + algorithm = rawSignature.getKey(); + Buffer signature = new ByteArrayBuffer(); + signature.putRawBytes(SshSignatureConstants.MAGIC); + signature.putUInt(SshSignatureConstants.VERSION); + signature.putPublicKey(identity.getKeyIdentity().getPublic()); + signature.putString(SshSignatureConstants.NAMESPACE); + signature.putUInt(0); // reserved: zero-length string + signature.putString("sha512"); //$NON-NLS-1$ + Buffer sig = new ByteArrayBuffer(); + sig.putString(KeyUtils.getSignatureAlgorithm(algorithm, + identity.getKeyIdentity().getPublic())); + sig.putBytes(rawSignature.getValue()); + signature.putBytes(sig.getCompactData()); + return armor(signature.getCompactData()); + } + + private static String defaultKeyCommand(@NonNull Repository repository, + @NonNull GpgConfig config) throws IOException { + String command = config.getSshDefaultKeyCommand(); + if (StringUtils.isEmptyOrNull(command)) { + return null; + } + FS fileSystem = repository.getFS(); + if (fileSystem == null) { + fileSystem = FS.DETECTED; + } + ProcessBuilder builder = fileSystem.runInShell(command, + new String[] {}); + ExecutionResult result = null; + try { + result = fileSystem.execute(builder, null); + int exitCode = result.getRc(); + if (exitCode == 0) { + // The command is supposed to return a public key in its first + // line on stdout. + try (BufferedReader r = new BufferedReader( + new InputStreamReader( + result.getStdout().openInputStream(), + SystemReader.getInstance() + .getDefaultCharset()))) { + String line = r.readLine(); + if (line != null) { + line = line.strip(); + } + if (StringUtils.isEmptyOrNull(line)) { + throw new IOException(MessageFormat.format( + SshdText.get().signDefaultKeyEmpty, command)); + } + return line; + } + } + TemporaryBuffer stderr = result.getStderr(); + throw new IOException(MessageFormat.format( + SshdText.get().signDefaultKeyFailed, command, + Integer.toString(exitCode), toString(stderr))); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new IOException( + MessageFormat.format( + SshdText.get().signDefaultKeyInterrupted, command), + e); + } finally { + if (result != null) { + if (result.getStderr() != null) { + result.getStderr().destroy(); + } + if (result.getStdout() != null) { + result.getStdout().destroy(); + } + } + } + } + + private static String toString(TemporaryBuffer b) { + if (b != null) { + try { + return new String(b.toByteArray(4000), + SystemReader.getInstance().getDefaultCharset()); + } catch (IOException e) { + LOG.warn("{}", SshdText.get().signStderr, e); //$NON-NLS-1$ + } + } + return ""; //$NON-NLS-1$ + } + + private static PublicKeyIdentity getIdentity(String signingKey, + PersonIdent committer, CredentialsProvider credentials) + throws CanceledException, GeneralSecurityException, IOException { + if (StringUtils.isEmptyOrNull(signingKey)) { + throw new IllegalArgumentException(SshdText.get().signNoSigningKey); + } + PublicKey publicKey = null; + PrivateKey privateKey = null; + File keyFile = null; + if (signingKey.startsWith(GIT_KEY_PREFIX)) { + try (StringReader r = new StringReader( + signingKey.substring(GIT_KEY_PREFIX.length()))) { + publicKey = fromEntry( + AuthorizedKeyEntry.readAuthorizedKeys(r, true)); + } + } else if (signingKey.startsWith("~/") //$NON-NLS-1$ + || signingKey.startsWith('~' + File.separator)) { + keyFile = new File(FS.DETECTED.userHome(), signingKey.substring(2)); + } else { + try (StringReader r = new StringReader(signingKey)) { + publicKey = fromEntry( + AuthorizedKeyEntry.readAuthorizedKeys(r, true)); + } catch (IOException e) { + // Ignore and try to read as a file + keyFile = new File(signingKey); + } + } + if (keyFile != null && keyFile.isFile()) { + try { + publicKey = fromEntry(AuthorizedKeyEntry + .readAuthorizedKeys(keyFile.toPath())); + if (publicKey == null) { + throw new IOException(MessageFormat.format( + SshdText.get().signTooManyPublicKeys, keyFile)); + } + // Try to find the private key so we don't go looking for + // the agent (or PKCS#11) in vain. + keyFile = getPrivateKeyFile(keyFile.getParentFile(), + keyFile.getName()); + if (keyFile != null) { + try { + KeyPair pair = loadPrivateKey(keyFile.toPath(), + credentials); + if (pair != null) { + PublicKey pk = pair.getPublic(); + if (pk == null) { + privateKey = pair.getPrivate(); + } else { + PublicKey original = publicKey; + if (publicKey instanceof OpenSshCertificate cert) { + original = cert.getCertPubKey(); + } + if (KeyUtils.compareKeys(original, pk)) { + privateKey = pair.getPrivate(); + } + } + } + } catch (IOException e) { + // Apparently it wasn't a private key file. Ignore. + } + } + } catch (StreamCorruptedException e) { + // File is readable, but apparently not a public key. Try to + // load it as a private key. + KeyPair pair = loadPrivateKey(keyFile.toPath(), credentials); + if (pair != null) { + publicKey = pair.getPublic(); + privateKey = pair.getPrivate(); + } + } + } + if (publicKey == null) { + throw new IOException(MessageFormat + .format(SshdText.get().signNoPublicKey, signingKey)); + } + if (publicKey instanceof OpenSshCertificate cert) { + String message = SshCertificateUtils.verify(cert, + committer.getWhenAsInstant()); + if (message != null) { + throw new IOException(message); + } + } + if (privateKey == null) { + // Could be in the agent, or a PKCS#11 key. The normal procedure + // with PKCS#11 keys is to put them in the agent and let the agent + // deal with it. + // + // This may or may not work well. For instance, the agent might ask + // for a passphrase for PKCS#11 keys... also, the OpenSSH ssh-agent + // had a bug with signing using PKCS#11 certificates in the agent; + // see https://bugzilla.mindrot.org/show_bug.cgi?id=3613 . If there + // are troubles, we might do the PKCS#11 dance ourselves, but we'd + // need additional configuration for the PKCS#11 library. (Plus + // some refactoring in the Pkcs11Provider.) + return new AgentIdentity(publicKey); + + } + return new KeyPairIdentity(new KeyPair(publicKey, privateKey)); + } + + private static File getPrivateKeyFile(File directory, + String publicKeyName) { + if (publicKeyName.endsWith(".pub")) { //$NON-NLS-1$ + String privateKeyName = publicKeyName.substring(0, + publicKeyName.length() - 4); + if (!privateKeyName.isEmpty()) { + File keyFile = new File(directory, privateKeyName); + if (keyFile.isFile()) { + return keyFile; + } + if (privateKeyName.endsWith("-cert")) { //$NON-NLS-1$ + privateKeyName = privateKeyName.substring(0, + privateKeyName.length() - 5); + if (!privateKeyName.isEmpty()) { + keyFile = new File(directory, privateKeyName); + if (keyFile.isFile()) { + return keyFile; + } + } + } + } + } + return null; + } + + private static KeyPair loadPrivateKey(Path path, + CredentialsProvider credentials) + throws CanceledException, GeneralSecurityException, IOException { + if (!Files.isRegularFile(path)) { + return null; + } + KeyPairResourceParser parser = SecurityUtils.getKeyPairResourceParser(); + if (parser != null) { + PasswordProviderWrapper provider = null; + if (credentials != null) { + provider = new PasswordProviderWrapper( + () -> KeyPasswordProviderFactory.getInstance() + .apply(credentials)); + } + try { + Collection keyPairs = parser.loadKeyPairs(null, path, + provider); + if (keyPairs.size() != 1) { + throw new GeneralSecurityException(MessageFormat.format( + SshdText.get().signTooManyPrivateKeys, path)); + } + return keyPairs.iterator().next(); + } catch (AuthenticationCanceledException e) { + throw new CanceledException(e.getMessage()); + } + } + return null; + } + + private static GpgSignature armor(byte[] data) throws IOException { + try (ByteArrayOutputStream b = new ByteArrayOutputStream()) { + b.write(SshSignatureConstants.ARMOR_HEAD); + b.write('\n'); + String encoded = Base64.encodeBytes(data); + int length = encoded.length(); + int column = 0; + for (int i = 0; i < length; i++) { + b.write(encoded.charAt(i)); + column++; + if (column == LINE_LENGTH) { + b.write('\n'); + column = 0; + } + } + if (column > 0) { + b.write('\n'); + } + b.write(SshSignatureConstants.ARMOR_END); + b.write('\n'); + return new GpgSignature(b.toByteArray()); + } + } + + private static PublicKey fromEntry(List entries) + throws GeneralSecurityException, IOException { + if (entries == null || entries.size() != 1) { + return null; + } + return entries.get(0).resolvePublicKey(null, + PublicKeyEntryResolver.FAILING); + } + + @Override + public boolean canLocateSigningKey(Repository repository, GpgConfig config, + PersonIdent committer, String signingKey, + CredentialsProvider credentialsProvider) throws CanceledException { + String key = signingKey; + if (key == null) { + key = config.getSigningKey(); + } + return !(StringUtils.isEmptyOrNull(key) + && StringUtils.isEmptyOrNull(config.getSshDefaultKeyCommand())); + } + + private static class KeyPairIdentity implements PublicKeyIdentity { + + private final @NonNull KeyPair pair; + + KeyPairIdentity(@NonNull KeyPair pair) { + this.pair = pair; + } + + @Override + public KeyPair getKeyIdentity() { + return pair; + } + + @Override + public Entry sign(SessionContext session, String algo, + byte[] data) throws Exception { + BuiltinSignatures factory = BuiltinSignatures.fromFactoryName(algo); + if (factory == null || !factory.isSupported()) { + throw new GeneralSecurityException(MessageFormat.format( + SshdText.get().signUnknownSignatureAlgorithm, algo)); + } + Signature signer = factory.create(); + signer.initSigner(null, pair.getPrivate()); + signer.update(null, data); + return new SimpleImmutableEntry<>(factory.getName(), + signer.sign(null)); + } + } + + private static class AgentIdentity extends KeyPairIdentity { + + AgentIdentity(PublicKey publicKey) { + super(new KeyPair(publicKey, null)); + } + + @Override + public Entry sign(SessionContext session, String algo, + byte[] data) throws Exception { + ConnectorFactory factory = ConnectorFactory.getDefault(); + Connector connector = factory == null ? null + : factory.create("", null); //$NON-NLS-1$ + if (connector == null) { + throw new IOException(SshdText.get().signNoAgent); + } + try (SshAgentClient agent = new SshAgentClient(connector)) { + return agent.sign(null, getKeyIdentity().getPublic(), algo, + data); + } + } + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java index 05f04ac5b2..6f7a4e9ef4 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java @@ -147,6 +147,28 @@ public final class SshdText extends TranslationBundle { /***/ public String sshCommandTimeout; /***/ public String sshProcessStillRunning; /***/ public String sshProxySessionCloseFailed; + /***/ public String signCertAlgorithmMismatch; + /***/ public String signCertAlgorithmUnknown; + /***/ public String signCertificateExpired; + /***/ public String signCertificateInvalid; + /***/ public String signCertificateTooEarly; + /***/ public String signDefaultKeyEmpty; + /***/ public String signDefaultKeyFailed; + /***/ public String signDefaultKeyInterrupted; + /***/ public String signInvalidKeyDSA; + /***/ public String signLogFailure; + /***/ public String signNoAgent; + /***/ public String signNoPublicKey; + /***/ public String signNoSigningKey; + /***/ public String signNotUserCertificate; + /***/ public String signPublicKeyError; + /***/ public String signSeeLog; + /***/ public String signSignatureError; + /***/ public String signStderr; + /***/ public String signTooManyPrivateKeys; + /***/ public String signTooManyPublicKeys; + /***/ public String signUnknownHashAlgorithm; + /***/ public String signUnknownSignatureAlgorithm; /***/ public String unknownProxyProtocol; } diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SshSignerFactory.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SshSignerFactory.java new file mode 100644 index 0000000000..5459b5360a --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SshSignerFactory.java @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.signing.ssh; + +import org.eclipse.jgit.lib.GpgConfig.GpgFormat; +import org.eclipse.jgit.lib.Signer; +import org.eclipse.jgit.internal.signing.ssh.SshSigner; +import org.eclipse.jgit.lib.SignerFactory; + +/** + * Factory creating {@link SshSigner}s. + * + * @since 7.1 + */ +public final class SshSignerFactory implements SignerFactory { + + @Override + public GpgFormat getType() { + return GpgFormat.SSH; + } + + @Override + public Signer create() { + return new SshSigner(); + } +} -- cgit v1.2.3 From d1a14b8fff84c57f5bd15cf6ecd36d0ecee3d4aa Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 28 Sep 2024 16:11:45 +0200 Subject: SSH signing: implement a SignatureVerifier Signature verification needs quite a bit of infrastructure. There are two files to read: a list of allowed signers, and a list of revoked keys or certificates. Introduce a SigningKeyDatabase abstraction for these, and give client code the possibility to plug in its own implementation. Loading these files afresh for every signature to be checked would be prohibitively expensive. Introduce a cache of SigningKeyDatabases, and have them reload the files only when they have changed. Include a default implementation that works with the OpenSSH allowed signers file and with OpenSSH revocation lists. Binary KRLs are parsed according to [1]; the test data was generated using the OpenSSH test script[2]. [1] https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.krl [2] https://github.com/openssh/openssh-portable/blob/67a115e/regress/krl.sh Bug: jgit-44 Change-Id: I6a2fa24f38a2f2fe63ffb353da5b6665ca7277e1 Signed-off-by: Thomas Wolf --- org.eclipse.jgit.ssh.apache.test/.gitattributes | 3 +- org.eclipse.jgit.ssh.apache.test/BUILD | 1 + .../jgit/internal/signing/ssh/allowed_signers | 2 + .../org/eclipse/jgit/internal/signing/ssh/krl/krl | Bin 0 -> 17185 bytes .../eclipse/jgit/internal/signing/ssh/krl/krl-all | Bin 0 -> 792 bytes .../eclipse/jgit/internal/signing/ssh/krl/krl-ca | Bin 0 -> 104 bytes .../eclipse/jgit/internal/signing/ssh/krl/krl-cert | Bin 0 -> 182 bytes .../jgit/internal/signing/ssh/krl/krl-empty | Bin 0 -> 44 bytes .../eclipse/jgit/internal/signing/ssh/krl/krl-hash | Bin 0 -> 445 bytes .../jgit/internal/signing/ssh/krl/krl-keyid | Bin 0 -> 7783 bytes .../jgit/internal/signing/ssh/krl/krl-keyid-wild | Bin 0 -> 7732 bytes .../eclipse/jgit/internal/signing/ssh/krl/krl-keys | Bin 0 -> 654 bytes .../jgit/internal/signing/ssh/krl/krl-serial | Bin 0 -> 382 bytes .../jgit/internal/signing/ssh/krl/krl-serial-wild | Bin 0 -> 162 bytes .../eclipse/jgit/internal/signing/ssh/krl/krl-sha1 | Bin 0 -> 313 bytes .../jgit/internal/signing/ssh/krl/krl-sha256 | Bin 0 -> 445 bytes .../eclipse/jgit/internal/signing/ssh/krl/krl-text | 11 + .../jgit/internal/signing/ssh/krl/revoked-0001 | 7 + .../internal/signing/ssh/krl/revoked-0001-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0001.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0004 | 7 + .../internal/signing/ssh/krl/revoked-0004-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0004.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0010 | 7 + .../internal/signing/ssh/krl/revoked-0010-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0010.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0050 | 7 + .../internal/signing/ssh/krl/revoked-0050-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0050.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0090 | 7 + .../internal/signing/ssh/krl/revoked-0090-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0090.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0500 | 7 + .../internal/signing/ssh/krl/revoked-0500-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0500.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0510 | 7 + .../internal/signing/ssh/krl/revoked-0510-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0510.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0520 | 7 + .../internal/signing/ssh/krl/revoked-0520-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0520.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0550 | 7 + .../internal/signing/ssh/krl/revoked-0550-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0550.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0799 | 7 + .../internal/signing/ssh/krl/revoked-0799-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0799.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0999 | 7 + .../internal/signing/ssh/krl/revoked-0999-cert.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-0999.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-ca | 7 + .../jgit/internal/signing/ssh/krl/revoked-ca.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-ca2 | 7 + .../jgit/internal/signing/ssh/krl/revoked-ca2.pub | 1 + .../jgit/internal/signing/ssh/krl/revoked-hash | 11 + .../jgit/internal/signing/ssh/krl/revoked-keyid | 512 ++++++++++++++++++++ .../jgit/internal/signing/ssh/krl/revoked-serials | 19 + .../jgit/internal/signing/ssh/krl/revoked-sha1 | 11 + .../jgit/internal/signing/ssh/krl/revoked-sha256 | 11 + .../jgit/internal/signing/ssh/krl/unrevoked-0005 | 7 + .../signing/ssh/krl/unrevoked-0005-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0005.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-0009 | 7 + .../signing/ssh/krl/unrevoked-0009-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0009.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-0014 | 7 + .../signing/ssh/krl/unrevoked-0014-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0014.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-0016 | 7 + .../signing/ssh/krl/unrevoked-0016-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0016.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-0029 | 7 + .../signing/ssh/krl/unrevoked-0029-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0029.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-0049 | 7 + .../signing/ssh/krl/unrevoked-0049-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0049.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-0051 | 7 + .../signing/ssh/krl/unrevoked-0051-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0051.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-0499 | 7 + .../signing/ssh/krl/unrevoked-0499-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0499.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-0800 | 7 + .../signing/ssh/krl/unrevoked-0800-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-0800.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-1010 | 7 + .../signing/ssh/krl/unrevoked-1010-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-1010.pub | 1 + .../jgit/internal/signing/ssh/krl/unrevoked-1011 | 7 + .../signing/ssh/krl/unrevoked-1011-cert.pub | 1 + .../internal/signing/ssh/krl/unrevoked-1011.pub | 1 + .../eclipse/jgit/internal/signing/ssh/repo.bundle | Bin 0 -> 5402 bytes .../signing/ssh/AbstractSshSignatureTest.java | 4 + .../signing/ssh/AllowedSignersParseTest.java | 201 ++++++++ .../signing/ssh/OpenSshBinaryKrlLoadTest.java | 32 ++ .../jgit/internal/signing/ssh/OpenSshKrlTest.java | 146 ++++++ .../internal/signing/ssh/SerialRangeSetTest.java | 124 +++++ .../signing/ssh/SshSignatureVerifierTest.java | 151 ++++++ .../signing/ssh/VerifyGitSignaturesTest.java | 154 ++++++ org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 1 + .../org.eclipse.jgit.lib.SignatureVerifierFactory | 1 + .../internal/transport/sshd/SshdText.properties | 43 ++ .../jgit/internal/signing/ssh/AllowedSigners.java | 535 +++++++++++++++++++++ .../internal/signing/ssh/OpenSshBinaryKrl.java | 490 +++++++++++++++++++ .../jgit/internal/signing/ssh/OpenSshKrl.java | 120 +++++ .../signing/ssh/OpenSshSigningKeyDatabase.java | 161 +++++++ .../jgit/internal/signing/ssh/SerialRangeSet.java | 138 ++++++ .../jgit/internal/signing/ssh/SigningDatabase.java | 59 +++ .../internal/signing/ssh/SshSignatureVerifier.java | 319 ++++++++++++ .../jgit/internal/transport/sshd/SshdText.java | 45 +- .../signing/ssh/CachingSigningKeyDatabase.java | 49 ++ .../jgit/signing/ssh/SigningKeyDatabase.java | 94 ++++ .../signing/ssh/SshSignatureVerifierFactory.java | 34 ++ .../jgit/signing/ssh/VerificationException.java | 63 +++ 115 files changed, 3757 insertions(+), 2 deletions(-) create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/allowed_signers create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-all create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-ca create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-cert create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-empty create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-hash create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keyid create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keyid-wild create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keys create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-serial create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-serial-wild create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-sha1 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-sha256 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-text create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca2 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca2.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-hash create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-keyid create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-serials create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-sha1 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-sha256 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011 create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011-cert.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011.pub create mode 100644 org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/repo.bundle create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AllowedSignersParseTest.java create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrlLoadTest.java create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/OpenSshKrlTest.java create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SerialRangeSetTest.java create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshSignatureVerifierTest.java create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/VerifyGitSignaturesTest.java create mode 100644 org.eclipse.jgit.ssh.apache/resources/META-INF/services/org.eclipse.jgit.lib.SignatureVerifierFactory create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshKrl.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshSigningKeyDatabase.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SerialRangeSet.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SigningDatabase.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSignatureVerifier.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/CachingSigningKeyDatabase.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SigningKeyDatabase.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SshSignatureVerifierFactory.java create mode 100644 org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/VerificationException.java diff --git a/org.eclipse.jgit.ssh.apache.test/.gitattributes b/org.eclipse.jgit.ssh.apache.test/.gitattributes index c1f1b7371a..b5b937561d 100644 --- a/org.eclipse.jgit.ssh.apache.test/.gitattributes +++ b/org.eclipse.jgit.ssh.apache.test/.gitattributes @@ -1 +1,2 @@ -/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/repo.bundle binary \ No newline at end of file +/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/repo.bundle binary +/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl* binary diff --git a/org.eclipse.jgit.ssh.apache.test/BUILD b/org.eclipse.jgit.ssh.apache.test/BUILD index bb31f8b3c7..dfc059f0a3 100644 --- a/org.eclipse.jgit.ssh.apache.test/BUILD +++ b/org.eclipse.jgit.ssh.apache.test/BUILD @@ -10,6 +10,7 @@ load( DEPS = [ "//lib:eddsa", "//lib:junit", + "//lib:slf4j-api", "//lib:sshd-osgi", "//lib:sshd-sftp", "//org.eclipse.jgit:jgit", diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/allowed_signers b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/allowed_signers new file mode 100644 index 0000000000..ec74409e54 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/allowed_signers @@ -0,0 +1,2 @@ +tester@example.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO +*@example.com cert-authority ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMdEl+iOTEbf1RC3uicECtid+SaIMsAw7wrlWhOQTyBV diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl new file mode 100644 index 0000000000..9469340ed3 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-all b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-all new file mode 100644 index 0000000000..6f744c3a2d Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-all differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-ca b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-ca new file mode 100644 index 0000000000..84a8bc6b38 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-ca differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-cert b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-cert new file mode 100644 index 0000000000..26f29b2ba5 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-cert differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-empty b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-empty new file mode 100644 index 0000000000..78e5187f29 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-empty differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-hash b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-hash new file mode 100644 index 0000000000..cdd1351598 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-hash differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keyid b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keyid new file mode 100644 index 0000000000..1a65243f44 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keyid differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keyid-wild b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keyid-wild new file mode 100644 index 0000000000..9ba549f363 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keyid-wild differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keys b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keys new file mode 100644 index 0000000000..8dd496d7c1 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-keys differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-serial b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-serial new file mode 100644 index 0000000000..9965e2e36f Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-serial differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-serial-wild b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-serial-wild new file mode 100644 index 0000000000..aefd2b1a84 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-serial-wild differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-sha1 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-sha1 new file mode 100644 index 0000000000..3928543ad1 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-sha1 differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-sha256 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-sha256 new file mode 100644 index 0000000000..cdd1351598 Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-sha256 differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-text b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-text new file mode 100644 index 0000000000..77ddd5e0d0 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/krl-text @@ -0,0 +1,11 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC29QZ72HtyCdaNo6p2GH3fJpUynwkvs8Acwn66G7YTh +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL0ZC4fqgbBgROeX1sOEPr4uMVNfPdJ62bVo/zvSMRQx +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG5IH9T7FY47VJDUoyOlB/iqCN4pO8dgOrxclmKN5R5w +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjhG4+EnQy8YHLsfE8+IQwNWZVn1GBYX75pwxBCZGmy +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXm+qgTs+sO+9zvoZBxkQD39R2rQqQCVezxQoGjKui5 +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8+aQKja+SbqxfWR61FCcsbBw2jaF/KHvcqdP2Fbp6Q +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAOL7IULalT2Izo9TgRf1t2HNpZ5WCZJH5oRCd9LK3BN +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGVaSedhPkl2Hrx1nOOKT2E52ADsBebawws87NN1+P6e +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICxyaxj7pRVDeh/gxJem9BLhoUQKGnKXHfDrB/GtC1KB +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID96GKtj4wN+OwvrQsgP37fQVUXThCML796qqFNLVDCA +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEh3BFcTzXmg1Fi5LvWiUDWORsHzVhUCm8ekrEJG6+6A diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001 new file mode 100644 index 0000000000..893fd5e776 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAtvUGe9h7cgnWjaOqdhh93yaVMp8JL7PAHMJ+uhu2E4QAAAIhUa4KiVGuC +ogAAAAtzc2gtZWQyNTUxOQAAACAtvUGe9h7cgnWjaOqdhh93yaVMp8JL7PAHMJ+uhu2E4Q +AAAECKgy+3FBgpdfxjOtNy9TamhadMWSyPlPiwu06mYVReyS29QZ72HtyCdaNo6p2GH3fJ +pUynwkvs8Acwn66G7YThAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001-cert.pub new file mode 100644 index 0000000000..e2bcd25964 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIE1UUsQ+sncsuST6eGe3B5Se7purqhGcWrkyIwUnQM/jAAAAIC29QZ72HtyCdaNo6p2GH3fJpUynwkvs8Acwn66G7YThAAAAAAAAAAEAAAABAAAACXJldm9rZWQgMQAAAAAAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgFtF5l68spzOFrIpQANF0C9nkNdXMAmlCRwHgw91C784AAABTAAAAC3NzaC1lZDI1NTE5AAAAQCjDATJVQs3odl9fsqaxyx/18qrodZEDyYZAsdqg0GMx8CvLYt4xHENyVm7kyBRxOeh3EKfII0WFoYCV4mGZ/wU= ./tst-keys/revoked-0001.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001.pub new file mode 100644 index 0000000000..f561982278 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0001.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC29QZ72HtyCdaNo6p2GH3fJpUynwkvs8Acwn66G7YTh diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004 new file mode 100644 index 0000000000..e50a4fefe9 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACC9GQuH6oGwYETnl9bDhD6+LjFTXz3Setm1aP870jEUMQAAAIiQzZzikM2c +4gAAAAtzc2gtZWQyNTUxOQAAACC9GQuH6oGwYETnl9bDhD6+LjFTXz3Setm1aP870jEUMQ +AAAEBpn5dxbvHhqAsSVN3IqRwzbFFgOhdmpkOP+nvoKq+rSr0ZC4fqgbBgROeX1sOEPr4u +MVNfPdJ62bVo/zvSMRQxAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004-cert.pub new file mode 100644 index 0000000000..8e92fa7c86 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIC5jMLPDlEVbyPU/Icb04BF5jxN+OT8kpuO5c0CV6/AYAAAAIL0ZC4fqgbBgROeX1sOEPr4uMVNfPdJ62bVo/zvSMRQxAAAAAAAAAAQAAAABAAAACXJldm9rZWQgNAAAAAAAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgFtF5l68spzOFrIpQANF0C9nkNdXMAmlCRwHgw91C784AAABTAAAAC3NzaC1lZDI1NTE5AAAAQOH4yNn7+zyvsCV8BCoop5xYv4uFk27VZRjmscuy3J66KNwLay9XkvkRNArDaWBwH47dmkcU7F6fLLpY4vN2jgM= ./tst-keys/revoked-0004.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004.pub new file mode 100644 index 0000000000..1d7fe7fa7f --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0004.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL0ZC4fqgbBgROeX1sOEPr4uMVNfPdJ62bVo/zvSMRQx diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010 new file mode 100644 index 0000000000..fb457df249 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACBuSB/U+xWOO1SQ1KMjpQf4qgjeKTvHYDq8XJZijeUecAAAAIgvtSiML7Uo +jAAAAAtzc2gtZWQyNTUxOQAAACBuSB/U+xWOO1SQ1KMjpQf4qgjeKTvHYDq8XJZijeUecA +AAAECI2si7/SGjMM1UyhrFPXx4laQIfFUsb1+yfXKwQyeOXW5IH9T7FY47VJDUoyOlB/iq +CN4pO8dgOrxclmKN5R5wAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010-cert.pub new file mode 100644 index 0000000000..9492f88a90 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIN2arXaBzVIdxAFfU+XU1Uc788HKlDH3tOLdDtcoORLmAAAAIG5IH9T7FY47VJDUoyOlB/iqCN4pO8dgOrxclmKN5R5wAAAAAAAAAAoAAAABAAAACnJldm9rZWQgMTAAAAAAAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/OAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEDwhgQsYOG/eKf8EfH+fAmEW+88/ZJCmxAExEFPxkGL59waZcGiOJqquTKiqN5Kod8hpUrvZywrA0tjrRkYw8wH ./tst-keys/revoked-0010.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010.pub new file mode 100644 index 0000000000..37a0d84e7a --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0010.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG5IH9T7FY47VJDUoyOlB/iqCN4pO8dgOrxclmKN5R5w diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050 new file mode 100644 index 0000000000..b02e9df821 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACDY4RuPhJ0MvGBy7HxPPiEMDVmVZ9RgWF++acMQQmRpsgAAAIgCZLe5AmS3 +uQAAAAtzc2gtZWQyNTUxOQAAACDY4RuPhJ0MvGBy7HxPPiEMDVmVZ9RgWF++acMQQmRpsg +AAAEB9Q6rpWK04mQDoeKSB2I7p/rb8pu00ClhR+vRATl4TYdjhG4+EnQy8YHLsfE8+IQwN +WZVn1GBYX75pwxBCZGmyAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050-cert.pub new file mode 100644 index 0000000000..90bb86f9b5 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIIecNj2Es6VfyCrhol4swP9lutvphd3seh+/b2LpD0EsAAAAINjhG4+EnQy8YHLsfE8+IQwNWZVn1GBYX75pwxBCZGmyAAAAAAAAADIAAAABAAAACnJldm9rZWQgNTAAAAAAAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/OAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEA2q8tCXV8FXkB0QWnFNWfCL7zz5jCXL9ZQADM1DaGi8oUU/dxmlQtWgMxuu5vNuvOYQGPDcBLj+by8VqAdvZMP ./tst-keys/revoked-0050.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050.pub new file mode 100644 index 0000000000..f3ad249daa --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0050.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjhG4+EnQy8YHLsfE8+IQwNWZVn1GBYX75pwxBCZGmy diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090 new file mode 100644 index 0000000000..efa3d5ef0a --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACCV5vqoE7PrDvvc76GQcZEA9/Udq0KkAlXs8UKBoyrouQAAAIg3mgznN5oM +5wAAAAtzc2gtZWQyNTUxOQAAACCV5vqoE7PrDvvc76GQcZEA9/Udq0KkAlXs8UKBoyrouQ +AAAEAkRynGUH9n5hcp/S1WALvuIEDtbkMi2A7yNWze0o4gWpXm+qgTs+sO+9zvoZBxkQD3 +9R2rQqQCVezxQoGjKui5AAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090-cert.pub new file mode 100644 index 0000000000..26e61e0abb --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIOjIztpPiaKY0hztHWtWpX+4LEoyy8qYPPT277K3bykSAAAAIJXm+qgTs+sO+9zvoZBxkQD39R2rQqQCVezxQoGjKui5AAAAAAAAAFoAAAABAAAACnJldm9rZWQgOTAAAAAAAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/OAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEBUaAWyv/jZrbrCO5zw2HuZcWYBig8R2jdvkKr5yzWMWEVRtn97gnAUsIGxkgUnUAs3B2En2FH2NaicC1F1n3sF ./tst-keys/revoked-0090.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090.pub new file mode 100644 index 0000000000..e51b88c268 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0090.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXm+qgTs+sO+9zvoZBxkQD39R2rQqQCVezxQoGjKui5 diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500 new file mode 100644 index 0000000000..900d444363 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACC/PmkCo2vkm6sX1ketRQnLGwcNo2hfyh73KnT9hW6ekAAAAIhDam0PQ2pt +DwAAAAtzc2gtZWQyNTUxOQAAACC/PmkCo2vkm6sX1ketRQnLGwcNo2hfyh73KnT9hW6ekA +AAAED606GrYWlY7TOXcr8vAr3fjMtCtetdpwFHi2pzgf2Bbb8+aQKja+SbqxfWR61FCcsb +Bw2jaF/KHvcqdP2Fbp6QAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500-cert.pub new file mode 100644 index 0000000000..07096182b4 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIIEblAg4b1eJ5KnT7KvYoOfe24La+nAKKLIYdsR6CdreAAAAIL8+aQKja+SbqxfWR61FCcsbBw2jaF/KHvcqdP2Fbp6QAAAAAAAAAfQAAAABAAAAC3Jldm9rZWQgNTAwAAAAAAAAAAAAAAAA//////////8AAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAFMAAAALc3NoLWVkMjU1MTkAAABAc0WEuRfi9LG9uTfKY4Dh5MJCHUG7Dqp1J4S4Gs1iOzFX2YKgYXc0O+9j3jJ5/fB4z960Y1AxYR4TWEo1pNjzBQ== ./tst-keys/revoked-0500.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500.pub new file mode 100644 index 0000000000..13d1aa4238 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0500.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8+aQKja+SbqxfWR61FCcsbBw2jaF/KHvcqdP2Fbp6Q diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510 new file mode 100644 index 0000000000..a58675ec55 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACADi+yFC2pU9iM6PU4EX9bdhzaWeVgmSR+aEQnfSytwTQAAAIgigF2AIoBd +gAAAAAtzc2gtZWQyNTUxOQAAACADi+yFC2pU9iM6PU4EX9bdhzaWeVgmSR+aEQnfSytwTQ +AAAEBWpyFpK0a+cdNPFMsvHTHtjBJpX4aMHxBAcEPN8hnpWAOL7IULalT2Izo9TgRf1t2H +NpZ5WCZJH5oRCd9LK3BNAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510-cert.pub new file mode 100644 index 0000000000..1431af306f --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAII8u8ho0YtDyXWYKv4WeOXSaRUxU8sUV0dQujB2J9VLaAAAAIAOL7IULalT2Izo9TgRf1t2HNpZ5WCZJH5oRCd9LK3BNAAAAAAAAAf4AAAABAAAAC3Jldm9rZWQgNTEwAAAAAAAAAAAAAAAA//////////8AAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAFMAAAALc3NoLWVkMjU1MTkAAABA3aijJnt8mJ8vLtr7H2PBVJHtNJpL6MQZNXHC6svzygIqZwEq3tDHGR00TPHaCYAqDEXQZysONciOQtQHzKXuBw== ./tst-keys/revoked-0510.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510.pub new file mode 100644 index 0000000000..33ad644ab3 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0510.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAOL7IULalT2Izo9TgRf1t2HNpZ5WCZJH5oRCd9LK3BN diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520 new file mode 100644 index 0000000000..630316c0ae --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACBlWknnYT5Jdh68dZzjik9hOdgA7AXm2sMLPOzTdfj+ngAAAIghEm1OIRJt +TgAAAAtzc2gtZWQyNTUxOQAAACBlWknnYT5Jdh68dZzjik9hOdgA7AXm2sMLPOzTdfj+ng +AAAEDfVYURudvfzK3ZFx6T2O1CWi0emOZ0MYPcDzUVlu1WmGVaSedhPkl2Hrx1nOOKT2E5 +2ADsBebawws87NN1+P6eAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520-cert.pub new file mode 100644 index 0000000000..b2909431ad --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAID/r9T2Sv0NGmlcHl6Fw8rVPIupmsqwq3WAG1NvW7WRcAAAAIGVaSedhPkl2Hrx1nOOKT2E52ADsBebawws87NN1+P6eAAAAAAAAAggAAAABAAAAC3Jldm9rZWQgNTIwAAAAAAAAAAAAAAAA//////////8AAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAFMAAAALc3NoLWVkMjU1MTkAAABAF8zkeAqwtlxF4iy4mDEHkzVaRqcS0sZ57gcZBWGn/peGFy3MpSxlFQM/IC2pNZ7GuCVSIPV6rRLJC65YMMOEDQ== ./tst-keys/revoked-0520.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520.pub new file mode 100644 index 0000000000..fc13d37d33 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0520.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGVaSedhPkl2Hrx1nOOKT2E52ADsBebawws87NN1+P6e diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550 new file mode 100644 index 0000000000..5e671b4ee0 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAscmsY+6UVQ3of4MSXpvQS4aFEChpylx3w6wfxrQtSgQAAAIj/9GKZ//Ri +mQAAAAtzc2gtZWQyNTUxOQAAACAscmsY+6UVQ3of4MSXpvQS4aFEChpylx3w6wfxrQtSgQ +AAAEDKC3eEgvCMy86rktq7VU1YQjjKY1iDFPVxWgKKcGJKkyxyaxj7pRVDeh/gxJem9BLh +oUQKGnKXHfDrB/GtC1KBAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550-cert.pub new file mode 100644 index 0000000000..f529a91713 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIF9q+Cg+9DSKt09eW1NXqVC4dZ3v80sZIYtc0/yqHRb+AAAAICxyaxj7pRVDeh/gxJem9BLhoUQKGnKXHfDrB/GtC1KBAAAAAAAAAiYAAAABAAAAC3Jldm9rZWQgNTUwAAAAAAAAAAAAAAAA//////////8AAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAFMAAAALc3NoLWVkMjU1MTkAAABAovTuFOXLNCc4hQcI2hatXe2hbBQYbcnUo2BNdJ9EvIOsH/T0DzzEfRQajMQ+QD6oujIx7fb1Z2sRVPOAb3AcBg== ./tst-keys/revoked-0550.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550.pub new file mode 100644 index 0000000000..e09316a37e --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0550.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICxyaxj7pRVDeh/gxJem9BLhoUQKGnKXHfDrB/GtC1KB diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799 new file mode 100644 index 0000000000..8edd73662b --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACA/ehirY+MDfjsL60LID9+30FVF04QjC+/eqqhTS1QwgAAAAIjdntzR3Z7c +0QAAAAtzc2gtZWQyNTUxOQAAACA/ehirY+MDfjsL60LID9+30FVF04QjC+/eqqhTS1QwgA +AAAEDQEb+IFCIz+yvkhmrOQ85GafOm9ra0oNRontpox62UTj96GKtj4wN+OwvrQsgP37fQ +VUXThCML796qqFNLVDCAAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799-cert.pub new file mode 100644 index 0000000000..80312fbe0d --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIC1z1LkrZhMz1mBWPU8sJIuH59v+ig4OK/B4/x8jLAtUAAAAID96GKtj4wN+OwvrQsgP37fQVUXThCML796qqFNLVDCAAAAAAAAAAx8AAAABAAAAC3Jldm9rZWQgNzk5AAAAAAAAAAAAAAAA//////////8AAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAFMAAAALc3NoLWVkMjU1MTkAAABASNkJSbdRDARfgbqPOnuES0o6m6VZ7RC2XLPm3uwTqCvMqtHbFvq9etMddSUIR4XXah6ef+O7CJDk/Yjpkn+2CA== ./tst-keys/revoked-0799.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799.pub new file mode 100644 index 0000000000..1f0556cd05 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0799.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID96GKtj4wN+OwvrQsgP37fQVUXThCML796qqFNLVDCA diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999 new file mode 100644 index 0000000000..f05a1e41fc --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACBIdwRXE815oNRYuS71olA1jkbB81YVApvHpKxCRuvugAAAAIgzBpObMwaT +mwAAAAtzc2gtZWQyNTUxOQAAACBIdwRXE815oNRYuS71olA1jkbB81YVApvHpKxCRuvugA +AAAECxY5wx3XKIhMT+ajMZXPl51x8rkCPBq6gUgZV3Uqpu7Eh3BFcTzXmg1Fi5LvWiUDWO +RsHzVhUCm8ekrEJG6+6AAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999-cert.pub new file mode 100644 index 0000000000..4aedb7770f --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIGt3nV/XJmtz9sQGP2fiZiKOH7mkPhezN3S+8TnsVcQjAAAAIEh3BFcTzXmg1Fi5LvWiUDWORsHzVhUCm8ekrEJG6+6AAAAAAAAAA+cAAAABAAAAC3Jldm9rZWQgOTk5AAAAAAAAAAAAAAAA//////////8AAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAFMAAAALc3NoLWVkMjU1MTkAAABAvLVCRCs7CV0JSXYL8ge4iRxL4y48bYuvu3YimKZDg7NdCXqw/jkaCsxJykRzb/xVnQDoNVCQQuzydt/I13FdBA== ./tst-keys/revoked-0999.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999.pub new file mode 100644 index 0000000000..c837fe06ae --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-0999.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEh3BFcTzXmg1Fi5LvWiUDWORsHzVhUCm8ekrEJG6+6A diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca new file mode 100644 index 0000000000..47e01fb5c2 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAIgok4I2KJOC +NgAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzg +AAAEAEN+knz2qOyj+jbY+SJSHYQhlJoB1u9jLqoQoiAerI3hbReZevLKczhayKUADRdAvZ +5DXVzAJpQkcB4MPdQu/OAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca.pub new file mode 100644 index 0000000000..2b92f89e71 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/O diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca2 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca2 new file mode 100644 index 0000000000..770ceee2e7 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca2 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACDsEBCX5jBwggkpt4XZXct1fOhDBuvgLL0KMpGoHRtj9wAAAIjMEwOtzBMD +rQAAAAtzc2gtZWQyNTUxOQAAACDsEBCX5jBwggkpt4XZXct1fOhDBuvgLL0KMpGoHRtj9w +AAAEAurE2/d7VhoEJeNFdDnVS7lpBRoMe/zAjA8dJRP1Z/I+wQEJfmMHCCCSm3hdldy3V8 +6EMG6+AsvQoykagdG2P3AAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca2.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca2.pub new file mode 100644 index 0000000000..a177fd0f24 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-ca2.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOwQEJfmMHCCCSm3hdldy3V86EMG6+AsvQoykagdG2P3 diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-hash b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-hash new file mode 100644 index 0000000000..c6f2361ffd --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-hash @@ -0,0 +1,11 @@ +hash: SHA256:RvNFBEc/N9jsm3toDkitgr/wnWu/6qWBHo4Xmh5ZUpM +hash: SHA256:qu2IwCnItWWX+orXv0rjCeT4i++2O6ViTzLye6kyWzU +hash: SHA256:qQTACAkAJxYk1zvSQ+Rx9wa2IuOFJKtaEy/XwxM89J0 +hash: SHA256:Fe4GdmipzulS9oMB/h3U69tSm5wil6bTUKSJCT+Jf3E +hash: SHA256:esUK/whZ5oJeRFNeOrHK1bbx9dKC+nRITZ7up7HJaGA +hash: SHA256:xkii+r6t9rEBFYkx1b3dGNXzEs69M5NUMfHP05ypSdI +hash: SHA256:lZrSycKcBNvUafU9y4R0EEbDaQWqMFvIGM9M+VKt2zk +hash: SHA256:/2bgZOiYEH2UVahUllNaQ5P0advEB7liCPkp+aNVKDk +hash: SHA256:He3c0W5o/P1I0pK5/VusqD5V6duAMeZl6f+6Yy5P1z0 +hash: SHA256:5V5Xw2lgcAGR8dO9cbgRmCNlhcCsBBv/hmEstKsqKr4 +hash: SHA256:T7s26JPzzRP2WHOcw3OjLwWo8ZZTkfo2jBCrRfJ6BR4 diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-keyid b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-keyid new file mode 100644 index 0000000000..592ddb4e78 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-keyid @@ -0,0 +1,512 @@ +id: revoked 1 +id: revoked 2 +id: revoked 3 +id: revoked 4 +id: revoked 10 +id: revoked 15 +id: revoked 30 +id: revoked 50 +id: revoked 90 +id: revoked 300 +id: revoked 301 +id: revoked 302 +id: revoked 303 +id: revoked 304 +id: revoked 305 +id: revoked 306 +id: revoked 307 +id: revoked 308 +id: revoked 309 +id: revoked 310 +id: revoked 311 +id: revoked 312 +id: revoked 313 +id: revoked 314 +id: revoked 315 +id: revoked 316 +id: revoked 317 +id: revoked 318 +id: revoked 319 +id: revoked 320 +id: revoked 321 +id: revoked 322 +id: revoked 323 +id: revoked 324 +id: revoked 325 +id: revoked 326 +id: revoked 327 +id: revoked 328 +id: revoked 329 +id: revoked 330 +id: revoked 331 +id: revoked 332 +id: revoked 333 +id: revoked 334 +id: revoked 335 +id: revoked 336 +id: revoked 337 +id: revoked 338 +id: revoked 339 +id: revoked 340 +id: revoked 341 +id: revoked 342 +id: revoked 343 +id: revoked 344 +id: revoked 345 +id: revoked 346 +id: revoked 347 +id: revoked 348 +id: revoked 349 +id: revoked 350 +id: revoked 351 +id: revoked 352 +id: revoked 353 +id: revoked 354 +id: revoked 355 +id: revoked 356 +id: revoked 357 +id: revoked 358 +id: revoked 359 +id: revoked 360 +id: revoked 361 +id: revoked 362 +id: revoked 363 +id: revoked 364 +id: revoked 365 +id: revoked 366 +id: revoked 367 +id: revoked 368 +id: revoked 369 +id: revoked 370 +id: revoked 371 +id: revoked 372 +id: revoked 373 +id: revoked 374 +id: revoked 375 +id: revoked 376 +id: revoked 377 +id: revoked 378 +id: revoked 379 +id: revoked 380 +id: revoked 381 +id: revoked 382 +id: revoked 383 +id: revoked 384 +id: revoked 385 +id: revoked 386 +id: revoked 387 +id: revoked 388 +id: revoked 389 +id: revoked 390 +id: revoked 391 +id: revoked 392 +id: revoked 393 +id: revoked 394 +id: revoked 395 +id: revoked 396 +id: revoked 397 +id: revoked 398 +id: revoked 399 +id: revoked 400 +id: revoked 401 +id: revoked 402 +id: revoked 403 +id: revoked 404 +id: revoked 405 +id: revoked 406 +id: revoked 407 +id: revoked 408 +id: revoked 409 +id: revoked 410 +id: revoked 411 +id: revoked 412 +id: revoked 413 +id: revoked 414 +id: revoked 415 +id: revoked 416 +id: revoked 417 +id: revoked 418 +id: revoked 419 +id: revoked 420 +id: revoked 421 +id: revoked 422 +id: revoked 423 +id: revoked 424 +id: revoked 425 +id: revoked 426 +id: revoked 427 +id: revoked 428 +id: revoked 429 +id: revoked 430 +id: revoked 431 +id: revoked 432 +id: revoked 433 +id: revoked 434 +id: revoked 435 +id: revoked 436 +id: revoked 437 +id: revoked 438 +id: revoked 439 +id: revoked 440 +id: revoked 441 +id: revoked 442 +id: revoked 443 +id: revoked 444 +id: revoked 445 +id: revoked 446 +id: revoked 447 +id: revoked 448 +id: revoked 449 +id: revoked 450 +id: revoked 451 +id: revoked 452 +id: revoked 453 +id: revoked 454 +id: revoked 455 +id: revoked 456 +id: revoked 457 +id: revoked 458 +id: revoked 459 +id: revoked 460 +id: revoked 461 +id: revoked 462 +id: revoked 463 +id: revoked 464 +id: revoked 465 +id: revoked 466 +id: revoked 467 +id: revoked 468 +id: revoked 469 +id: revoked 470 +id: revoked 471 +id: revoked 472 +id: revoked 473 +id: revoked 474 +id: revoked 475 +id: revoked 476 +id: revoked 477 +id: revoked 478 +id: revoked 479 +id: revoked 480 +id: revoked 481 +id: revoked 482 +id: revoked 483 +id: revoked 484 +id: revoked 485 +id: revoked 486 +id: revoked 487 +id: revoked 488 +id: revoked 489 +id: revoked 490 +id: revoked 491 +id: revoked 492 +id: revoked 493 +id: revoked 494 +id: revoked 495 +id: revoked 496 +id: revoked 497 +id: revoked 498 +id: revoked 500 +id: revoked 501 +id: revoked 502 +id: revoked 503 +id: revoked 504 +id: revoked 505 +id: revoked 506 +id: revoked 507 +id: revoked 508 +id: revoked 509 +id: revoked 510 +id: revoked 511 +id: revoked 512 +id: revoked 513 +id: revoked 514 +id: revoked 515 +id: revoked 516 +id: revoked 517 +id: revoked 518 +id: revoked 519 +id: revoked 520 +id: revoked 521 +id: revoked 522 +id: revoked 523 +id: revoked 524 +id: revoked 525 +id: revoked 526 +id: revoked 527 +id: revoked 528 +id: revoked 529 +id: revoked 530 +id: revoked 531 +id: revoked 532 +id: revoked 533 +id: revoked 534 +id: revoked 535 +id: revoked 536 +id: revoked 537 +id: revoked 538 +id: revoked 539 +id: revoked 540 +id: revoked 541 +id: revoked 542 +id: revoked 543 +id: revoked 544 +id: revoked 545 +id: revoked 546 +id: revoked 547 +id: revoked 548 +id: revoked 549 +id: revoked 550 +id: revoked 551 +id: revoked 552 +id: revoked 553 +id: revoked 554 +id: revoked 555 +id: revoked 556 +id: revoked 557 +id: revoked 558 +id: revoked 559 +id: revoked 560 +id: revoked 561 +id: revoked 562 +id: revoked 563 +id: revoked 564 +id: revoked 565 +id: revoked 566 +id: revoked 567 +id: revoked 568 +id: revoked 569 +id: revoked 570 +id: revoked 571 +id: revoked 572 +id: revoked 573 +id: revoked 574 +id: revoked 575 +id: revoked 576 +id: revoked 577 +id: revoked 578 +id: revoked 579 +id: revoked 580 +id: revoked 581 +id: revoked 582 +id: revoked 583 +id: revoked 584 +id: revoked 585 +id: revoked 586 +id: revoked 587 +id: revoked 588 +id: revoked 589 +id: revoked 590 +id: revoked 591 +id: revoked 592 +id: revoked 593 +id: revoked 594 +id: revoked 595 +id: revoked 596 +id: revoked 597 +id: revoked 598 +id: revoked 599 +id: revoked 600 +id: revoked 601 +id: revoked 602 +id: revoked 603 +id: revoked 604 +id: revoked 605 +id: revoked 606 +id: revoked 607 +id: revoked 608 +id: revoked 609 +id: revoked 610 +id: revoked 611 +id: revoked 612 +id: revoked 613 +id: revoked 614 +id: revoked 615 +id: revoked 616 +id: revoked 617 +id: revoked 618 +id: revoked 619 +id: revoked 620 +id: revoked 621 +id: revoked 622 +id: revoked 623 +id: revoked 624 +id: revoked 625 +id: revoked 626 +id: revoked 627 +id: revoked 628 +id: revoked 629 +id: revoked 630 +id: revoked 631 +id: revoked 632 +id: revoked 633 +id: revoked 634 +id: revoked 635 +id: revoked 636 +id: revoked 637 +id: revoked 638 +id: revoked 639 +id: revoked 640 +id: revoked 641 +id: revoked 642 +id: revoked 643 +id: revoked 644 +id: revoked 645 +id: revoked 646 +id: revoked 647 +id: revoked 648 +id: revoked 649 +id: revoked 650 +id: revoked 651 +id: revoked 652 +id: revoked 653 +id: revoked 654 +id: revoked 655 +id: revoked 656 +id: revoked 657 +id: revoked 658 +id: revoked 659 +id: revoked 660 +id: revoked 661 +id: revoked 662 +id: revoked 663 +id: revoked 664 +id: revoked 665 +id: revoked 666 +id: revoked 667 +id: revoked 668 +id: revoked 669 +id: revoked 670 +id: revoked 671 +id: revoked 672 +id: revoked 673 +id: revoked 674 +id: revoked 675 +id: revoked 676 +id: revoked 677 +id: revoked 678 +id: revoked 679 +id: revoked 680 +id: revoked 681 +id: revoked 682 +id: revoked 683 +id: revoked 684 +id: revoked 685 +id: revoked 686 +id: revoked 687 +id: revoked 688 +id: revoked 689 +id: revoked 690 +id: revoked 691 +id: revoked 692 +id: revoked 693 +id: revoked 694 +id: revoked 695 +id: revoked 696 +id: revoked 697 +id: revoked 698 +id: revoked 699 +id: revoked 700 +id: revoked 701 +id: revoked 702 +id: revoked 703 +id: revoked 704 +id: revoked 705 +id: revoked 706 +id: revoked 707 +id: revoked 708 +id: revoked 709 +id: revoked 710 +id: revoked 711 +id: revoked 712 +id: revoked 713 +id: revoked 714 +id: revoked 715 +id: revoked 716 +id: revoked 717 +id: revoked 718 +id: revoked 719 +id: revoked 720 +id: revoked 721 +id: revoked 722 +id: revoked 723 +id: revoked 724 +id: revoked 725 +id: revoked 726 +id: revoked 727 +id: revoked 728 +id: revoked 729 +id: revoked 730 +id: revoked 731 +id: revoked 732 +id: revoked 733 +id: revoked 734 +id: revoked 735 +id: revoked 736 +id: revoked 737 +id: revoked 738 +id: revoked 739 +id: revoked 740 +id: revoked 741 +id: revoked 742 +id: revoked 743 +id: revoked 744 +id: revoked 745 +id: revoked 746 +id: revoked 747 +id: revoked 748 +id: revoked 749 +id: revoked 750 +id: revoked 751 +id: revoked 752 +id: revoked 753 +id: revoked 754 +id: revoked 755 +id: revoked 756 +id: revoked 757 +id: revoked 758 +id: revoked 759 +id: revoked 760 +id: revoked 761 +id: revoked 762 +id: revoked 763 +id: revoked 764 +id: revoked 765 +id: revoked 766 +id: revoked 767 +id: revoked 768 +id: revoked 769 +id: revoked 770 +id: revoked 771 +id: revoked 772 +id: revoked 773 +id: revoked 774 +id: revoked 775 +id: revoked 776 +id: revoked 777 +id: revoked 778 +id: revoked 779 +id: revoked 780 +id: revoked 781 +id: revoked 782 +id: revoked 783 +id: revoked 784 +id: revoked 785 +id: revoked 786 +id: revoked 787 +id: revoked 788 +id: revoked 789 +id: revoked 790 +id: revoked 791 +id: revoked 792 +id: revoked 793 +id: revoked 794 +id: revoked 795 +id: revoked 796 +id: revoked 797 +id: revoked 798 +id: revoked 799 +id: revoked 999 +id: revoked 1000 +id: revoked 1001 +id: revoked 1002 diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-serials b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-serials new file mode 100644 index 0000000000..b20fec292d --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-serials @@ -0,0 +1,19 @@ +serial: 1-4 +serial: 10 +serial: 15 +serial: 30 +serial: 50 +serial: 90 +serial: 999 +# The following sum to 500-799 +serial: 500 +serial: 501 +serial: 502 +serial: 503-600 +serial: 700-797 +serial: 798 +serial: 799 +serial: 599-701 +# Some multiple consecutive serial number ranges +serial: 10000-20000 +serial: 30000-40000 diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-sha1 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-sha1 new file mode 100644 index 0000000000..475e90cb1c --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-sha1 @@ -0,0 +1,11 @@ +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC29QZ72HtyCdaNo6p2GH3fJpUynwkvs8Acwn66G7YTh +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL0ZC4fqgbBgROeX1sOEPr4uMVNfPdJ62bVo/zvSMRQx +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG5IH9T7FY47VJDUoyOlB/iqCN4pO8dgOrxclmKN5R5w +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjhG4+EnQy8YHLsfE8+IQwNWZVn1GBYX75pwxBCZGmy +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXm+qgTs+sO+9zvoZBxkQD39R2rQqQCVezxQoGjKui5 +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8+aQKja+SbqxfWR61FCcsbBw2jaF/KHvcqdP2Fbp6Q +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAOL7IULalT2Izo9TgRf1t2HNpZ5WCZJH5oRCd9LK3BN +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGVaSedhPkl2Hrx1nOOKT2E52ADsBebawws87NN1+P6e +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICxyaxj7pRVDeh/gxJem9BLhoUQKGnKXHfDrB/GtC1KB +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID96GKtj4wN+OwvrQsgP37fQVUXThCML796qqFNLVDCA +sha1: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEh3BFcTzXmg1Fi5LvWiUDWORsHzVhUCm8ekrEJG6+6A diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-sha256 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-sha256 new file mode 100644 index 0000000000..13109e9049 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/revoked-sha256 @@ -0,0 +1,11 @@ +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC29QZ72HtyCdaNo6p2GH3fJpUynwkvs8Acwn66G7YTh +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL0ZC4fqgbBgROeX1sOEPr4uMVNfPdJ62bVo/zvSMRQx +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG5IH9T7FY47VJDUoyOlB/iqCN4pO8dgOrxclmKN5R5w +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINjhG4+EnQy8YHLsfE8+IQwNWZVn1GBYX75pwxBCZGmy +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXm+qgTs+sO+9zvoZBxkQD39R2rQqQCVezxQoGjKui5 +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL8+aQKja+SbqxfWR61FCcsbBw2jaF/KHvcqdP2Fbp6Q +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAOL7IULalT2Izo9TgRf1t2HNpZ5WCZJH5oRCd9LK3BN +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGVaSedhPkl2Hrx1nOOKT2E52ADsBebawws87NN1+P6e +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICxyaxj7pRVDeh/gxJem9BLhoUQKGnKXHfDrB/GtC1KB +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID96GKtj4wN+OwvrQsgP37fQVUXThCML796qqFNLVDCA +sha256: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEh3BFcTzXmg1Fi5LvWiUDWORsHzVhUCm8ekrEJG6+6A diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005 new file mode 100644 index 0000000000..d82a0b5d3c --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACDqONQediveIXoseoT+MWp9yEdMO7hP7F4fAno6gunyoAAAAIig1MZroNTG +awAAAAtzc2gtZWQyNTUxOQAAACDqONQediveIXoseoT+MWp9yEdMO7hP7F4fAno6gunyoA +AAAEBSEPLoX4NVkAchYZEGi7hjd5NoVBWuoxqluCGt/fWrYeo41B52K94heix6hP4xan3I +R0w7uE/sXh8CejqC6fKgAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005-cert.pub new file mode 100644 index 0000000000..59ea422c2a --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIGnzDhP/hp83ipkW8T7f0CIXJuPK7ldbJFKDUrkvn6J1AAAAIOo41B52K94heix6hP4xan3IR0w7uE/sXh8CejqC6fKgAAAAAAAAAAUAAAABAAAACXJldm9rZWQgNQAAAAAAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgFtF5l68spzOFrIpQANF0C9nkNdXMAmlCRwHgw91C784AAABTAAAAC3NzaC1lZDI1NTE5AAAAQO9W58IrK+I0o2us9Hs/QBkrEe1YIgl6PzCMsu/Zu/tdZxGDK5Pxoz7tKzXezS9LPGQfZ3fVdl58PZC1DtxQ5gU= ./tst-keys/unrevoked-0005.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005.pub new file mode 100644 index 0000000000..081ac6c63a --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0005.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOo41B52K94heix6hP4xan3IR0w7uE/sXh8CejqC6fKg diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009 new file mode 100644 index 0000000000..947949847c --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACDXQqTeALQCMo64B4EX5abjRvrjVu69Mnxgg2q0SB5/oQAAAIgIqeXLCKnl +ywAAAAtzc2gtZWQyNTUxOQAAACDXQqTeALQCMo64B4EX5abjRvrjVu69Mnxgg2q0SB5/oQ +AAAECubGChJGu90ZNiP/zF+tTtr0+l7y8BrTDMQ0m0+cU0qtdCpN4AtAIyjrgHgRflpuNG ++uNW7r0yfGCDarRIHn+hAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009-cert.pub new file mode 100644 index 0000000000..9ee889075b --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIERRY0M1bHm2Qjyo105OCHWp0UCRHLP0xkMuHnkMDP5eAAAAINdCpN4AtAIyjrgHgRflpuNG+uNW7r0yfGCDarRIHn+hAAAAAAAAAAkAAAABAAAACXJldm9rZWQgOQAAAAAAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgFtF5l68spzOFrIpQANF0C9nkNdXMAmlCRwHgw91C784AAABTAAAAC3NzaC1lZDI1NTE5AAAAQFsA4xJHRCXSyq6GHkKdemfbg+jvUZxHlu/UBoZf4esEHAtx0mXiajbUwkWzkh1vCtxZNZhiLIhxqDcNMu+O+wo= ./tst-keys/unrevoked-0009.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009.pub new file mode 100644 index 0000000000..74a797b960 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0009.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINdCpN4AtAIyjrgHgRflpuNG+uNW7r0yfGCDarRIHn+h diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014 new file mode 100644 index 0000000000..6fa4fd93bd --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACDvTTMHyjozzZabuUzy61XOKBm4klUjUGSWYtX6T4XtEwAAAIhyFdxYchXc +WAAAAAtzc2gtZWQyNTUxOQAAACDvTTMHyjozzZabuUzy61XOKBm4klUjUGSWYtX6T4XtEw +AAAEBtC+f4bz1/qtq5K2Rf+0bPeY3P0OWdD3rvrlGPh8wN5u9NMwfKOjPNlpu5TPLrVc4o +GbiSVSNQZJZi1fpPhe0TAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014-cert.pub new file mode 100644 index 0000000000..bb954f9337 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIPes2n/Xk4mm4OpuvHDqx9+76vm+SmFgc9d7ATGT1+C8AAAAIO9NMwfKOjPNlpu5TPLrVc4oGbiSVSNQZJZi1fpPhe0TAAAAAAAAAA4AAAABAAAACnJldm9rZWQgMTQAAAAAAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/OAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEDGVORypw3DoMuWBu0V4cH/OgRBstD5cY37CfLrVZpmGv9jDRXVNQee7vYowk0r3XvQPoUecQBIMZGAQtEiw18E ./tst-keys/unrevoked-0014.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014.pub new file mode 100644 index 0000000000..4a866e41b8 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0014.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO9NMwfKOjPNlpu5TPLrVc4oGbiSVSNQZJZi1fpPhe0T diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016 new file mode 100644 index 0000000000..62d5027eff --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACBWKMDlSwSGo4dcBAZmL+Xxk64Wp/ZfFSu2vkp82JXQCQAAAIjUcNt51HDb +eQAAAAtzc2gtZWQyNTUxOQAAACBWKMDlSwSGo4dcBAZmL+Xxk64Wp/ZfFSu2vkp82JXQCQ +AAAEC1V7PD5tJSOUZtpfqVfWyiSIMJkCDFZzTmFs7GBpJE71YowOVLBIajh1wEBmYv5fGT +rhan9l8VK7a+SnzYldAJAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016-cert.pub new file mode 100644 index 0000000000..367e4ab70a --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAICGqa0xwr0etbKquuBy5/hYQ/rbMrKfEE6XShgb4YWpUAAAAIFYowOVLBIajh1wEBmYv5fGTrhan9l8VK7a+SnzYldAJAAAAAAAAABAAAAABAAAACnJldm9rZWQgMTYAAAAAAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/OAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEBKVetE3dsch2wjMIHGoiH8zp6gFMn1KgGKn01EPc1A08a/JKNvaSDYhlARLjiBzjIUGlykhHTTr4EcHTPWl58P ./tst-keys/unrevoked-0016.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016.pub new file mode 100644 index 0000000000..47cac1e76c --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0016.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFYowOVLBIajh1wEBmYv5fGTrhan9l8VK7a+SnzYldAJ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029 new file mode 100644 index 0000000000..589daa6afe --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACA3B1NQ9RFEkJUGcIUcCL22yMVEeob8/PUsk9lYH43vPwAAAIjxPrzV8T68 +1QAAAAtzc2gtZWQyNTUxOQAAACA3B1NQ9RFEkJUGcIUcCL22yMVEeob8/PUsk9lYH43vPw +AAAED89ht9KdlYRfsKwh+pzh6BOvPf/U58QBkw1d3LfKnn+jcHU1D1EUSQlQZwhRwIvbbI +xUR6hvz89SyT2Vgfje8/AAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029-cert.pub new file mode 100644 index 0000000000..1bf3883ce0 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIEVLRuchC4z7/EqITmyqCxOyhC7/enmFWsalP8FFFYiXAAAAIDcHU1D1EUSQlQZwhRwIvbbIxUR6hvz89SyT2Vgfje8/AAAAAAAAAB0AAAABAAAACnJldm9rZWQgMjkAAAAAAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/OAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEChRFz/Zb6b3znoIWJjd8OTmCIEH7YE/fKWtyWHoGjz02G4VnCfwuHp23yD+k1XsoOGC7xcSnQeqZ19160HDNgC ./tst-keys/unrevoked-0029.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029.pub new file mode 100644 index 0000000000..4072d920bd --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0029.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDcHU1D1EUSQlQZwhRwIvbbIxUR6hvz89SyT2Vgfje8/ diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049 new file mode 100644 index 0000000000..b5788a0b5e --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACD2mB5GBuavtb/bX7W54OmUCCJzUWBwG7cQ4q/jon1MBQAAAIjRkEU40ZBF +OAAAAAtzc2gtZWQyNTUxOQAAACD2mB5GBuavtb/bX7W54OmUCCJzUWBwG7cQ4q/jon1MBQ +AAAECuUtJb+T0um2mGvjD/ZZpbtjIhWc3jGVbzuDnEovOjnPaYHkYG5q+1v9tftbng6ZQI +InNRYHAbtxDir+OifUwFAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049-cert.pub new file mode 100644 index 0000000000..587cf6220b --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAILZPLEL5xQ8HDLa8pJhchJ3EEhZcjMqACCAEeL+U6c/QAAAAIPaYHkYG5q+1v9tftbng6ZQIInNRYHAbtxDir+OifUwFAAAAAAAAADEAAAABAAAACnJldm9rZWQgNDkAAAAAAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/OAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEB2GglzoC1VgsYNAVd5BDsLbeR5M5hHcVVvNsGnK1QCXMj56cgfkbXLj6W6tjJEEFY4G+KPJh1F/SGJi02P5lkJ ./tst-keys/unrevoked-0049.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049.pub new file mode 100644 index 0000000000..07d5369090 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0049.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPaYHkYG5q+1v9tftbng6ZQIInNRYHAbtxDir+OifUwF diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051 new file mode 100644 index 0000000000..52d3283a79 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACD39ygfAlHPhZWU8inWu1hypIlQTChQxSKKB6iaV6Q0lQAAAIgMawsqDGsL +KgAAAAtzc2gtZWQyNTUxOQAAACD39ygfAlHPhZWU8inWu1hypIlQTChQxSKKB6iaV6Q0lQ +AAAEB4Ng9MekhsMKYDaBcOUWdxmi1rjgCsPOOfpABTxiCef/f3KB8CUc+FlZTyKda7WHKk +iVBMKFDFIooHqJpXpDSVAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051-cert.pub new file mode 100644 index 0000000000..5b4bd11247 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIGTNYRrlJ1vExK7dume319Krn4YW6wyZc4PzZLjZoB8zAAAAIPf3KB8CUc+FlZTyKda7WHKkiVBMKFDFIooHqJpXpDSVAAAAAAAAADMAAAABAAAACnJldm9rZWQgNTEAAAAAAAAAAAAAAAD//////////wAAAAAAAACCAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAAFnBlcm1pdC1wb3J0LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIBbReZevLKczhayKUADRdAvZ5DXVzAJpQkcB4MPdQu/OAAAAUwAAAAtzc2gtZWQyNTUxOQAAAEAgUiwWKerMo8nuejTER/EmM6ZUpmXjgFwPCpb1LAxBJH71iOnyF9S0gp+CSmjqiTS2yuQajSMen64wOdJCX7wF ./tst-keys/unrevoked-0051.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051.pub new file mode 100644 index 0000000000..88867e58da --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0051.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPf3KB8CUc+FlZTyKda7WHKkiVBMKFDFIooHqJpXpDSV diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499 new file mode 100644 index 0000000000..8f59be9e5d --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACCpwI1aCbAOVvA7NJhLtBNpR4tiGGtTQ019wjKL6zJ/uQAAAIhllrzrZZa8 +6wAAAAtzc2gtZWQyNTUxOQAAACCpwI1aCbAOVvA7NJhLtBNpR4tiGGtTQ019wjKL6zJ/uQ +AAAECQ6o+3J9W3wXFWEcrPJl5qJZudUPmPdKF7SYxcMTrVP6nAjVoJsA5W8Ds0mEu0E2lH +i2IYa1NDTX3CMovrMn+5AAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499-cert.pub new file mode 100644 index 0000000000..a6e76f12f7 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIJvt1IxZsGIIS9DDCCKiD13Dbs5Af5ouews+YwZ9FoydAAAAIKnAjVoJsA5W8Ds0mEu0E2lHi2IYa1NDTX3CMovrMn+5AAAAAAAAAfMAAAABAAAAC3Jldm9rZWQgNDk5AAAAAAAAAAAAAAAA//////////8AAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAFMAAAALc3NoLWVkMjU1MTkAAABAMaA4UjND4LX9kdHjhgWJjGzzs/xUBwxQQcAmNgwmmQzmkwj8ctWBBA1+TkBMcZbSNUWBdclT4UcnDPEYqG1NBg== ./tst-keys/unrevoked-0499.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499.pub new file mode 100644 index 0000000000..5a3acbb245 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0499.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKnAjVoJsA5W8Ds0mEu0E2lHi2IYa1NDTX3CMovrMn+5 diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800 new file mode 100644 index 0000000000..9684d727f5 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAn5h8A2vYJ1+IWVtdLMulUQKCqlVLHpcHEFqYC5gtGlwAAAIh2lf7UdpX+ +1AAAAAtzc2gtZWQyNTUxOQAAACAn5h8A2vYJ1+IWVtdLMulUQKCqlVLHpcHEFqYC5gtGlw +AAAEAEXGgMPKs3HwkQmNdVkbO3PcaBVCBEv1l8yy/ly30jPSfmHwDa9gnX4hZW10sy6VRA +oKqVUselwcQWpgLmC0aXAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800-cert.pub new file mode 100644 index 0000000000..ab47a2bcf4 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIPAKFTJ25v9CsCppsQ/FwXAZgntAIdQHUXo0KQ3FrlTzAAAAICfmHwDa9gnX4hZW10sy6VRAoKqVUselwcQWpgLmC0aXAAAAAAAAAyAAAAABAAAAC3Jldm9rZWQgODAwAAAAAAAAAAAAAAAA//////////8AAAAAAAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAAAMwAAAAtzc2gtZWQyNTUxOQAAACAW0XmXryynM4WsilAA0XQL2eQ11cwCaUJHAeDD3ULvzgAAAFMAAAALc3NoLWVkMjU1MTkAAABA16aKfsgD0iZ+qc2b1AxBHZ/nyczN2Xjbhg4eJm/6cPSkBHs8uan5e8yPBIQJq2LztC3If6Z6PARoWUnIKb43CQ== ./tst-keys/unrevoked-0800.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800.pub new file mode 100644 index 0000000000..3a41f29a84 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-0800.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICfmHwDa9gnX4hZW10sy6VRAoKqVUselwcQWpgLmC0aX diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010 new file mode 100644 index 0000000000..89df71745a --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAg0jawQzRMO/ESfFm6yDc66J5kjasOqTb7rmQSU6Nk3QAAAIhczXMoXM1z +KAAAAAtzc2gtZWQyNTUxOQAAACAg0jawQzRMO/ESfFm6yDc66J5kjasOqTb7rmQSU6Nk3Q +AAAEAdeQiqpyZqBaffmgy+UrvFVpygD0n8isn3zjumVNtKxiDSNrBDNEw78RJ8WbrINzro +nmSNqw6pNvuuZBJTo2TdAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010-cert.pub new file mode 100644 index 0000000000..2d0fe53663 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIITg9nSjjofIKXTKf2byvYL3Ce43PP9Dtrbj/+AlfgEtAAAAICDSNrBDNEw78RJ8WbrINzronmSNqw6pNvuuZBJTo2TdAAAAAAAAA/IAAAABAAAADHJldm9rZWQgMTAxMAAAAAAAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgFtF5l68spzOFrIpQANF0C9nkNdXMAmlCRwHgw91C784AAABTAAAAC3NzaC1lZDI1NTE5AAAAQIndHhKILtU0+FkKKw1KmhaHQS3p1KiQdld/2P5jpcEgb292iY+ICU+aHXKvS8qGM2aMImv8835NEyWy/MB74QM= ./tst-keys/unrevoked-1010.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010.pub new file mode 100644 index 0000000000..05c5eac539 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1010.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDSNrBDNEw78RJ8WbrINzronmSNqw6pNvuuZBJTo2Td diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011 b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011 new file mode 100644 index 0000000000..38b823270e --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACCd4IBQx9BhO9FzYMOKu3cKgBcwUwb7XzS3uI26RgmEYgAAAIjHvhtux74b +bgAAAAtzc2gtZWQyNTUxOQAAACCd4IBQx9BhO9FzYMOKu3cKgBcwUwb7XzS3uI26RgmEYg +AAAEBsteyDUYUNwgY3SMkMs0guy8MJfek2kuvH35zEpVf6Hp3ggFDH0GE70XNgw4q7dwqA +FzBTBvtfNLe4jbpGCYRiAAAAAAECAwQF +-----END OPENSSH PRIVATE KEY----- diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011-cert.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011-cert.pub new file mode 100644 index 0000000000..46716383ce --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011-cert.pub @@ -0,0 +1 @@ +ssh-ed25519-cert-v01@openssh.com AAAAIHNzaC1lZDI1NTE5LWNlcnQtdjAxQG9wZW5zc2guY29tAAAAIMjD2+xjmUC1VviOH+peT9C81Y4xjyTue/F69nFKmQBMAAAAIJ3ggFDH0GE70XNgw4q7dwqAFzBTBvtfNLe4jbpGCYRiAAAAAAAAA/MAAAABAAAADHJldm9rZWQgMTAxMQAAAAAAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAADMAAAALc3NoLWVkMjU1MTkAAAAgFtF5l68spzOFrIpQANF0C9nkNdXMAmlCRwHgw91C784AAABTAAAAC3NzaC1lZDI1NTE5AAAAQNENdVFCE02X6z+wFJtm2DQcgdc4oov9DyFKLPqLrogo+pVao5QwOkeJ2J/tmp40H2+uP/jrDlQuCvOcoQGHqwY= ./tst-keys/unrevoked-1011.pub diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011.pub b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011.pub new file mode 100644 index 0000000000..080907734c --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/krl/unrevoked-1011.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ3ggFDH0GE70XNgw4q7dwqAFzBTBvtfNLe4jbpGCYRi diff --git a/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/repo.bundle b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/repo.bundle new file mode 100644 index 0000000000..c402f549cf Binary files /dev/null and b/org.eclipse.jgit.ssh.apache.test/tst-rsrc/org/eclipse/jgit/internal/signing/ssh/repo.bundle differ diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java index e13379be72..fdfffce810 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AbstractSshSignatureTest.java @@ -50,6 +50,7 @@ public abstract class AbstractSshSignatureTest extends RepositoryTestCase { @Before public void setUp() throws Exception { super.setUp(); + copyResource("allowed_signers", keys.getRoot()); copyResource("other_key", keys.getRoot()); copyResource("other_key.pub", keys.getRoot()); copyResource("other_key-cert.pub", keys.getRoot()); @@ -65,6 +66,9 @@ public abstract class AbstractSshSignatureTest extends RepositoryTestCase { Repository repo = db; StoredConfig config = repo.getConfig(); config.setString("gpg", null, "format", "ssh"); + config.setString("gpg", "ssh", "allowedSignersFile", + keys.getRoot().toPath().resolve("allowed_signers").toString() + .replace('\\', '/')); config.save(); // Run all tests with commit times on 2024-10-02T12:00:00Z. The test // certificates are valid from 2024-09-01 to 2024-10-31, except the diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AllowedSignersParseTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AllowedSignersParseTest.java new file mode 100644 index 0000000000..90fde3fb28 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AllowedSignersParseTest.java @@ -0,0 +1,201 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; + +import java.io.StreamCorruptedException; +import java.time.Instant; + +import org.eclipse.jgit.junit.MockSystemReader; +import org.eclipse.jgit.util.SystemReader; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests for the line parsing in {@link AllowedSigners}. + */ +public class AllowedSignersParseTest { + + @Before + public void setup() { + // Uses GMT-03:30 as time zone. + SystemReader.setInstance(new MockSystemReader()); + } + + @After + public void tearDown() { + SystemReader.setInstance(null); + } + + @Test + public void testValidDate() { + assertEquals(Instant.parse("2024-09-01T00:00:00.00Z"), + AllowedSigners.parseDate("20240901Z")); + assertEquals(Instant.parse("2024-09-01T01:02:00.00Z"), + AllowedSigners.parseDate("202409010102Z")); + assertEquals(Instant.parse("2024-09-01T01:02:03.00Z"), + AllowedSigners.parseDate("20240901010203Z")); + assertEquals(Instant.parse("2024-09-01T03:30:00.00Z"), + AllowedSigners.parseDate("20240901")); + assertEquals(Instant.parse("2024-09-01T04:32:00.00Z"), + AllowedSigners.parseDate("202409010102")); + assertEquals(Instant.parse("2024-09-01T04:32:03.00Z"), + AllowedSigners.parseDate("20240901010203")); + } + + @Test + public void testInvalidDate() { + assertThrows(Exception.class, () -> AllowedSigners.parseDate("1234")); + assertThrows(Exception.class, + () -> AllowedSigners.parseDate("09/01/2024")); + assertThrows(Exception.class, + () -> AllowedSigners.parseDate("2024-09-01")); + } + + private void checkValidKey(String expected, String input, int from) + throws StreamCorruptedException { + assertEquals(expected, AllowedSigners.parsePublicKey(input, from)); + } + @Test + public void testValidPublicKey() throws StreamCorruptedException { + checkValidKey( + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO", + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO", + 0); + checkValidKey( + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO", + "xyzssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO", + 3); + checkValidKey( + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO", + "xyz ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO abc", + 3); + checkValidKey( + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO", + "xyz\tssh-ed25519 \tAAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO abc", + 3); + } + + @Test + public void testInvalidPublicKey() { + assertThrows(Exception.class, + () -> AllowedSigners.parsePublicKey(null, 0)); + assertThrows(Exception.class, + () -> AllowedSigners.parsePublicKey("", 0)); + assertThrows(Exception.class, + () -> AllowedSigners.parsePublicKey("foo", 0)); + assertThrows(Exception.class, + () -> AllowedSigners.parsePublicKey("ssh-ed25519 bar", -1)); + assertThrows(Exception.class, + () -> AllowedSigners.parsePublicKey("ssh-ed25519 bar", 12)); + assertThrows(Exception.class, + () -> AllowedSigners.parsePublicKey("ssh-ed25519 bar", 13)); + assertThrows(Exception.class, + () -> AllowedSigners.parsePublicKey("ssh-ed25519 bar", 16)); + } + + @Test + public void testValidDequote() { + assertEquals(new AllowedSigners.Dequoted("a\\bc", 4), + AllowedSigners.dequote("a\\bc", 0)); + assertEquals(new AllowedSigners.Dequoted("a\\bc\"", 5), + AllowedSigners.dequote("a\\bc\"", 0)); + assertEquals(new AllowedSigners.Dequoted("a\\b\"c", 5), + AllowedSigners.dequote("a\\b\"c", 0)); + assertEquals(new AllowedSigners.Dequoted("a\\b\"c", 8), + AllowedSigners.dequote("\"a\\b\\\"c\"", 0)); + assertEquals(new AllowedSigners.Dequoted("a\\b\"c", 11), + AllowedSigners.dequote("xyz\"a\\b\\\"c\"", 3)); + assertEquals(new AllowedSigners.Dequoted("abc", 6), + AllowedSigners.dequote(" abc def", 3)); + } + + @Test + public void testInvalidDequote() { + assertThrows(Exception.class, () -> AllowedSigners.dequote("\"abc", 0)); + assertThrows(Exception.class, + () -> AllowedSigners.dequote("\"abc\\\"", 0)); + } + + @Test + public void testValidLine() throws Exception { + assertEquals(new AllowedSigners.AllowedEntry( + new String[] { "*@a.com" }, + true, null, null, null, + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO"), + AllowedSigners.parseLine( + "*@a.com cert-authority ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertEquals(new AllowedSigners.AllowedEntry( + new String[] { "*@a.com", "*@b.a.com" }, + true, null, null, null, + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO"), + AllowedSigners.parseLine( + "*@a.com,*@b.a.com cert-authority ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertEquals(new AllowedSigners.AllowedEntry( + new String[] { "foo@a.com" }, + false, null, null, null, + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO"), + AllowedSigners.parseLine( + "foo@a.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertEquals(new AllowedSigners.AllowedEntry( + new String[] { "foo@a.com" }, + false, new String[] { "foo", "bar" }, null, null, + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO"), + AllowedSigners.parseLine( + "foo@a.com namespaces=\"foo,bar\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertEquals(new AllowedSigners.AllowedEntry( + new String[] { "foo@a.com" }, + false, null, Instant.parse("2024-09-01T03:30:00.00Z"), null, + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO"), + AllowedSigners.parseLine( + "foo@a.com valid-After=\"20240901\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertEquals(new AllowedSigners.AllowedEntry( + new String[] { "*@a.com", "*@b.a.com" }, + true, new String[] { "git" }, + Instant.parse("2024-09-01T03:30:00.00Z"), + Instant.parse("2024-09-01T12:00:00.00Z"), + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO"), + AllowedSigners.parseLine( + "*@a.com,*@b.a.com cert-authority namespaces=\"git\" valid-after=\"20240901\" valid-before=\"202409011200Z\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + } + + @Test + public void testInvalidLine() { + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "cert-authority ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "namespaces=\"git\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "valid-after=\"20240901\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "valid-before=\"20240901\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "a@a.com namespaces=\"\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "a@a.com namespaces=\",,,\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "a@a.com,,b@a.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + } + + @Test + public void testSkippedLine() throws Exception { + assertNull(AllowedSigners.parseLine(null)); + assertNull(AllowedSigners.parseLine("")); + assertNull(AllowedSigners.parseLine("# Comment")); + } +} diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrlLoadTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrlLoadTest.java new file mode 100644 index 0000000000..9f9c3ca303 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrlLoadTest.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertNotNull; + +import java.io.BufferedInputStream; +import java.io.InputStream; + +import org.junit.Test; + +/** + * Tests loading an {@link OpenSshBinaryKrl}. + */ +public class OpenSshBinaryKrlLoadTest { + + @Test + public void testLoad() throws Exception { + try (InputStream in = new BufferedInputStream( + this.getClass().getResourceAsStream("krl/krl"))) { + OpenSshBinaryKrl krl = OpenSshBinaryKrl.load(in, false); + assertNotNull(krl); + } + } +} diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/OpenSshKrlTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/OpenSshKrlTest.java new file mode 100644 index 0000000000..2fd7756d10 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/OpenSshKrlTest.java @@ -0,0 +1,146 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.PublicKey; +import java.util.ArrayList; +import java.util.List; + +import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; +import org.apache.sshd.common.config.keys.PublicKeyEntryResolver; +import org.eclipse.jgit.util.FileUtils; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameter; +import org.junit.runners.Parameterized.Parameters; + +/** + * Tests for {@link OpenSshKrl} using binary KRLs. + */ +@RunWith(Parameterized.class) +public class OpenSshKrlTest { + + // The test data was generated using the public domain OpenSSH test script + // with some minor modifications (une ed25519 always, generate a "includes + // everything KRl, name the unrekoked keys "unrevoked*", generate a plain + // text KRL, and don't run the ssh-keygen tests). The original script is + // available at + // https://github.com/openssh/openssh-portable/blob/67a115e/regress/krl.sh + + private static final String[] KRLS = { + "krl-empty", "krl-keys", "krl-all", + "krl-sha1", "krl-sha256", "krl-hash", + "krl-serial", "krl-keyid", "krl-cert", "krl-ca", + "krl-serial-wild", "krl-keyid-wild", "krl-text" }; + + private static final int[] REVOKED = { 1, 4, 10, 50, 90, 500, 510, 520, 550, + 799, 999 }; + + private static final int[] UNREVOKED = { 5, 9, 14, 16, 29, 49, 51, 499, 800, + 1010, 1011 }; + + private static class TestData { + + String key; + + String krl; + + Boolean expected; + + TestData(String key, String krl, boolean expected) { + this.key = key; + this.krl = krl; + this.expected = Boolean.valueOf(expected); + } + + @Override + public String toString() { + return key + '-' + krl; + } + } + + @Parameters(name = "{0}") + public static List initTestData() { + List tests = new ArrayList<>(); + for (int i = 0; i < REVOKED.length; i++) { + String key = String.format("revoked-%04d", + Integer.valueOf(REVOKED[i])); + for (String krl : KRLS) { + boolean expected = !krl.endsWith("-empty"); + tests.add(new TestData(key + "-cert.pub", krl, expected)); + expected = krl.endsWith("-keys") || krl.endsWith("-all") + || krl.endsWith("-hash") || krl.endsWith("-sha1") + || krl.endsWith("-sha256") || krl.endsWith("-text"); + tests.add(new TestData(key + ".pub", krl, expected)); + } + } + for (int i = 0; i < UNREVOKED.length; i++) { + String key = String.format("unrevoked-%04d", + Integer.valueOf(UNREVOKED[i])); + for (String krl : KRLS) { + boolean expected = false; + tests.add(new TestData(key + ".pub", krl, expected)); + expected = krl.endsWith("-ca"); + tests.add(new TestData(key + "-cert.pub", krl, expected)); + } + } + return tests; + } + + private static Path tmp; + + @BeforeClass + public static void setUp() throws IOException { + tmp = Files.createTempDirectory("krls"); + for (String krl : KRLS) { + copyResource("krl/" + krl, tmp); + } + } + + private static void copyResource(String name, Path directory) + throws IOException { + try (InputStream in = OpenSshKrlTest.class + .getResourceAsStream(name)) { + int i = name.lastIndexOf('/'); + String fileName = i < 0 ? name : name.substring(i + 1); + Files.copy(in, directory.resolve(fileName)); + } + } + + @AfterClass + public static void cleanUp() throws Exception { + FileUtils.delete(tmp.toFile(), FileUtils.RECURSIVE); + } + + // Injected by JUnit + @Parameter + public TestData data; + + @Test + public void testIsRevoked() throws Exception { + OpenSshKrl krl = new OpenSshKrl(tmp.resolve(data.krl)); + try (InputStream in = this.getClass() + .getResourceAsStream("krl/" + data.key)) { + PublicKey key = AuthorizedKeyEntry.readAuthorizedKeys(in, true) + .get(0) + .resolvePublicKey(null, PublicKeyEntryResolver.FAILING); + assertEquals(data.expected, Boolean.valueOf(krl.isRevoked(key))); + } + } +} diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SerialRangeSetTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SerialRangeSetTest.java new file mode 100644 index 0000000000..e6709adebc --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SerialRangeSetTest.java @@ -0,0 +1,124 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * Tests for the set of serial number ranges. + */ +public class SerialRangeSetTest { + + private SerialRangeSet ranges = new SerialRangeSet(); + + @Test + public void testInsertSimple() { + ranges.add(1); + ranges.add(3); + ranges.add(5); + assertEquals(3, ranges.size()); + assertFalse(ranges.contains(0)); + assertTrue(ranges.contains(1)); + assertFalse(ranges.contains(2)); + assertTrue(ranges.contains(3)); + assertFalse(ranges.contains(4)); + assertTrue(ranges.contains(5)); + assertFalse(ranges.contains(6)); + } + + @Test + public void testInsertSimpleRanges() { + ranges.add(1, 2); + ranges.add(4, 5); + ranges.add(7, 8); + assertEquals(3, ranges.size()); + assertFalse(ranges.contains(0)); + assertTrue(ranges.contains(1)); + assertTrue(ranges.contains(2)); + assertFalse(ranges.contains(3)); + assertTrue(ranges.contains(4)); + assertTrue(ranges.contains(5)); + assertFalse(ranges.contains(6)); + assertTrue(ranges.contains(7)); + assertTrue(ranges.contains(8)); + assertFalse(ranges.contains(9)); + } + + @Test + public void testInsertCoalesce() { + ranges.add(5); + ranges.add(1); + ranges.add(2); + ranges.add(4); + ranges.add(7); + ranges.add(3); + assertEquals(2, ranges.size()); + assertFalse(ranges.contains(0)); + assertTrue(ranges.contains(1)); + assertTrue(ranges.contains(2)); + assertTrue(ranges.contains(3)); + assertTrue(ranges.contains(4)); + assertTrue(ranges.contains(5)); + assertFalse(ranges.contains(6)); + assertTrue(ranges.contains(7)); + assertFalse(ranges.contains(8)); + } + + @Test + public void testInsertOverlap() { + ranges.add(1, 3); + ranges.add(6); + ranges.add(2, 5); + assertEquals(1, ranges.size()); + assertFalse(ranges.contains(0)); + assertTrue(ranges.contains(1)); + assertTrue(ranges.contains(2)); + assertTrue(ranges.contains(3)); + assertTrue(ranges.contains(4)); + assertTrue(ranges.contains(5)); + assertTrue(ranges.contains(6)); + assertFalse(ranges.contains(7)); + } + + @Test + public void testInsertOverlapMultiple() { + ranges.add(1, 3); + ranges.add(5, 6); + ranges.add(8); + ranges.add(2, 5); + assertEquals(2, ranges.size()); + assertFalse(ranges.contains(0)); + assertTrue(ranges.contains(1)); + assertTrue(ranges.contains(2)); + assertTrue(ranges.contains(3)); + assertTrue(ranges.contains(4)); + assertTrue(ranges.contains(5)); + assertTrue(ranges.contains(6)); + assertFalse(ranges.contains(7)); + assertTrue(ranges.contains(8)); + assertFalse(ranges.contains(9)); + } + + @Test + public void testInsertOverlapTotal() { + ranges.add(1, 3); + ranges.add(2, 3); + assertEquals(1, ranges.size()); + assertFalse(ranges.contains(0)); + assertTrue(ranges.contains(1)); + assertTrue(ranges.contains(2)); + assertTrue(ranges.contains(3)); + assertFalse(ranges.contains(4)); + } +} diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshSignatureVerifierTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshSignatureVerifierTest.java new file mode 100644 index 0000000000..e5dfe497ca --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/SshSignatureVerifierTest.java @@ -0,0 +1,151 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.Map; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.VerificationResult; +import org.eclipse.jgit.lib.SignatureVerifier; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.util.StringUtils; +import org.junit.Test; + +/** + * Tests for the {@link SshSignatureVerifier}. + */ +public class SshSignatureVerifierTest extends AbstractSshSignatureTest { + + @Test + public void testPlainSignature() throws Exception { + RevCommit c = checkSshSignature( + createSignedCommit(null, "signing_key.pub")); + try (Git git = new Git(db)) { + Map results = git.verifySignature() + .addName(c.getName()).call(); + assertEquals(1, results.size()); + VerificationResult verified = results.get(c.getName()); + assertNotNull(verified); + assertNull(verified.getException()); + SignatureVerifier.SignatureVerification v = verified + .getVerification(); + assertTrue(v.verified()); + assertFalse(v.expired()); + assertTrue(StringUtils.isEmptyOrNull(v.message())); + assertEquals("tester@example.com", v.keyUser()); + assertEquals("SHA256:GKW0xy+XKnJGs0CJqP6j5bd4FdiwWNaUbwvUbHvhQKo", + v.keyFingerprint()); + assertEquals(SignatureVerifier.TrustLevel.FULL, v.trustLevel()); + assertEquals(commitTime, v.creationDate().toInstant()); + } + } + + @Test + public void testCertificateSignature() throws Exception { + RevCommit c = checkSshSignature( + createSignedCommit("tester.cert", "signing_key-cert.pub")); + try (Git git = new Git(db)) { + Map results = git.verifySignature() + .addName(c.getName()).call(); + assertEquals(1, results.size()); + VerificationResult verified = results.get(c.getName()); + assertNotNull(verified); + assertNull(verified.getException()); + SignatureVerifier.SignatureVerification v = verified + .getVerification(); + assertTrue(v.verified()); + assertFalse(v.expired()); + assertTrue(StringUtils.isEmptyOrNull(v.message())); + assertEquals("tester@example.com", v.keyUser()); + assertEquals("SHA256:GKW0xy+XKnJGs0CJqP6j5bd4FdiwWNaUbwvUbHvhQKo", + v.keyFingerprint()); + assertEquals(SignatureVerifier.TrustLevel.FULL, v.trustLevel()); + assertEquals(commitTime, v.creationDate().toInstant()); + } + } + + @Test + public void testNoPrincipalsSignature() throws Exception { + RevCommit c = checkSshSignature(createSignedCommit("no_principals.cert", + "signing_key-cert.pub")); + try (Git git = new Git(db)) { + Map results = git.verifySignature() + .addName(c.getName()).call(); + assertEquals(1, results.size()); + VerificationResult verified = results.get(c.getName()); + assertNotNull(verified); + assertNull(verified.getException()); + SignatureVerifier.SignatureVerification v = verified + .getVerification(); + assertFalse(v.verified()); + assertFalse(v.expired()); + assertNull(v.keyUser()); + assertEquals("SHA256:GKW0xy+XKnJGs0CJqP6j5bd4FdiwWNaUbwvUbHvhQKo", + v.keyFingerprint()); + assertEquals(SignatureVerifier.TrustLevel.NEVER, v.trustLevel()); + assertTrue(v.message().contains("*@example.com")); + assertEquals(commitTime, v.creationDate().toInstant()); + } + } + + @Test + public void testOtherCertificateSignature() throws Exception { + RevCommit c = checkSshSignature( + createSignedCommit("other.cert", "signing_key-cert.pub")); + try (Git git = new Git(db)) { + Map results = git.verifySignature() + .addName(c.getName()).call(); + assertEquals(1, results.size()); + VerificationResult verified = results.get(c.getName()); + assertNotNull(verified); + assertNull(verified.getException()); + SignatureVerifier.SignatureVerification v = verified + .getVerification(); + assertTrue(v.verified()); + assertFalse(v.expired()); + assertTrue(StringUtils.isEmptyOrNull(v.message())); + assertEquals("other@example.com", v.keyUser()); + assertEquals("SHA256:GKW0xy+XKnJGs0CJqP6j5bd4FdiwWNaUbwvUbHvhQKo", + v.keyFingerprint()); + assertEquals(SignatureVerifier.TrustLevel.FULL, v.trustLevel()); + assertEquals(commitTime, v.creationDate().toInstant()); + } + } + + @Test + public void testTwoPrincipalsCertificateSignature() throws Exception { + RevCommit c = checkSshSignature(createSignedCommit( + "two_principals.cert", "signing_key-cert.pub")); + try (Git git = new Git(db)) { + Map results = git.verifySignature() + .addName(c.getName()).call(); + assertEquals(1, results.size()); + VerificationResult verified = results.get(c.getName()); + assertNotNull(verified); + assertNull(verified.getException()); + SignatureVerifier.SignatureVerification v = verified + .getVerification(); + assertTrue(v.verified()); + assertFalse(v.expired()); + assertTrue(StringUtils.isEmptyOrNull(v.message())); + assertEquals("foo@example.com,tester@example.com", v.keyUser()); + assertEquals("SHA256:GKW0xy+XKnJGs0CJqP6j5bd4FdiwWNaUbwvUbHvhQKo", + v.keyFingerprint()); + assertEquals(SignatureVerifier.TrustLevel.FULL, v.trustLevel()); + assertEquals(commitTime, v.creationDate().toInstant()); + } + } +} diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/VerifyGitSignaturesTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/VerifyGitSignaturesTest.java new file mode 100644 index 0000000000..30ddee559c --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/VerifyGitSignaturesTest.java @@ -0,0 +1,154 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import java.io.File; +import java.io.InputStream; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.VerificationResult; +import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.SignatureVerifier; +import org.eclipse.jgit.lib.StoredConfig; +import org.eclipse.jgit.util.GitDateFormatter; +import org.eclipse.jgit.util.SignatureUtils; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Verifies signatures made with C git and OpenSSH 9.0 to ensure we arrive at + * the same good/bad decisions, and that we can verify signatures not created by + * ourselves. + *

+ * Clones a JGit repo from a git bundle file created with C git, then checks all + * the commits and their signatures. (All commits in that bundle have SSH + * signatures.) + *

+ */ +public class VerifyGitSignaturesTest extends LocalDiskRepositoryTestCase { + + private static final Logger LOG = LoggerFactory + .getLogger(VerifyGitSignaturesTest.class); + + @Rule + public TemporaryFolder bundleDir = new TemporaryFolder(); + + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + try (InputStream in = this.getClass() + .getResourceAsStream("repo.bundle")) { + Files.copy(in, bundleDir.getRoot().toPath().resolve("repo.bundle")); + } + try (InputStream in = this.getClass() + .getResourceAsStream("allowed_signers")) { + Files.copy(in, + bundleDir.getRoot().toPath().resolve("allowed_signers")); + } + } + + /** + * Tests signatures created by C git using OpenSSH 9.0. + */ + @Test + public void testGitSignatures() throws Exception { + File gitDir = new File(getTemporaryDirectory(), "repo.git"); + try (Git git = Git.cloneRepository().setBare(true) + .setGitDir(gitDir) + .setURI(new File(bundleDir.getRoot(), "repo.bundle").toURI() + .toString()) + .setBranch("master") + .call()) { + StoredConfig config = git.getRepository().getConfig(); + config.setString("gpg", "ssh", "allowedSignersFile", + bundleDir.getRoot().toPath().resolve("allowed_signers") + .toAbsolutePath().toString().replace('\\', '/')); + config.save(); + List commits = new ArrayList<>(); + Map committers = new HashMap<>(); + git.log().all().call().forEach(c -> { + commits.add(c.getName()); + committers.put(c.getName(), c.getCommitterIdent()); + }); + Map expected = new HashMap<>(); + // These two commits do have multiple principals. GIT just reports + // the first one; we report both. + expected.put("9f79a7b661a22ab1ddf8af880d23678ae7696b71", + Boolean.TRUE); + expected.put("435108d157440e77d61a914b6a5736bc831c874d", + Boolean.TRUE); + // This commit has a wrong commit message; the certificate used + // did _not_ have two principals, but only a single principal + // foo@example.org. + expected.put("779dac7de40ebc3886af87d5e6680a09f8b13a3e", + Boolean.TRUE); + // Signed with other_key-cert.pub: we still don't know the key, + // but we do know the certificate's CA key, and trust it, so it's + // accepted as a signature from the principal(s) listed in the + // certificate. + expected.put("951f06d5b5598b721b98d98b04e491f234c1926a", + Boolean.TRUE); + // Signature with other_key.pub not listed in allowed_signers + expected.put("984e629c6d543a7f77eb49a8c9316f2ae4416375", + Boolean.FALSE); + // Signed with other-ca.cert (CA key not in allowed_signers), but + // the certified key _is_ listed in allowed_signers. + expected.put("1d7ac6d91747a9c9a777df238fbdaeffa7731a6c", + Boolean.FALSE); + expected.put("a297bcfbf5c4a850f9770655fef7315328a4b3fb", + Boolean.TRUE); + expected.put("852729d54676cb83826ed821dc7734013e97950d", + Boolean.TRUE); + // Signature with a certificate without principals. + expected.put("e39a049f75fe127eb74b30aba4b64e171d4281dd", + Boolean.FALSE); + // Signature made with expired.cert (expired at the commit time). + // git/OpenSSH 9.0 allows to create such signatures, but reports + // them as FALSE. Our SshSigner doesn't allow creating such + // signatures. + expected.put("303ea5e61feacdad4cb012b4cb6b0cea3fbcef9f", + Boolean.FALSE); + expected.put("1ae4b120a869b72a7a2d4ad4d7a8c9d454384333", + Boolean.TRUE); + Map results = git.verifySignature() + .addNames(commits).call(); + GitDateFormatter dateFormat = new GitDateFormatter( + GitDateFormatter.Format.ISO); + for (String oid : commits) { + VerificationResult v = results.get(oid); + assertNotNull(v); + assertNull(v.getException()); + SignatureVerifier.SignatureVerification sv = v + .getVerification(); + assertNotNull(sv); + LOG.info("Commit {}\n{}", oid, SignatureUtils.toString(sv, + committers.get(oid), dateFormat)); + Boolean wanted = expected.get(oid); + assertNotNull(wanted); + assertEquals(wanted, Boolean.valueOf(sv.verified())); + } + } + } +} diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 512c19f4c2..826d33009b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -28,6 +28,7 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends: org.eclipse.jgit.internal.transport.sshd.auth;version="7.1.0";x-internal:=true, org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.1.0";x-internal:=true, org.eclipse.jgit.internal.transport.sshd.proxy;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.1.0";uses:="org.eclipse.jgit.lib", org.eclipse.jgit.transport.sshd;version="7.1.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, diff --git a/org.eclipse.jgit.ssh.apache/resources/META-INF/services/org.eclipse.jgit.lib.SignatureVerifierFactory b/org.eclipse.jgit.ssh.apache/resources/META-INF/services/org.eclipse.jgit.lib.SignatureVerifierFactory new file mode 100644 index 0000000000..4a0f553c81 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/resources/META-INF/services/org.eclipse.jgit.lib.SignatureVerifierFactory @@ -0,0 +1 @@ +org.eclipse.jgit.signing.ssh.SshSignatureVerifierFactory \ No newline at end of file diff --git a/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties b/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties index e51c80a5ac..6048239391 100644 --- a/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties +++ b/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties @@ -125,17 +125,59 @@ sshClosingDown=Apache MINA sshd session factory is closing down; cannot create n sshCommandTimeout={0} timed out after {1} seconds while opening the channel sshProcessStillRunning={0} is not yet completed, cannot get exit code sshProxySessionCloseFailed=Error while closing proxy session {0} +signAllowedSignersCertAuthorityError=Garbage after cert-authority +signAllowedSignersEmptyIdentity=Identities contains an empty identity; check for spurious extra commas: {0} +signAllowedSignersEmptyNamespaces=Empty namespaces= is not allowed; to allow a key for any namespace, omit the namespaces option +signAllowedSignersFormatError=Cannot parse allowed signers file {0}, problem at line {1}: {2} +signAllowedSignersInvalidDate=Cannot parse valid-before or valid-after date {0} +signAllowedSignersLineFormat=Invalid line format +signAllowedSignersMultiple={0} is allowed only once +signAllowedSignersNoIdentities=Line has no identity patterns +signAllowedSignersPublicKeyParsing=Cannot parse public key {0} +signAllowedSignersUnterminatedQuote=Unterminated double quote signCertAlgorithmMismatch=Certificate of type {0} with CA key {1} uses an incompatible signature algorithm {2} signCertAlgorithmUnknown=Certificate with CA key {0} is signed with an unknown algorithm {1} signCertificateExpired=Expired certificate with CA key {0} signCertificateInvalid=Certificate signature does not match on certificate with CA key {0} +signCertificateNotForName=Certificate with CA key {0} does not apply for name ''{1}'' +signCertificateRevoked=Certificate with CA key {0} was revoked signCertificateTooEarly=Certificate with CA key {0} was not valid yet +signCertificateWithoutPrincipals=Certificate with CA key {0} has no principals; identities from gpg.ssh.allowedSignersFile: {1} signDefaultKeyEmpty=git.ssh.defaultKeyCommand {0} returned no key signDefaultKeyFailed=git.ssh.defaultKeyCommand {0} failed with exit code {1}\n{2} signDefaultKeyInterrupted=git.ssh.defaultKeyCommand {0} was interrupted +signGarbageAtEnd=SSH signature has extra bytes at the end +signInvalidAlgorithm=SSH signature has invalid signature algorithm {0} signInvalidKeyDSA=SSH signatures with DSA keys or certificates are not supported; use a different signing key. +signInvalidMagic=SSH signature does not start with "SSHSIG" +signInvalidNamespace=Namespace of SSH signature should be ''git'' but is ''{0}'' +signInvalidSignature=SSH signature is invalid: {0} +signInvalidVersion=Cannot verify signature with version {0} +signKeyExpired=Expired key used for SSH signature +signKeyRevoked=Key used for the SSH signature was revoked +signKeyTooEarly=Key used for the SSH signature was not valid yet +signKrlBlobLeftover=gpg.ssh.revocationFile has invalid blob section {0} with {1} leftover bytes +signKrlBlobLengthInvalid=gpg.ssh.revocationFile has invalid blob length {1} in section {0} +signKrlBlobLengthInvalidExpected=gpg.ssh.revocationFile has invalid blob length {1} (expected {2}) in section {0} +signKrlCaKeyLengthInvalid=gpg.ssh.revocationFile has invalid CA key length {0} in certificates section +signKrlCertificateLeftover=gpg.ssh.revocationFile has invalid certificates section with {0} leftover bytes +signKrlCertificateSubsectionLeftover=gpg.ssh.revocationFile has invalid certificates subsection with {0} leftover bytes +signKrlCertificateSubsectionLength=gpg.ssh.revocationFile has invalid certificates subsection length {0} +signKrlEmptyRange=gpg.ssh.revocationFile has an empty range of certificate serial numbers +signKrlInvalidBitSetLength=gpg.ssh.revocationFile has invalid certificate serial number bit set length {0} +signKrlInvalidKeyIdLength=gpg.ssh.revocationFile has invalid certificate key ID length {0} +signKrlInvalidMagic=gpg.ssh.revocationFile is not a binary OpenSSH key revocation list +signKrlInvalidReservedLength=gpg.ssh.revocationFile has an invalid reserved string length {0} +signKrlInvalidVersion=gpg.ssh.revocationFile: cannot read KRLs with FORMAT_VERSION {0} +signKrlNoCertificateSubsection=gpg.ssh.revocationFile has certificate section without subsections +signKrlSerialZero=gpg.ssh.revocationFile: certificate serial number zero cannot be revoked +signKrlShortRange=gpg.ssh.revocationFile: short certificate serial number range, need at least 8 more bytes, got only {0} +signKrlUnknownSection=gpg.ssh.revocationFile has an unknown section type {0} +signKrlUnknownSubsection=gpg.ssh.revocationFile has an unknown certificates subsection type {0} signLogFailure=SSH signature verification failed +signMismatchedSignatureAlgorithm=SSH signature made with an ''{0}'' key has incompatible signature algorithm ''{1}'' signNoAgent=No connector for ssh-agent found; maybe include org.eclipse.jgit.ssh.apache.agent in the application. +signNoPrincipalMatched=No principal matched in gpg.ssh.allowedSignersFile signNoPublicKey=No public key found with signing key {0} signNoSigningKey=Git config user.signingKey or gpg.ssh.defaultKeyCommand must be set for SSH signing. signNotUserCertificate=Certificate with CA key {0} used for the SSH signature is not a user certificate. @@ -147,4 +189,5 @@ signTooManyPrivateKeys=Private key file {0} must contain exactly one private key signTooManyPublicKeys=Public key file {0} must contain exactly one public key signUnknownHashAlgorithm=SSH Signature has an unknown hash algorithm {0} signUnknownSignatureAlgorithm=SSH Signature has an unknown signature algorithm {0} +signWrongNamespace=Key may not be used in namespace "{0}". unknownProxyProtocol=Ignoring unknown proxy protocol {0} \ No newline at end of file diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java new file mode 100644 index 0000000000..92cf1faec9 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java @@ -0,0 +1,535 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.StreamCorruptedException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.security.PublicKey; +import java.text.MessageFormat; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.temporal.ChronoField; +import java.time.temporal.TemporalAccessor; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.TimeZone; +import java.util.concurrent.TimeUnit; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import org.apache.sshd.common.config.keys.KeyUtils; +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.config.keys.PublicKeyEntry; +import org.apache.sshd.common.util.io.ModifiableFileWatcher; +import org.eclipse.jgit.internal.transport.ssh.OpenSshConfigFile; +import org.eclipse.jgit.internal.transport.sshd.SshdText; +import org.eclipse.jgit.signing.ssh.VerificationException; +import org.eclipse.jgit.util.StringUtils; +import org.eclipse.jgit.util.SystemReader; + +/** + * Encapsulates the allowed signers handling. + */ +final class AllowedSigners extends ModifiableFileWatcher { + + private static final String CERT_AUTHORITY = "cert-authority"; //$NON-NLS-1$ + + private static final String NAMESPACES = "namespaces="; //$NON-NLS-1$ + + private static final String VALID_AFTER = "valid-after="; //$NON-NLS-1$ + + private static final String VALID_BEFORE = "valid-before="; //$NON-NLS-1$ + + private static final String SSH_KEY_PREFIX = "ssh-"; //$NON-NLS-1$ + + private static final DateTimeFormatter SSH_DATE_FORMAT = new DateTimeFormatterBuilder() + .appendValue(ChronoField.YEAR, 4) + .appendValue(ChronoField.MONTH_OF_YEAR, 2) + .appendValue(ChronoField.DAY_OF_MONTH, 2) + .optionalStart() + .appendValue(ChronoField.HOUR_OF_DAY, 2) + .appendValue(ChronoField.MINUTE_OF_HOUR, 2) + .optionalStart() + .appendValue(ChronoField.SECOND_OF_MINUTE, 2) + .toFormatter(Locale.ROOT); + + private static final Predicate CERTIFICATES = AllowedEntry::isCA; + + private static final Predicate PLAIN_KEYS = Predicate + .not(CERTIFICATES); + + static record AllowedEntry(String[] identities, boolean isCA, + String[] namespaces, Instant validAfter, Instant validBefore, + String key) { + // Empty + + @Override + public final boolean equals(Object any) { + if (this == any) { + return true; + } + if (any == null || !(any instanceof AllowedEntry)) { + return false; + } + AllowedEntry other = (AllowedEntry) any; + return isCA == other.isCA + && Arrays.equals(identities, other.identities) + && Arrays.equals(namespaces, other.namespaces) + && Objects.equals(validAfter, other.validAfter) + && Objects.equals(validBefore, other.validBefore) + && Objects.equals(key, other.key); + } + + @Override + public final int hashCode() { + int hash = Boolean.hashCode(isCA); + hash = hash * 31 + Arrays.hashCode(identities); + hash = hash * 31 + Arrays.hashCode(namespaces); + return hash * 31 + Objects.hash(validAfter, validBefore, key); + } + } + + private static record State(Map> entries) { + // Empty + } + + private State state; + + public AllowedSigners(Path path) { + super(path); + state = new State(new HashMap<>()); + } + + public String isAllowed(PublicKey key, String namespace, String name, + Instant time) throws IOException, VerificationException { + State currentState = refresh(); + PublicKey keyToCheck = key; + if (key instanceof OpenSshCertificate certificate) { + AllowedEntry entry = find(currentState, certificate.getCaPubKey(), + namespace, name, time, CERTIFICATES); + if (entry != null) { + Collection principals = certificate.getPrincipals(); + if (principals.isEmpty()) { + // According to the OpenSSH documentation, a certificate + // without principals is valid for anyone. + // + // See https://man.openbsd.org/ssh-keygen.1#CERTIFICATES . + // + // However, the same documentation also says that a name + // must match both the entry's patterns and be listed in the + // certificate's principals. + // + // See https://man.openbsd.org/ssh-keygen.1#ALLOWED_SIGNERS + // + // git/OpenSSH considers signatures made by such + // certificates untrustworthy. + String identities; + if (!StringUtils.isEmptyOrNull(name)) { + // The name must have matched entry.identities. + identities = name; + } else { + identities = Arrays.stream(entry.identities()) + .collect(Collectors.joining(",")); //$NON-NLS-1$ + } + throw new VerificationException(false, MessageFormat.format( + SshdText.get().signCertificateWithoutPrincipals, + KeyUtils.getFingerPrint(certificate.getCaPubKey()), + identities)); + } + if (!StringUtils.isEmptyOrNull(name)) { + if (!principals.contains(name)) { + throw new VerificationException(false, + MessageFormat.format(SshdText + .get().signCertificateNotForName, + KeyUtils.getFingerPrint( + certificate.getCaPubKey()), + name)); + } + return name; + } + // Filter the principals listed in the certificate by + // the patterns defined in the file. + Set filtered = new LinkedHashSet<>(); + List patterns = Arrays.asList(entry.identities()); + for (String principal : principals) { + if (OpenSshConfigFile.patternMatch(patterns, principal)) { + filtered.add(principal); + } + } + return filtered.stream().collect(Collectors.joining(",")); //$NON-NLS-1$ + } + // Certificate not found. git/OpenSSH considers this untrustworthy, + // even if the certified key itself might be listed. + return null; + // Alternative: go check for the certified key itself: + // keyToCheck = certificate.getCertPubKey(); + } + AllowedEntry entry = find(currentState, keyToCheck, namespace, name, + time, PLAIN_KEYS); + if (entry != null) { + if (!StringUtils.isEmptyOrNull(name)) { + // The name must have matched entry.identities. + return name; + } + // No name given, but we consider the key valid: report the + // identities. + return Arrays.stream(entry.identities()) + .collect(Collectors.joining(",")); //$NON-NLS-1$ + } + return null; + } + + private AllowedEntry find(State current, PublicKey key, + String namespace, String name, Instant time, + Predicate filter) + throws VerificationException { + String k = PublicKeyEntry.toString(key); + VerificationException v = null; + List candidates = current.entries().get(k); + if (candidates == null) { + return null; + } + for (AllowedEntry entry : candidates) { + if (!filter.test(entry)) { + continue; + } + if (name != null && !OpenSshConfigFile + .patternMatch(Arrays.asList(entry.identities()), name)) { + continue; + } + if (entry.namespaces() != null) { + if (!OpenSshConfigFile.patternMatch( + Arrays.asList(entry.namespaces()), + namespace)) { + if (v == null) { + v = new VerificationException(false, + MessageFormat.format( + SshdText.get().signWrongNamespace, + KeyUtils.getFingerPrint(key), + namespace)); + } + continue; + } + } + if (time != null) { + if (entry.validAfter() != null + && time.isBefore(entry.validAfter())) { + if (v == null) { + v = new VerificationException(true, + MessageFormat.format( + SshdText.get().signKeyTooEarly, + KeyUtils.getFingerPrint(key))); + } + continue; + } else if (entry.validBefore() != null + && time.isAfter(entry.validBefore())) { + if (v == null) { + v = new VerificationException(true, + MessageFormat.format( + SshdText.get().signKeyTooEarly, + KeyUtils.getFingerPrint(key))); + } + continue; + } + } + return entry; + } + if (v != null) { + throw v; + } + return null; + } + + private synchronized State refresh() throws IOException { + if (checkReloadRequired()) { + updateReloadAttributes(); + try { + state = reload(getPath()); + } catch (NoSuchFileException e) { + // File disappeared + resetReloadAttributes(); + state = new State(new HashMap<>()); + } + } + return state; + } + + private static State reload(Path path) throws IOException { + Map> entries = new HashMap<>(); + try (BufferedReader r = Files.newBufferedReader(path, + StandardCharsets.UTF_8)) { + String line; + for (int lineNumber = 1;; lineNumber++) { + line = r.readLine(); + if (line == null) { + break; + } + line = line.strip(); + try { + AllowedEntry entry = parseLine(line); + if (entry != null) { + entries.computeIfAbsent(entry.key(), + k -> new ArrayList<>()).add(entry); + } + } catch (IOException | RuntimeException e) { + throw new IOException(MessageFormat.format( + SshdText.get().signAllowedSignersFormatError, path, + Integer.toString(lineNumber), line), e); + } + } + } + return new State(entries); + } + + private static boolean matches(String src, String other, int offset) { + return src.regionMatches(true, offset, other, 0, other.length()); + } + + // Things below have package visibility for testing. + + static AllowedEntry parseLine(String line) + throws IOException { + if (StringUtils.isEmptyOrNull(line) || line.charAt(0) == '#') { + return null; + } + int length = line.length(); + if ((matches(line, CERT_AUTHORITY, 0) + && CERT_AUTHORITY.length() < length + && Character.isWhitespace(line.charAt(CERT_AUTHORITY.length()))) + || matches(line, NAMESPACES, 0) + || matches(line, VALID_AFTER, 0) + || matches(line, VALID_BEFORE, 0) + || matches(line, SSH_KEY_PREFIX, 0)) { + throw new StreamCorruptedException( + SshdText.get().signAllowedSignersNoIdentities); + } + int i = 0; + while (i < length && !Character.isWhitespace(line.charAt(i))) { + i++; + } + if (i >= length) { + throw new StreamCorruptedException(SshdText.get().signAllowedSignersLineFormat); + } + String[] identities = line.substring(0, i).split(","); //$NON-NLS-1$ + if (Arrays.stream(identities).anyMatch(String::isEmpty)) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signAllowedSignersEmptyIdentity, + line.substring(0, i))); + } + // Parse the options + i++; + boolean isCA = false; + List namespaces = null; + Instant validAfter = null; + Instant validBefore = null; + while (i < length) { + // Skip whitespace + if (Character.isSpaceChar(line.charAt(i))) { + i++; + continue; + } + if (matches(line, CERT_AUTHORITY, i)) { + i += CERT_AUTHORITY.length(); + isCA = true; + if (!Character.isWhitespace(line.charAt(i))) { + throw new StreamCorruptedException(SshdText.get().signAllowedSignersCertAuthorityError); + } + i++; + } else if (matches(line, NAMESPACES, i)) { + if (namespaces != null) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signAllowedSignersMultiple, + NAMESPACES)); + } + i += NAMESPACES.length(); + Dequoted parsed = dequote(line, i); + i = parsed.after(); + String ns = parsed.value(); + String[] items = ns.split(","); //$NON-NLS-1$ + namespaces = new ArrayList<>(items.length); + for (int j = 0; j < items.length; j++) { + String n = items[j].strip(); + if (!n.isEmpty()) { + namespaces.add(n); + } + } + if (namespaces.isEmpty()) { + throw new StreamCorruptedException( + SshdText.get().signAllowedSignersEmptyNamespaces); + } + } else if (matches(line, VALID_AFTER, i)) { + if (validAfter != null) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signAllowedSignersMultiple, + VALID_AFTER)); + } + i += VALID_AFTER.length(); + Dequoted parsed = dequote(line, i); + i = parsed.after(); + validAfter = parseDate(parsed.value()); + } else if (matches(line, VALID_BEFORE, i)) { + if (validBefore != null) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signAllowedSignersMultiple, + VALID_BEFORE)); + } + i += VALID_BEFORE.length(); + Dequoted parsed = dequote(line, i); + i = parsed.after(); + validBefore = parseDate(parsed.value()); + } else { + break; + } + } + // Now we should be at the key + String key = parsePublicKey(line, i); + return new AllowedEntry(identities, isCA, + namespaces == null ? null : namespaces.toArray(new String[0]), + validAfter, validBefore, key); + } + + static String parsePublicKey(String s, int from) + throws StreamCorruptedException { + int i = from; + int length = s.length(); + while (i < length && Character.isWhitespace(s.charAt(i))) { + i++; + } + if (i >= length) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signAllowedSignersPublicKeyParsing, + s.substring(from))); + } + int start = i; + while (i < length && !Character.isWhitespace(s.charAt(i))) { + i++; + } + if (i >= length) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signAllowedSignersPublicKeyParsing, + s.substring(start))); + } + int endOfKeyType = i; + i = endOfKeyType + 1; + while (i < length && Character.isWhitespace(s.charAt(i))) { + i++; + } + int startOfKey = i; + while (i < length && !Character.isWhitespace(s.charAt(i))) { + i++; + } + if (i == startOfKey) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signAllowedSignersPublicKeyParsing, + s.substring(start))); + } + String keyType = s.substring(start, endOfKeyType); + if (!keyType.startsWith(SSH_KEY_PREFIX)) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signAllowedSignersPublicKeyParsing, + s.substring(start))); + } + return keyType + ' ' + s.substring(startOfKey, i); + } + + static Instant parseDate(String input) { + // Allowed formats are YYYYMMDD[Z] or YYYYMMDDHHMM[SS][Z]. If 'Z', it's + // UTC, otherwise local time. + String timeSpec = input; + int length = input.length(); + if (length < 8) { + throw new IllegalArgumentException(MessageFormat.format( + SshdText.get().signAllowedSignersInvalidDate, input)); + } + boolean isUTC = false; + if (timeSpec.charAt(length - 1) == 'Z') { + isUTC = true; + timeSpec = timeSpec.substring(0, length - 1); + } + LocalDateTime time; + TemporalAccessor temporalAccessor = SSH_DATE_FORMAT.parseBest(timeSpec, + LocalDateTime::from, LocalDate::from); + if (temporalAccessor instanceof LocalDateTime) { + time = (LocalDateTime) temporalAccessor; + } else { + time = ((LocalDate) temporalAccessor).atStartOfDay(); + } + if (isUTC) { + return time.atOffset(ZoneOffset.UTC).toInstant(); + } + TimeZone tz = SystemReader.getInstance().getTimeZone(); + // Since there are a few TimeZone IDs that are not recognized by ZoneId, + // use offsets. + return time.atOffset(ZoneOffset.ofTotalSeconds( + (int) TimeUnit.MILLISECONDS.toSeconds(tz.getRawOffset()))) + .toInstant(); + } + + // OpenSSH uses the backslash *only* to quote the double-quote. + static Dequoted dequote(String line, int from) { + int length = line.length(); + int i = from; + if (line.charAt(i) == '"') { + boolean quoted = false; + i++; + StringBuilder b = new StringBuilder(); + while (i < length) { + char ch = line.charAt(i); + if (ch == '"') { + if (quoted) { + b.append(ch); + quoted = false; + } else { + break; + } + } else if (ch == '\\') { + quoted = true; + } else { + if (quoted) { + b.append('\\'); + } + b.append(ch); + quoted = false; + } + i++; + } + if (i >= length) { + throw new IllegalArgumentException( + SshdText.get().signAllowedSignersUnterminatedQuote); + } + return new Dequoted(b.toString(), i + 1); + } + while (i < length && !Character.isWhitespace(line.charAt(i))) { + i++; + } + return new Dequoted(line.substring(from, i), i); + } + + static record Dequoted(String value, int after) { + // Empty + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java new file mode 100644 index 0000000000..46518d8c84 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java @@ -0,0 +1,490 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.io.EOFException; +import java.io.IOException; +import java.io.InputStream; +import java.io.StreamCorruptedException; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.text.MessageFormat; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.util.buffer.BufferUtils; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.internal.transport.sshd.SshdText; +import org.eclipse.jgit.util.IO; +import org.eclipse.jgit.util.StringUtils; + +/** + * An implementation of OpenSSH binary format key revocation lists (KRLs). + * + * @see PROTOCOL.krl + */ +class OpenSshBinaryKrl { + + /** + * The "magic" bytes at the start of an OpenSSH binary KRL. + */ + static final byte[] MAGIC = { 'S', 'S', 'H', 'K', 'R', 'L', '\n', 0 }; + + private static final int FORMAT_VERSION = 1; + + private static final int SECTION_CERTIFICATES = 1; + + private static final int SECTION_KEY = 2; + + private static final int SECTION_SHA1 = 3; + + private static final int SECTION_SIGNATURE = 4; // Skipped + + private static final int SECTION_SHA256 = 5; + + private static final int SECTION_EXTENSION = 255; // Skipped + + // Certificates + + private static final int CERT_SERIAL_LIST = 0x20; + + private static final int CERT_SERIAL_RANGES = 0x21; + + private static final int CERT_SERIAL_BITS = 0x22; + + private static final int CERT_KEY_IDS = 0x23; + + private static final int CERT_EXTENSIONS = 0x39; // Skipped + + private final Map certificates = new HashMap<>(); + + private static class CertificateRevocation { + + final SerialRangeSet ranges = new SerialRangeSet(); + + final Set keyIds = new HashSet<>(); + } + + // Plain keys + + /** + * A byte array that can be used as a key in a {@link Map} or {@link Set}. + * {@link #equals(Object)} and {@link #hashCode()} are based on the content. + * + * @param blob + * the array to wrap + */ + private static record Blob(byte[] blob) { + + @Override + public final boolean equals(Object any) { + if (this == any) { + return true; + } + if (any == null || !(any instanceof Blob)) { + return false; + } + Blob other = (Blob) any; + return Arrays.equals(blob, other.blob); + } + + @Override + public final int hashCode() { + return Arrays.hashCode(blob); + } + } + + private final Set blobs = new HashSet<>(); + + private final Set sha1 = new HashSet<>(); + + private final Set sha256 = new HashSet<>(); + + private OpenSshBinaryKrl() { + // No public instantiation, use load(InputStream, boolean) instead. + } + + /** + * Tells whether the given key has been revoked. + * + * @param key + * {@link PublicKey} to check + * @return {@code true} if the key was revoked, {@code false} otherwise + */ + boolean isRevoked(PublicKey key) { + if (key instanceof OpenSshCertificate certificate) { + if (certificates.isEmpty()) { + return false; + } + // These apply to all certificates + if (isRevoked(certificate, certificates.get(null))) { + return true; + } + if (isRevoked(certificate, + certificates.get(blob(certificate.getCaPubKey())))) { + return true; + } + // Keys themselves are checked in OpenSshKrl. + return false; + } + if (!blobs.isEmpty() && blobs.contains(blob(key))) { + return true; + } + if (!sha256.isEmpty() && sha256.contains(hash("SHA256", key))) { //$NON-NLS-1$ + return true; + } + if (!sha1.isEmpty() && sha1.contains(hash("SHA1", key))) { //$NON-NLS-1$ + return true; + } + return false; + } + + private boolean isRevoked(OpenSshCertificate certificate, + CertificateRevocation revocations) { + if (revocations == null) { + return false; + } + String id = certificate.getId(); + if (!StringUtils.isEmptyOrNull(id) && revocations.keyIds.contains(id)) { + return true; + } + long serial = certificate.getSerial(); + if (serial != 0 && revocations.ranges.contains(serial)) { + return true; + } + return false; + } + + private Blob blob(PublicKey key) { + ByteArrayBuffer buf = new ByteArrayBuffer(); + buf.putRawPublicKey(key); + return new Blob(buf.getCompactData()); + } + + private Blob hash(String algorithm, PublicKey key) { + ByteArrayBuffer buf = new ByteArrayBuffer(); + buf.putRawPublicKey(key); + try { + return new Blob(MessageDigest.getInstance(algorithm) + .digest(buf.getCompactData())); + } catch (NoSuchAlgorithmException e) { + throw new JGitInternalException(e.getMessage(), e); + } + } + + /** + * Loads a binary KRL from the given stream. + * + * @param in + * {@link InputStream} to read from + * @param magicSkipped + * whether the {@link #MAGIC} bytes at the beginning have already + * been skipped + * @return a new {@link OpenSshBinaryKrl}. + * @throws IOException + * if the stream cannot be read as an OpenSSH binary KRL + */ + @NonNull + static OpenSshBinaryKrl load(InputStream in, boolean magicSkipped) + throws IOException { + if (!magicSkipped) { + byte[] magic = new byte[MAGIC.length]; + IO.readFully(in, magic); + if (!Arrays.equals(magic, MAGIC)) { + throw new StreamCorruptedException( + SshdText.get().signKrlInvalidMagic); + } + } + skipHeader(in); + return load(in); + } + + private static long getUInt(InputStream in) throws IOException { + byte[] buf = new byte[Integer.BYTES]; + IO.readFully(in, buf); + return BufferUtils.getUInt(buf); + } + + private static long getLong(InputStream in) throws IOException { + byte[] buf = new byte[Long.BYTES]; + IO.readFully(in, buf); + return BufferUtils.getLong(buf, 0, Long.BYTES); + } + + private static void skipHeader(InputStream in) throws IOException { + long version = getUInt(in); + if (version != FORMAT_VERSION) { + throw new StreamCorruptedException( + MessageFormat.format(SshdText.get().signKrlInvalidVersion, + Long.valueOf(version))); + } + // krl_version, generated_date, flags (none defined in version 1) + in.skip(24); + in.skip(getUInt(in)); // reserved + in.skip(getUInt(in)); // comment + } + + private static OpenSshBinaryKrl load(InputStream in) throws IOException { + OpenSshBinaryKrl krl = new OpenSshBinaryKrl(); + for (;;) { + int sectionType = in.read(); + if (sectionType < 0) { + break; // EOF + } + switch (sectionType) { + case SECTION_CERTIFICATES: + readCertificates(krl.certificates, in, getUInt(in)); + break; + case SECTION_KEY: + readBlobs("explicit_keys", krl.blobs, in, getUInt(in), 0); //$NON-NLS-1$ + break; + case SECTION_SHA1: + readBlobs("fingerprint_sha1", krl.sha1, in, getUInt(in), 20); //$NON-NLS-1$ + break; + case SECTION_SIGNATURE: + // Unsupported as of OpenSSH 9.4. It even refuses to load such + // KRLs. Just skip it. + in.skip(getUInt(in)); + break; + case SECTION_SHA256: + readBlobs("fingerprint_sha256", krl.sha256, in, getUInt(in), //$NON-NLS-1$ + 32); + break; + case SECTION_EXTENSION: + // No extensions are defined for version 1 KRLs. + in.skip(getUInt(in)); + break; + default: + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlUnknownSection, + Integer.valueOf(sectionType))); + } + } + return krl; + } + + private static void readBlobs(String sectionName, Set blobs, + InputStream in, long sectionLength, long expectedBlobLength) + throws IOException { + while (sectionLength >= Integer.BYTES) { + // Read blobs. + long blobLength = getUInt(in); + sectionLength -= Integer.BYTES; + if (blobLength > sectionLength) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlBlobLengthInvalid, sectionName, + Long.valueOf(blobLength))); + } + if (expectedBlobLength != 0 && blobLength != expectedBlobLength) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlBlobLengthInvalidExpected, + sectionName, Long.valueOf(blobLength), + Long.valueOf(expectedBlobLength))); + } + byte[] blob = new byte[(int) blobLength]; + IO.readFully(in, blob); + sectionLength -= blobLength; + blobs.add(new Blob(blob)); + } + if (sectionLength != 0) { + throw new StreamCorruptedException( + MessageFormat.format(SshdText.get().signKrlBlobLeftover, + sectionName, Long.valueOf(sectionLength))); + } + } + + private static void readCertificates(Map certs, + InputStream in, long sectionLength) throws IOException { + long keyLength = getUInt(in); + sectionLength -= Integer.BYTES; + if (keyLength > sectionLength) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlCaKeyLengthInvalid, + Long.valueOf(keyLength))); + } + Blob key = null; + if (keyLength > 0) { + byte[] blob = new byte[(int) keyLength]; + IO.readFully(in, blob); + key = new Blob(blob); + sectionLength -= keyLength; + } + CertificateRevocation rev = certs.computeIfAbsent(key, + k -> new CertificateRevocation()); + long reservedLength = getUInt(in); + sectionLength -= Integer.BYTES; + if (reservedLength > sectionLength) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlCaKeyLengthInvalid, + Long.valueOf(reservedLength))); + } + in.skip(reservedLength); + sectionLength -= reservedLength; + if (sectionLength == 0) { + throw new StreamCorruptedException( + SshdText.get().signKrlNoCertificateSubsection); + } + while (sectionLength > 0) { + int subSection = in.read(); + if (subSection < 0) { + throw new EOFException(); + } + sectionLength--; + if (sectionLength < Integer.BYTES) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlCertificateLeftover, + Long.valueOf(sectionLength))); + } + long subLength = getUInt(in); + sectionLength -= Integer.BYTES; + if (subLength > sectionLength) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlCertificateSubsectionLength, + Long.valueOf(subLength))); + } + if (subLength > 0) { + switch (subSection) { + case CERT_SERIAL_LIST: + readSerials(rev.ranges, in, subLength, false); + break; + case CERT_SERIAL_RANGES: + readSerials(rev.ranges, in, subLength, true); + break; + case CERT_SERIAL_BITS: + readSerialBitSet(rev.ranges, in, subLength); + break; + case CERT_KEY_IDS: + readIds(rev.keyIds, in, subLength); + break; + case CERT_EXTENSIONS: + in.skip(subLength); + break; + default: + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlUnknownSubsection, + Long.valueOf(subSection))); + } + } + sectionLength -= subLength; + } + } + + private static void readSerials(SerialRangeSet set, InputStream in, + long length, boolean ranges) throws IOException { + while (length >= Long.BYTES) { + long a = getLong(in); + length -= Long.BYTES; + if (a == 0) { + throw new StreamCorruptedException( + SshdText.get().signKrlSerialZero); + } + if (!ranges) { + set.add(a); + continue; + } + if (length < Long.BYTES) { + throw new StreamCorruptedException( + MessageFormat.format(SshdText.get().signKrlShortRange, + Long.valueOf(length))); + } + long b = getLong(in); + length -= Long.BYTES; + if (Long.compareUnsigned(a, b) > 0) { + throw new StreamCorruptedException( + SshdText.get().signKrlEmptyRange); + } + set.add(a, b); + } + if (length != 0) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlCertificateSubsectionLeftover, + Long.valueOf(length))); + } + } + + private static void readSerialBitSet(SerialRangeSet set, InputStream in, + long subLength) throws IOException { + while (subLength > 0) { + if (subLength < Long.BYTES) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlCertificateSubsectionLeftover, + Long.valueOf(subLength))); + } + long base = getLong(in); + subLength -= Long.BYTES; + if (subLength < Integer.BYTES) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlCertificateSubsectionLeftover, + Long.valueOf(subLength))); + } + long setLength = getUInt(in); + subLength -= Integer.BYTES; + if (setLength == 0 || setLength > subLength) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlInvalidBitSetLength, + Long.valueOf(setLength))); + } + // Now process the bits. Note that the mpint is stored MSB first. + // + // We set individual serial numbers (one for each set bit) and let + // the SerialRangeSet take care of coalescing for successive runs + // of set bits. + int n = (int) setLength; + for (int i = n - 1; i >= 0; i--) { + int b = in.read(); + if (b < 0) { + throw new EOFException(); + } else if (b == 0) { + // Stored as an mpint: may have leading zero bytes (actually + // at most one; if the high bit of the first byte is set). + continue; + } + for (int bit = 0, + mask = 1; bit < Byte.SIZE; bit++, mask <<= 1) { + if ((b & mask) != 0) { + set.add(base + (i * Byte.SIZE) + bit); + } + } + } + subLength -= setLength; + } + } + + private static void readIds(Set ids, InputStream in, long subLength) + throws IOException { + while (subLength >= Integer.BYTES) { + long length = getUInt(in); + subLength -= Integer.BYTES; + if (length > subLength) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlInvalidKeyIdLength, + Long.valueOf(length))); + } + byte[] bytes = new byte[(int) length]; + IO.readFully(in, bytes); + ids.add(new String(bytes, StandardCharsets.UTF_8)); + subLength -= length; + } + if (subLength != 0) { + throw new StreamCorruptedException(MessageFormat.format( + SshdText.get().signKrlCertificateSubsectionLeftover, + Long.valueOf(subLength))); + } + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshKrl.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshKrl.java new file mode 100644 index 0000000000..7993def90c --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshKrl.java @@ -0,0 +1,120 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.NoSuchFileException; +import java.nio.file.Path; +import java.security.PublicKey; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.config.keys.PublicKeyEntry; +import org.apache.sshd.common.util.io.ModifiableFileWatcher; +import org.eclipse.jgit.util.IO; + +/** + * An implementation of an OpenSSH key revocation list (KRL), either a binary + * KRL or a simple list of public keys. + */ +class OpenSshKrl extends ModifiableFileWatcher { + + private static record State(Set keys, OpenSshBinaryKrl krl) { + // Empty + } + + private State state; + + public OpenSshKrl(Path path) { + super(path); + state = new State(Set.of(), null); + } + + public boolean isRevoked(PublicKey key) throws IOException { + State current = refresh(); + return isRevoked(current, key); + } + + private boolean isRevoked(State current, PublicKey key) { + if (key instanceof OpenSshCertificate cert) { + OpenSshBinaryKrl krl = current.krl(); + if (krl != null && krl.isRevoked(cert)) { + return true; + } + if (isRevoked(current, cert.getCaPubKey()) + || isRevoked(current, cert.getCertPubKey())) { + return true; + } + return false; + } + OpenSshBinaryKrl krl = current.krl(); + if (krl != null) { + return krl.isRevoked(key); + } + return current.keys().contains(PublicKeyEntry.toString(key)); + } + + private synchronized State refresh() throws IOException { + if (checkReloadRequired()) { + updateReloadAttributes(); + try { + state = reload(getPath()); + } catch (NoSuchFileException e) { + // File disappeared + resetReloadAttributes(); + state = new State(Set.of(), null); + } + } + return state; + } + + private static State reload(Path path) throws IOException { + try (BufferedInputStream in = new BufferedInputStream( + Files.newInputStream(path))) { + byte[] magic = new byte[OpenSshBinaryKrl.MAGIC.length]; + in.mark(magic.length); + IO.readFully(in, magic); + if (Arrays.equals(magic, OpenSshBinaryKrl.MAGIC)) { + return new State(null, OpenSshBinaryKrl.load(in, true)); + } + // Otherwise try reading it textually + in.reset(); + return loadTextKrl(in); + } + } + + private static State loadTextKrl(InputStream in) throws IOException { + Set keys = new HashSet<>(); + try (BufferedReader r = new BufferedReader( + new InputStreamReader(in, StandardCharsets.UTF_8))) { + String line; + for (;;) { + line = r.readLine(); + if (line == null) { + break; + } + line = line.strip(); + if (line.isEmpty() || line.charAt(0) == '#') { + continue; + } + keys.add(AllowedSigners.parsePublicKey(line, 0)); + } + } + return new State(keys, null); + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshSigningKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshSigningKeyDatabase.java new file mode 100644 index 0000000000..aa26886839 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshSigningKeyDatabase.java @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.io.File; +import java.io.IOException; +import java.nio.file.Path; +import java.security.PublicKey; +import java.time.Instant; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.concurrent.atomic.AtomicInteger; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.lib.GpgConfig; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.signing.ssh.CachingSigningKeyDatabase; +import org.eclipse.jgit.signing.ssh.VerificationException; +import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.StringUtils; + +/** + * A {@link CachingSigningKeyDatabase} using the OpenSSH allowed signers file + * and the OpenSSH key revocation list. + */ +public class OpenSshSigningKeyDatabase implements CachingSigningKeyDatabase { + + // Keep caches of allowed signers and KRLs. Cache by canonical path. + + private static final int DEFAULT_CACHE_SIZE = 5; + + private AtomicInteger cacheSize = new AtomicInteger(DEFAULT_CACHE_SIZE); + + private class LRU extends LinkedHashMap { + + private static final long serialVersionUID = 1L; + + LRU() { + super(DEFAULT_CACHE_SIZE, 0.75f, true); + } + + @Override + protected boolean removeEldestEntry(java.util.Map.Entry eldest) { + return size() > cacheSize.get(); + } + } + + private final HashMap allowedSigners = new LRU<>(); + + private final HashMap revocations = new LRU<>(); + + @Override + public boolean isRevoked(Repository repository, GpgConfig config, + PublicKey key) throws IOException { + String fileName = config.getSshRevocationFile(); + if (StringUtils.isEmptyOrNull(fileName)) { + return false; + } + File file = getFile(repository, fileName); + OpenSshKrl revocationList; + synchronized (revocations) { + revocationList = revocations.computeIfAbsent(file.toPath(), + OpenSshKrl::new); + } + return revocationList.isRevoked(key); + } + + @Override + public String isAllowed(Repository repository, GpgConfig config, + PublicKey key, String namespace, PersonIdent ident) + throws IOException, VerificationException { + String fileName = config.getSshAllowedSignersFile(); + if (StringUtils.isEmptyOrNull(fileName)) { + // No file configured. Git would error out. + return null; + } + File file = getFile(repository, fileName); + AllowedSigners allowed; + synchronized (allowedSigners) { + allowed = allowedSigners.computeIfAbsent(file.toPath(), + AllowedSigners::new); + } + Instant gitTime = null; + if (ident != null) { + gitTime = ident.getWhenAsInstant(); + } + return allowed.isAllowed(key, namespace, null, gitTime); + } + + private File getFile(@NonNull Repository repository, String fileName) + throws IOException { + File file; + if (fileName.startsWith("~/") //$NON-NLS-1$ + || fileName.startsWith('~' + File.separator)) { + file = FS.DETECTED.resolve(FS.DETECTED.userHome(), + fileName.substring(2)); + } else { + file = new File(fileName); + if (!file.isAbsolute()) { + file = new File(repository.getWorkTree(), fileName); + } + } + return file.getCanonicalFile(); + } + + @Override + public int getCacheSize() { + return cacheSize.get(); + } + + @Override + public void setCacheSize(int size) { + if (size > 0) { + cacheSize.set(size); + pruneCache(size); + } + } + + private void pruneCache(int size) { + prune(allowedSigners, size); + prune(revocations, size); + } + + private void prune(HashMap map, int size) { + synchronized (map) { + if (map.size() <= size) { + return; + } + Iterator iter = map.entrySet().iterator(); + int i = 0; + while (iter.hasNext() && i < size) { + iter.next(); + i++; + } + while (iter.hasNext()) { + iter.next(); + iter.remove(); + } + } + } + + @Override + public void clearCache() { + synchronized (allowedSigners) { + allowedSigners.clear(); + } + synchronized (revocations) { + revocations.clear(); + } + } + +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SerialRangeSet.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SerialRangeSet.java new file mode 100644 index 0000000000..6a0cec8821 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SerialRangeSet.java @@ -0,0 +1,138 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.util.SortedMap; +import java.util.TreeMap; + +import org.eclipse.jgit.internal.transport.sshd.SshdText; + +/** + * Encapsulates the storage for revoked certificate serial numbers. + */ +class SerialRangeSet { + + /** + * A range of certificate serial numbers [from..to], i.e., with both range + * limits included. + */ + private interface SerialRange { + + long from(); + + long to(); + } + + private static record Singleton(long from) implements SerialRange { + + @Override + public long to() { + return from; + } + } + + private static record Range(long from, long to) implements SerialRange { + + public Range(long from, long to) { + if (Long.compareUnsigned(from, to) > 0) { + throw new IllegalArgumentException( + SshdText.get().signKrlEmptyRange); + } + this.from = from; + this.to = to; + } + } + + // We use the same data structure as OpenSSH,; basically a + // TreeSet of mutable elements. To get "mutability", the set is + // implemented as a TreeMap with the same elements as keys and values. + // + // get(x) will return null if none of the serial numbers in the range x is + // in the set, and some range (partially) overlapping with x otherwise. + // + // containsKey will return true if there is any (partially) overlapping + // range in the TreeMap. + private final TreeMap ranges = new TreeMap<>( + SerialRangeSet::compare); + + private static int compare(SerialRange a, SerialRange b) { + // Return == if they overlap + if (Long.compareUnsigned(a.to(), b.from()) >= 0 + && Long.compareUnsigned(a.from(), b.to()) <= 0) { + return 0; + } + return Long.compareUnsigned(a.from(), b.from()); + } + + void add(long serial) { + add(ranges, new Singleton(serial)); + } + + void add(long from, long to) { + add(ranges, new Range(from, to)); + } + + boolean contains(long serial) { + return ranges.containsKey(new Singleton(serial)); + } + + int size() { + return ranges.size(); + } + + boolean isEmpty() { + return ranges.isEmpty(); + } + + private static void add(TreeMap ranges, + SerialRange newRange) { + for (;;) { + SerialRange existing = ranges.get(newRange); + if (existing == null) { + break; + } + if (Long.compareUnsigned(existing.from(), newRange.from()) <= 0 + && Long.compareUnsigned(existing.to(), + newRange.to()) >= 0) { + // newRange completely contained in existing + return; + } + ranges.remove(existing); + long newFrom = newRange.from(); + if (Long.compareUnsigned(existing.from(), newFrom) < 0) { + newFrom = existing.from(); + } + long newTo = newRange.to(); + if (Long.compareUnsigned(existing.to(), newTo) > 0) { + newTo = existing.to(); + } + newRange = new Range(newFrom, newTo); + } + // No overlapping range exists: check for coalescing with the + // previous/next range + SortedMap head = ranges.headMap(newRange); + if (!head.isEmpty()) { + SerialRange prev = head.lastKey(); + if (newRange.from() - prev.to() == 1) { + ranges.remove(prev); + newRange = new Range(prev.from(), newRange.to()); + } + } + SortedMap tail = ranges.tailMap(newRange); + if (!tail.isEmpty()) { + SerialRange next = tail.firstKey(); + if (next.from() - newRange.to() == 1) { + ranges.remove(next); + newRange = new Range(newRange.from(), next.to()); + } + } + ranges.put(newRange, newRange); + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SigningDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SigningDatabase.java new file mode 100644 index 0000000000..e2e1a36840 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SigningDatabase.java @@ -0,0 +1,59 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import org.eclipse.jgit.signing.ssh.CachingSigningKeyDatabase; +import org.eclipse.jgit.signing.ssh.SigningKeyDatabase; + +/** + * A global {@link SigningKeyDatabase} instance. + */ +public final class SigningDatabase { + + private static SigningKeyDatabase INSTANCE = new OpenSshSigningKeyDatabase(); + + private SigningDatabase() { + // No instantiation + } + + /** + * Obtains the current instance. + * + * @return the global {@link SigningKeyDatabase} + */ + public static synchronized SigningKeyDatabase getInstance() { + return INSTANCE; + } + + /** + * Sets the global {@link SigningKeyDatabase}. + * + * @param database + * to set; if {@code null} a default database using the OpenSSH + * allowed signers file and the OpenSSH revocation list mechanism + * is used. + * @return the previously set {@link SigningKeyDatabase} + */ + public static synchronized SigningKeyDatabase setInstance( + SigningKeyDatabase database) { + SigningKeyDatabase previous = INSTANCE; + if (database != INSTANCE) { + if (INSTANCE instanceof CachingSigningKeyDatabase caching) { + caching.clearCache(); + } + if (database == null) { + INSTANCE = new OpenSshSigningKeyDatabase(); + } else { + INSTANCE = database; + } + } + return previous; + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSignatureVerifier.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSignatureVerifier.java new file mode 100644 index 0000000000..76be340bc7 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SshSignatureVerifier.java @@ -0,0 +1,319 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.signing.ssh; + +import java.io.IOException; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.security.PublicKey; +import java.text.MessageFormat; +import java.time.Instant; +import java.util.Date; +import java.util.Locale; + +import org.apache.sshd.common.config.keys.KeyUtils; +import org.apache.sshd.common.config.keys.OpenSshCertificate; +import org.apache.sshd.common.keyprovider.KeyPairProvider; +import org.apache.sshd.common.signature.BuiltinSignatures; +import org.apache.sshd.common.signature.Signature; +import org.apache.sshd.common.util.buffer.Buffer; +import org.apache.sshd.common.util.buffer.ByteArrayBuffer; +import org.eclipse.jgit.internal.transport.sshd.SshdText; +import org.eclipse.jgit.lib.GpgConfig; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.SignatureVerifier; +import org.eclipse.jgit.signing.ssh.CachingSigningKeyDatabase; +import org.eclipse.jgit.signing.ssh.SigningKeyDatabase; +import org.eclipse.jgit.signing.ssh.VerificationException; +import org.eclipse.jgit.util.Base64; +import org.eclipse.jgit.util.RawParseUtils; +import org.eclipse.jgit.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A {@link SignatureVerifier} for SSH signatures. + */ +public class SshSignatureVerifier implements SignatureVerifier { + + private static final Logger LOG = LoggerFactory + .getLogger(SshSignatureVerifier.class); + + private static final byte[] OBJECT = { 'o', 'b', 'j', 'e', 'c', 't', ' ' }; + + private static final byte[] TREE = { 't', 'r', 'e', 'e', ' ' }; + + private static final byte[] TYPE = { 't', 'y', 'p', 'e', ' ' }; + + @Override + public String getName() { + return "ssh"; //$NON-NLS-1$ + } + + @Override + public SignatureVerification verify(Repository repository, GpgConfig config, + byte[] data, byte[] signatureData) throws IOException { + // This is a bit stupid. SSH signatures do not store a signer, nor a + // time the signature was created. So we must use the committer's or + // tagger's PersonIdent, but here we have neither. But... if we see + // that the data is a commit or tag, then we can parse the PersonIdent + // from the data. + // + // Note: we cannot assume that absent a principal recorded in the + // allowedSignersFile or on a certificate that the key used to sign the + // commit belonged to the committer. + PersonIdent gitIdentity = getGitIdentity(data); + Date signatureDate = null; + Instant signatureInstant = null; + if (gitIdentity != null) { + signatureDate = gitIdentity.getWhen(); + signatureInstant = gitIdentity.getWhenAsInstant(); + } + + TrustLevel trust = TrustLevel.NEVER; + byte[] decodedSignature; + try { + decodedSignature = dearmor(signatureData); + } catch (IllegalArgumentException e) { + return new SignatureVerification(getName(), signatureDate, null, + null, null, false, false, trust, + MessageFormat.format(SshdText.get().signInvalidSignature, + e.getLocalizedMessage())); + } + int start = RawParseUtils.match(decodedSignature, 0, + SshSignatureConstants.MAGIC); + if (start < 0) { + return new SignatureVerification(getName(), signatureDate, null, + null, null, false, false, trust, + SshdText.get().signInvalidMagic); + } + ByteArrayBuffer signature = new ByteArrayBuffer(decodedSignature, start, + decodedSignature.length - start); + + long version = signature.getUInt(); + if (version != SshSignatureConstants.VERSION) { + return new SignatureVerification(getName(), signatureDate, null, + null, null, false, false, trust, + MessageFormat.format(SshdText.get().signInvalidVersion, + Long.toString(version))); + } + + PublicKey key = signature.getPublicKey(); + String fingerprint; + if (key instanceof OpenSshCertificate cert) { + fingerprint = KeyUtils.getFingerPrint(cert.getCertPubKey()); + String message = SshCertificateUtils.verify(cert, signatureInstant); + if (message != null) { + return new SignatureVerification(getName(), signatureDate, null, + fingerprint, null, false, false, trust, message); + } + } else { + fingerprint = KeyUtils.getFingerPrint(key); + } + + String namespace = signature.getString(); + if (!SshSignatureConstants.NAMESPACE.equals(namespace)) { + return new SignatureVerification(getName(), signatureDate, null, + fingerprint, null, false, false, trust, + MessageFormat.format(SshdText.get().signInvalidNamespace, + namespace)); + } + + signature.getString(); // Skip the reserved field + String hashAlgorithm = signature.getString(); + byte[] hash; + try { + hash = MessageDigest + .getInstance(hashAlgorithm.toUpperCase(Locale.ROOT)) + .digest(data); + } catch (NoSuchAlgorithmException e) { + return new SignatureVerification(getName(), signatureDate, null, + fingerprint, null, false, false, trust, + MessageFormat.format( + SshdText.get().signUnknownHashAlgorithm, + hashAlgorithm)); + } + ByteArrayBuffer rawSignature = new ByteArrayBuffer( + signature.getBytes()); + if (signature.available() > 0) { + return new SignatureVerification(getName(), signatureDate, null, + fingerprint, null, false, false, trust, + SshdText.get().signGarbageAtEnd); + } + + String signatureAlgorithm = rawSignature.getString(); + switch (signatureAlgorithm) { + case KeyPairProvider.SSH_DSS: + case KeyPairProvider.SSH_DSS_CERT: + case KeyPairProvider.SSH_RSA: + case KeyPairProvider.SSH_RSA_CERT: + return new SignatureVerification(getName(), signatureDate, null, + fingerprint, null, false, false, trust, + MessageFormat.format(SshdText.get().signInvalidAlgorithm, + signatureAlgorithm)); + } + + String keyType = KeyUtils + .getSignatureAlgorithm(KeyUtils.getKeyType(key), key); + if (!KeyUtils.getCanonicalKeyType(keyType) + .equals(KeyUtils.getCanonicalKeyType(signatureAlgorithm))) { + return new SignatureVerification(getName(), signatureDate, null, + fingerprint, null, false, false, trust, + MessageFormat.format( + SshdText.get().signMismatchedSignatureAlgorithm, + keyType, signatureAlgorithm)); + } + + BuiltinSignatures factory = BuiltinSignatures + .fromFactoryName(signatureAlgorithm); + if (factory == null || !factory.isSupported()) { + return new SignatureVerification(getName(), signatureDate, null, + fingerprint, null, false, false, trust, + MessageFormat.format( + SshdText.get().signUnknownSignatureAlgorithm, + signatureAlgorithm)); + } + + boolean valid; + String message = null; + try { + Signature verifier = factory.create(); + verifier.initVerifier(null, + key instanceof OpenSshCertificate cert + ? cert.getCertPubKey() + : key); + // Feed it the data + Buffer toSign = new ByteArrayBuffer(); + toSign.putRawBytes(SshSignatureConstants.MAGIC); + toSign.putString(SshSignatureConstants.NAMESPACE); + toSign.putUInt(0); // reserved: zero-length string + toSign.putString(hashAlgorithm); + toSign.putBytes(hash); + verifier.update(null, toSign.getCompactData()); + valid = verifier.verify(null, rawSignature.getBytes()); + } catch (Exception e) { + LOG.warn("{}", SshdText.get().signLogFailure, e); //$NON-NLS-1$ + valid = false; + message = SshdText.get().signSeeLog; + } + boolean expired = false; + String principal = null; + if (valid) { + if (rawSignature.available() > 0) { + valid = false; + message = SshdText.get().signGarbageAtEnd; + } else { + SigningKeyDatabase database = SigningKeyDatabase.getInstance(); + if (database.isRevoked(repository, config, key)) { + valid = false; + if (key instanceof OpenSshCertificate certificate) { + message = MessageFormat.format( + SshdText.get().signCertificateRevoked, + KeyUtils.getFingerPrint( + certificate.getCaPubKey())); + } else { + message = SshdText.get().signKeyRevoked; + } + } else { + // This may turn a positive verification into a failed one. + try { + principal = database.isAllowed(repository, config, key, + SshSignatureConstants.NAMESPACE, gitIdentity); + if (!StringUtils.isEmptyOrNull(principal)) { + trust = TrustLevel.FULL; + } else { + valid = false; + message = SshdText.get().signNoPrincipalMatched; + trust = TrustLevel.UNKNOWN; + } + } catch (VerificationException e) { + valid = false; + message = e.getMessage(); + expired = e.isExpired(); + } catch (IOException e) { + LOG.warn("{}", SshdText.get().signLogFailure, e); //$NON-NLS-1$ + valid = false; + message = SshdText.get().signSeeLog; + } + } + } + } + return new SignatureVerification(getName(), signatureDate, null, + fingerprint, principal, valid, expired, trust, message); + } + + private static PersonIdent getGitIdentity(byte[] rawObject) { + // Data from a commit will start with "tree ID\n". + int i = RawParseUtils.match(rawObject, 0, TREE); + if (i > 0) { + i = RawParseUtils.committer(rawObject, 0); + if (i < 0) { + return null; + } + return RawParseUtils.parsePersonIdent(rawObject, i); + } + // Data from a tag will start with "object ID\ntype ". + i = RawParseUtils.match(rawObject, 0, OBJECT); + if (i > 0) { + i = RawParseUtils.nextLF(rawObject, i); + i = RawParseUtils.match(rawObject, i, TYPE); + if (i > 0) { + i = RawParseUtils.tagger(rawObject, 0); + if (i < 0) { + return null; + } + return RawParseUtils.parsePersonIdent(rawObject, i); + } + } + return null; + } + + private static byte[] dearmor(byte[] data) { + int start = RawParseUtils.match(data, 0, + SshSignatureConstants.ARMOR_HEAD); + if (start > 0) { + if (data[start] == '\r') { + start++; + } + if (data[start] == '\n') { + start++; + } + } + int end = data.length; + if (end > start + 1 && data[end - 1] == '\n') { + end--; + if (end > start + 1 && data[end - 1] == '\r') { + end--; + } + } + end = end - SshSignatureConstants.ARMOR_END.length; + if (end >= 0 && end >= start + && RawParseUtils.match(data, end, + SshSignatureConstants.ARMOR_END) >= 0) { + // end is fine: on the first the character of the end marker + } else { + // No end marker. + end = data.length; + } + if (start < 0) { + start = 0; + } + return Base64.decode(data, start, end - start); + } + + @Override + public void clear() { + SigningKeyDatabase database = SigningKeyDatabase.getInstance(); + if (database instanceof CachingSigningKeyDatabase caching) { + caching.clearCache(); + } + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java index 6f7a4e9ef4..0533b651e0 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2022 Thomas Wolf and others + * Copyright (C) 2018, 2024 Thomas Wolf and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -147,17 +147,59 @@ public final class SshdText extends TranslationBundle { /***/ public String sshCommandTimeout; /***/ public String sshProcessStillRunning; /***/ public String sshProxySessionCloseFailed; + /***/ public String signAllowedSignersCertAuthorityError; + /***/ public String signAllowedSignersEmptyIdentity; + /***/ public String signAllowedSignersEmptyNamespaces; + /***/ public String signAllowedSignersFormatError; + /***/ public String signAllowedSignersInvalidDate; + /***/ public String signAllowedSignersLineFormat; + /***/ public String signAllowedSignersMultiple; + /***/ public String signAllowedSignersNoIdentities; + /***/ public String signAllowedSignersPublicKeyParsing; + /***/ public String signAllowedSignersUnterminatedQuote; /***/ public String signCertAlgorithmMismatch; /***/ public String signCertAlgorithmUnknown; /***/ public String signCertificateExpired; /***/ public String signCertificateInvalid; + /***/ public String signCertificateNotForName; + /***/ public String signCertificateRevoked; /***/ public String signCertificateTooEarly; + /***/ public String signCertificateWithoutPrincipals; /***/ public String signDefaultKeyEmpty; /***/ public String signDefaultKeyFailed; /***/ public String signDefaultKeyInterrupted; + /***/ public String signGarbageAtEnd; + /***/ public String signInvalidAlgorithm; /***/ public String signInvalidKeyDSA; + /***/ public String signInvalidMagic; + /***/ public String signInvalidNamespace; + /***/ public String signInvalidSignature; + /***/ public String signInvalidVersion; + /***/ public String signKeyExpired; + /***/ public String signKeyRevoked; + /***/ public String signKeyTooEarly; + /***/ public String signKrlBlobLeftover; + /***/ public String signKrlBlobLengthInvalid; + /***/ public String signKrlBlobLengthInvalidExpected; + /***/ public String signKrlCaKeyLengthInvalid; + /***/ public String signKrlCertificateLeftover; + /***/ public String signKrlCertificateSubsectionLeftover; + /***/ public String signKrlCertificateSubsectionLength; + /***/ public String signKrlEmptyRange; + /***/ public String signKrlInvalidBitSetLength; + /***/ public String signKrlInvalidKeyIdLength; + /***/ public String signKrlInvalidMagic; + /***/ public String signKrlInvalidReservedLength; + /***/ public String signKrlInvalidVersion; + /***/ public String signKrlNoCertificateSubsection; + /***/ public String signKrlSerialZero; + /***/ public String signKrlShortRange; + /***/ public String signKrlUnknownSection; + /***/ public String signKrlUnknownSubsection; /***/ public String signLogFailure; + /***/ public String signMismatchedSignatureAlgorithm; /***/ public String signNoAgent; + /***/ public String signNoPrincipalMatched; /***/ public String signNoPublicKey; /***/ public String signNoSigningKey; /***/ public String signNotUserCertificate; @@ -169,6 +211,7 @@ public final class SshdText extends TranslationBundle { /***/ public String signTooManyPublicKeys; /***/ public String signUnknownHashAlgorithm; /***/ public String signUnknownSignatureAlgorithm; + /***/ public String signWrongNamespace; /***/ public String unknownProxyProtocol; } diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/CachingSigningKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/CachingSigningKeyDatabase.java new file mode 100644 index 0000000000..4d2d8b6797 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/CachingSigningKeyDatabase.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.signing.ssh; + +/** + * A {@link SigningKeyDatabase} that caches data. + *

+ * A signing key database may be used to check keys frequently; it may thus need + * to cache some data and it may need to cache data per repository. If an + * implementation does cache data, it is responsible itself for refreshing that + * cache at appropriate times. Clients can control the cache size somewhat via + * {@link #setCacheSize(int)}, although the meaning of the cache size (i.e., its + * unit) is left undefined here. + *

+ * + * @since 7.1 + */ +public interface CachingSigningKeyDatabase extends SigningKeyDatabase { + + /** + * Retrieves the current cache size. + * + * @return the cache size, or -1 if this database has no cache. + */ + int getCacheSize(); + + /** + * Sets the cache size to use. + * + * @param size + * the cache size, ignored if this database does not have a + * cache. + * @throws IllegalArgumentException + * if {@code size < 0} + */ + void setCacheSize(int size); + + /** + * Discards any cached data. A no-op if the database has no cache. + */ + void clearCache(); +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SigningKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SigningKeyDatabase.java new file mode 100644 index 0000000000..eec64c3abd --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SigningKeyDatabase.java @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.signing.ssh; + +import java.io.IOException; +import java.security.PublicKey; + +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.internal.signing.ssh.SigningDatabase; +import org.eclipse.jgit.lib.GpgConfig; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Repository; + +/** + * A database storing meta-information about signing keys and certificates. + * + * @since 7.1 + */ +public interface SigningKeyDatabase { + + /** + * Obtains the current global instance. + * + * @return the global {@link SigningKeyDatabase} + */ + static SigningKeyDatabase getInstance() { + return SigningDatabase.getInstance(); + } + + /** + * Sets the global {@link SigningKeyDatabase}. + * + * @param database + * to set; if {@code null} a default database using the OpenSSH + * allowed signers file and the OpenSSH revocation list mechanism + * is used. + * @return the previously set {@link SigningKeyDatabase} + */ + static SigningKeyDatabase setInstance(SigningKeyDatabase database) { + return SigningDatabase.setInstance(database); + } + + /** + * Determines whether the gives key has been revoked. + * + * @param repository + * {@link Repository} the key is being used in + * @param config + * {@link GpgConfig} to use + * @param key + * {@link PublicKey} to check + * @return {@code true} if the key has been revoked, {@code false} otherwise + * @throws IOException + * if an I/O problem occurred + */ + boolean isRevoked(@NonNull Repository repository, @NonNull GpgConfig config, + @NonNull PublicKey key) throws IOException; + + /** + * Checks whether the given key is allowed to be used for signing, and if + * allowed returns the principal. + * + * @param repository + * {@link Repository} the key is being used in + * @param config + * {@link GpgConfig} to use + * @param key + * {@link PublicKey} to check + * @param namespace + * of the signature + * @param ident + * optional {@link PersonIdent} giving a signer's e-mail address + * and a signature time + * @return {@code null} if the database does not contain any information + * about the given key; the principal if it does and all checks + * passed + * @throws IOException + * if an I/O problem occurred + * @throws VerificationException + * if the database contains information about the key and the + * checks determined that the key is not allowed to be used for + * signing + */ + String isAllowed(@NonNull Repository repository, @NonNull GpgConfig config, + @NonNull PublicKey key, @NonNull String namespace, + PersonIdent ident) throws IOException, VerificationException; +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SshSignatureVerifierFactory.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SshSignatureVerifierFactory.java new file mode 100644 index 0000000000..c315428c33 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/SshSignatureVerifierFactory.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.signing.ssh; + +import org.eclipse.jgit.lib.GpgConfig.GpgFormat; +import org.eclipse.jgit.lib.SignatureVerifier; +import org.eclipse.jgit.internal.signing.ssh.SshSignatureVerifier; +import org.eclipse.jgit.lib.SignatureVerifierFactory; + +/** + * Factory creating {@link SshSignatureVerifier}s. + * + * @since 7.1 + */ +public final class SshSignatureVerifierFactory + implements SignatureVerifierFactory { + + @Override + public GpgFormat getType() { + return GpgFormat.SSH; + } + + @Override + public SignatureVerifier create() { + return new SshSignatureVerifier(); + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/VerificationException.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/VerificationException.java new file mode 100644 index 0000000000..cd77111813 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/signing/ssh/VerificationException.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2024, Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.signing.ssh; + +/** + * An exception giving details about a failed + * {@link SigningKeyDatabase#isAllowed(org.eclipse.jgit.lib.Repository, org.eclipse.jgit.lib.GpgConfig, java.security.PublicKey, String, org.eclipse.jgit.lib.PersonIdent)} + * validation. + * + * @since 7.1 + */ +public class VerificationException extends Exception { + + private static final long serialVersionUID = 313760495170326160L; + + private final boolean expired; + + private final String reason; + + /** + * Creates a new instance. + * + * @param expired + * whether the checked public key or certificate was expired + * @param reason + * describing the check failure + */ + public VerificationException(boolean expired, String reason) { + this.expired = expired; + this.reason = reason; + } + + @Override + public String getMessage() { + return reason; + } + + /** + * Tells whether the check failed because the public key was expired. + * + * @return {@code true} if the check failed because the public key was + * expired, {@code false} otherwise + */ + public boolean isExpired() { + return expired; + } + + /** + * Retrieves the check failure reason. + * + * @return the reason description + */ + public String getReason() { + return reason; + } +} -- cgit v1.2.3 From 3bbe2c6bf37735b5391276a831cabed6a83e30de Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 23 Oct 2024 23:28:50 +0200 Subject: JGit v7.1.0.202410232130-m2 Signed-off-by: Matthias Sohn Change-Id: Ibae7987afb2459fa77c6b151606fbf69fc8a8f49 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index cc2cecb6ae..b9df68e90e 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1921cf1f9d..fbba93ae20 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index da001763da..4e45673061 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 4bac377fbf..95fe3d6552 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 805d2fb94b..2fe81b6197 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 0c07d5f5a1..44e03b5bf0 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index cb710c0daf..7af7cd08af 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 3c01f2ad75..51889cf3c1 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e0fb94085d..3ceb93c133 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index dde8c148d9..9507d7e167 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.test - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index c71f9b6541..4fed84d219 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index c4442b9fbf..24f4eb3949 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 6e3321ebf6..98bc6bb476 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 82690f8520..ac5db35bd9 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 1a541c5b02..e992837666 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d678a1e444..b22c8c86bd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index cd70e113cd..cd6b49107a 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7b0f5d365d..c63da6c639 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 23eb132afd..d60ddb09b0 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 02fd70b8d7..86d48e3977 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f69febd1f3..5678cd8300 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 58245d3404..bb00d17774 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9e7ea160ba..9d0b0d331a 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 1e8eec0ac0..54b3bf3231 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index ef53b03cba..96423129fa 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fdc9f9694..7bc77eddbc 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 9bbabc6007..bffe6919ec 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 9ce8de90b9..2af50c04fe 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2e74ff506b..35aca96112 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 744309749d..025b847c82 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 1e41d0819f..f060ff582f 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index af83647318..9c35137e51 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 5b6870d597..caef818854 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 968078a644..94308eaae0 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 56178d05fd..824201311a 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 796db2ca59..adddeb21f5 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 297ee3d28d..abfd771c51 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 506141dd58..c808e39fcb 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 42547756dc..50b0fdd5a2 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f24ea1bc60..25df4e1f04 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 066068378b..3eb49b55aa 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 134556d081..1f2567f204 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index e971a9a608..99b51020af 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 1d16f52428..056d110831 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index aabda306e9..745ce425ca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 686e561621..a724624254 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 7a797e7762..fbfce049c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 7ab15719d1..98451747ab 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index fc73ea87c1..c56ab34d93 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 458b99e35e..17f812a4a6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2aa2979b65..6703c7276e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index a3cdc4af05..eb7a09d303 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 509f68834e..93c5e2b874 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 09d8053267..d004c08e0d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 711e5b9421..ff666bd2c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index e774a47fcb..7ce9793dc2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 7fafa3bbde..e10b3e348e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index d550bbbe05..57af6c7757 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index ce1d446d7f..f7c05ecec3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 88a8fd5635..a6a9ada304 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 195e286499..37329e6718 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index aba1324d05..809a077688 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 7054afcb27..8b075e8af2 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 1b67e0ae5b..3b56704525 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 26717ff61c..455099fe6f 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 69f703fe12..b4650c7f91 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 32736cfab8..07a8ee656d 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 107d3dc814..bfc0b6690e 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 6d42144623..c989839d01 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 6c99ff97e1..db6dd67a0f 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index c8300aa8c0..d508670e8c 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 8e123867e4..a2963f9ac7 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 826d33009b..de56d5f2a8 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index d39f45f342..dc53942a4f 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index da42323474..aba60499f0 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index aa32e25a4e..906316d116 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e141c7e7f3..f8a6764de2 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 4e004ea95e..ad831c106b 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 675754cda6..e25ab4e410 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 51252ee7b7..3b069e3e5f 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index a992c24509..58e1d7218d 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index f925a282d6..443c91b3ec 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 1c15155d37..f42868955c 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 0819f8024f..96505ba9ce 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d5fe05d98e..eaf085eff6 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 07188a0f16..7fac8f142d 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202410232130-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index f78f3638bd..b180cea4f6 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202410232130-m2 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202410232130-m2";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e012cbc049..2934c01f27 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index c83ee3eaaf..9377ef5476 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0-SNAPSHOT + 7.1.0.202410232130-m2 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 8f4be20442499282b2c7ed061d039d4b5c01c1e6 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 24 Oct 2024 12:48:40 +0200 Subject: Prepare 7.1.0-SNAPSHOT builds Change-Id: Ibaddbad3677636452cad4e8b7ce0a58b1a78f833 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index b9df68e90e..cc2cecb6ae 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index fbba93ae20..1921cf1f9d 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 4e45673061..da001763da 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 95fe3d6552..4bac377fbf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 2fe81b6197..805d2fb94b 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 44e03b5bf0..0c07d5f5a1 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 7af7cd08af..cb710c0daf 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 51889cf3c1..3c01f2ad75 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 3ceb93c133..e0fb94085d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 9507d7e167..dde8c148d9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 4fed84d219..c71f9b6541 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 24f4eb3949..c4442b9fbf 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 98bc6bb476..6e3321ebf6 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index ac5db35bd9..82690f8520 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index e992837666..1a541c5b02 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index b22c8c86bd..d678a1e444 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index cd6b49107a..cd70e113cd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index c63da6c639..7b0f5d365d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index d60ddb09b0..23eb132afd 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 86d48e3977..02fd70b8d7 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 5678cd8300..f69febd1f3 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index bb00d17774..58245d3404 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9d0b0d331a..9e7ea160ba 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 54b3bf3231..1e8eec0ac0 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 96423129fa..ef53b03cba 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 7bc77eddbc..4fdc9f9694 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index bffe6919ec..9bbabc6007 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 2af50c04fe..9ce8de90b9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 35aca96112..2e74ff506b 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 025b847c82..744309749d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index f060ff582f..1e41d0819f 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9c35137e51..af83647318 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index caef818854..5b6870d597 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 94308eaae0..968078a644 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 824201311a..56178d05fd 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index adddeb21f5..796db2ca59 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index abfd771c51..297ee3d28d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index c808e39fcb..506141dd58 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 50b0fdd5a2..42547756dc 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 25df4e1f04..f24ea1bc60 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 3eb49b55aa..066068378b 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 1f2567f204..134556d081 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 99b51020af..e971a9a608 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 056d110831..1d16f52428 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 745ce425ca..aabda306e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index a724624254..686e561621 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index fbfce049c1..7a797e7762 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 98451747ab..7ab15719d1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index c56ab34d93..fc73ea87c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 17f812a4a6..458b99e35e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 6703c7276e..2aa2979b65 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index eb7a09d303..a3cdc4af05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 93c5e2b874..509f68834e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index d004c08e0d..09d8053267 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index ff666bd2c9..711e5b9421 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 7ce9793dc2..e774a47fcb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index e10b3e348e..7fafa3bbde 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 57af6c7757..d550bbbe05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index f7c05ecec3..ce1d446d7f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index a6a9ada304..88a8fd5635 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 37329e6718..195e286499 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 809a077688..aba1324d05 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 8b075e8af2..7054afcb27 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 3b56704525..1b67e0ae5b 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 455099fe6f..26717ff61c 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index b4650c7f91..69f703fe12 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 07a8ee656d..32736cfab8 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index bfc0b6690e..107d3dc814 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index c989839d01..6d42144623 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index db6dd67a0f..6c99ff97e1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index d508670e8c..c8300aa8c0 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index a2963f9ac7..8e123867e4 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index de56d5f2a8..826d33009b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index dc53942a4f..d39f45f342 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index aba60499f0..da42323474 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 906316d116..aa32e25a4e 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index f8a6764de2..e141c7e7f3 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index ad831c106b..4e004ea95e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index e25ab4e410..675754cda6 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 3b069e3e5f..51252ee7b7 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 58e1d7218d..a992c24509 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 443c91b3ec..f925a282d6 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index f42868955c..1c15155d37 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 96505ba9ce..0819f8024f 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index eaf085eff6..d5fe05d98e 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 7fac8f142d..07188a0f16 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.202410232130-m2 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index b180cea4f6..f78f3638bd 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202410232130-m2 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202410232130-m2";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 2934c01f27..e012cbc049 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 9377ef5476..c83ee3eaaf 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0.202410232130-m2 + 7.1.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 462b15633054ea46ccb9d3d1b69b9b81b924dcb1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 24 Oct 2024 13:00:42 +0200 Subject: Update bytebuddy to 1.15.7 Change-Id: I8f718f0b06887c8ebfe70941dc2730604f0790e0 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 46993dd476..0f5472653a 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "0d26263eb7524252d98e602fc6942996a3195e29", ) -BYTE_BUDDY_VERSION = "1.15.3" +BYTE_BUDDY_VERSION = "1.15.7" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "01b3069696cd9ed55d90b9114ffe3429035ff924", + sha1 = "658064662e33b045bb9499b1c8afeae656974b18", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "e619d89ed41a6cedc23bee3549cec8c4ffdaee7b", + sha1 = "0f0a8a3b1440714d548ec54093eb34e3f2726013", ) maven_jar( 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 d2006b8d60..8b51595fa3 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 882f4e1313..39542d7ec0 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 60e0f8f76f..ab43b5e721 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 b0601e8909..f7f577703e 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 bd3625d4f5..7096f30533 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 5006956a61..46202ab61e 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 68124f196b..0c3729d8d4 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 9d26a8930c..f0db662c05 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 6ad784208f..63a44d93c2 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 8bff6b28c2..1b9e704c71 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index ef4a71aa3e..e67dae5c8c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 14e81823c9..2abfcced4f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 7e121c4d2a..376f75757c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 2ccc22db58..12e3c441f6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index dfedead946..dfd8a26c5f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 96ed4f1b80..c353b2ef7f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 8b4a174f12..8f6e7f12a4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 2ec0ba4fa6..2d37e415c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.3 + 1.15.7 jar net.bytebuddy byte-buddy-agent - 1.15.3 + 1.15.7 jar 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 e2889b87c6..47443e2f86 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.15.3" + version = "1.15.7" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.15.3" + version = "1.15.7" } } diff --git a/pom.xml b/pom.xml index c83ee3eaaf..bcc8973190 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.26.3 5.15.0 - 1.15.3 + 1.15.7 jacoco -- cgit v1.2.3 From 8188c4a773490bbde9b997045cdbcbbf0d480e9b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 24 Oct 2024 13:02:21 +0200 Subject: Update mockito to 5.14.2 Change-Id: I0e6442a86ba1790680b832d62d4b04df0713da5f --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 21 files changed, 40 insertions(+), 40 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 0f5472653a..d1ed57487d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -210,8 +210,8 @@ maven_jar( maven_jar( name = "mockito", - artifact = "org.mockito:mockito-core:5.14.1", - sha1 = "a89b0ce9ee5d92646522caeb27fb92c02a0b4c55", + artifact = "org.mockito:mockito-core:5.14.2", + sha1 = "f7bf936008d7664e2002c3faf0c02071c8d10e7c", ) maven_jar( 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 8b51595fa3..872ff86d22 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 39542d7ec0..d58275a415 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 ab43b5e721..be15fdd693 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 f7f577703e..7de5d871d8 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 7096f30533..6a5e8160b3 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 46202ab61e..4e860ff28a 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 0c3729d8d4..7af598f034 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 f0db662c05..2ca0d56c60 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 63a44d93c2..262ae68cee 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 1b9e704c71..e33f0b0c1a 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 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index e67dae5c8c..65fa024ada 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 2abfcced4f..e189127718 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 376f75757c..49442a97f4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 12e3c441f6..18c4707c82 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index dfd8a26c5f..0c23c0c176 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index c353b2ef7f..e6ee190905 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 8f6e7f12a4..4cc1959d01 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 2d37e415c1..0dfe190bc7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 jar 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 47443e2f86..5e29950bc0 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 @@ -225,7 +225,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.14.1" + version = "5.14.2" } } diff --git a/pom.xml b/pom.xml index bcc8973190..00a89e3c10 100644 --- a/pom.xml +++ b/pom.xml @@ -1007,7 +1007,7 @@ org.mockito mockito-core - 5.14.1 + 5.14.2 -- cgit v1.2.3 From 4402f10247169cce87fe950c7e6647bf44298ebd Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Wed, 24 Jul 2024 14:01:38 -0700 Subject: dfs: update getBlockCacheStats to return a List of BlockCacheStats Make available all underlying cache table stats for the used cache table implementation. The existing cache table stats implementation only allows a "global" view of the cache table statistics; it does not differentiate between all possible underlying cache tables used. This change allows callers to get the block cache stats broken down per underlying table. These cache stats are intended to be used for monitoring all cache tables independently. Existing usages of getBlockCacheStats now make use of AggregatedBlockCacheStats.fromStatsList to aggregate the list of BlockCacheStats into a single BlockCacheStats instance. Change-Id: I261b3f2849857172397657e5c674b11e09807f27 --- .../storage/dfs/AggregatedBlockCacheStatsTest.java | 23 +++--- .../storage/dfs/ClockBlockCacheTableTest.java | 22 ++++- .../storage/dfs/PackExtBlockCacheTableTest.java | 93 +++++++++++++++++----- .../storage/dfs/AggregatedBlockCacheStats.java | 12 +-- .../internal/storage/dfs/ClockBlockCacheTable.java | 5 +- .../jgit/internal/storage/dfs/DfsBlockCache.java | 31 ++++++-- .../internal/storage/dfs/DfsBlockCacheTable.java | 15 ++-- .../storage/dfs/PackExtBlockCacheTable.java | 9 +-- 8 files changed, 150 insertions(+), 60 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStatsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStatsTest.java index ac769498e2..2c4b432a01 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStatsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStatsTest.java @@ -24,9 +24,10 @@ public class AggregatedBlockCacheStatsTest { @Test public void getName() { BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats - .fromStatsList("name", List.of()); + .fromStatsList(List.of()); - assertThat(aggregatedBlockCacheStats.getName(), equalTo("name")); + assertThat(aggregatedBlockCacheStats.getName(), + equalTo(AggregatedBlockCacheStats.class.getName())); } @Test @@ -46,8 +47,7 @@ public class AggregatedBlockCacheStatsTest { currentSizes[PackExt.INDEX.getPosition()] = 7; BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats - .fromStatsList("name", - List.of(packStats, bitmapStats, indexStats)); + .fromStatsList(List.of(packStats, bitmapStats, indexStats)); assertArrayEquals(aggregatedBlockCacheStats.getCurrentSize(), currentSizes); @@ -73,8 +73,7 @@ public class AggregatedBlockCacheStatsTest { hitCounts[PackExt.INDEX.getPosition()] = 7; BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats - .fromStatsList("name", - List.of(packStats, bitmapStats, indexStats)); + .fromStatsList(List.of(packStats, bitmapStats, indexStats)); assertArrayEquals(aggregatedBlockCacheStats.getHitCount(), hitCounts); } @@ -99,8 +98,7 @@ public class AggregatedBlockCacheStatsTest { missCounts[PackExt.INDEX.getPosition()] = 7; BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats - .fromStatsList("name", - List.of(packStats, bitmapStats, indexStats)); + .fromStatsList(List.of(packStats, bitmapStats, indexStats)); assertArrayEquals(aggregatedBlockCacheStats.getMissCount(), missCounts); } @@ -131,8 +129,7 @@ public class AggregatedBlockCacheStatsTest { totalRequestCounts[PackExt.INDEX.getPosition()] = 14; BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats - .fromStatsList("name", - List.of(packStats, bitmapStats, indexStats)); + .fromStatsList(List.of(packStats, bitmapStats, indexStats)); assertArrayEquals(aggregatedBlockCacheStats.getTotalRequestCount(), totalRequestCounts); @@ -160,8 +157,7 @@ public class AggregatedBlockCacheStatsTest { hitRatios[PackExt.INDEX.getPosition()] = 0; BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats - .fromStatsList("Name", - List.of(packStats, bitmapStats, indexStats)); + .fromStatsList(List.of(packStats, bitmapStats, indexStats)); assertArrayEquals(aggregatedBlockCacheStats.getHitRatio(), hitRatios); } @@ -186,8 +182,7 @@ public class AggregatedBlockCacheStatsTest { evictions[PackExt.INDEX.getPosition()] = 7; BlockCacheStats aggregatedBlockCacheStats = AggregatedBlockCacheStats - .fromStatsList("Name", - List.of(packStats, bitmapStats, indexStats)); + .fromStatsList(List.of(packStats, bitmapStats, indexStats)); assertArrayEquals(aggregatedBlockCacheStats.getEvictions(), evictions); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTableTest.java index cb68bbc515..2e2f86bf80 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTableTest.java @@ -1,8 +1,14 @@ package org.eclipse.jgit.internal.storage.dfs; import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheConfig.DEFAULT_NAME; +import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheTable.BlockCacheStats; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.hamcrest.Matchers.isA; + +import java.util.List; import org.junit.Test; @@ -30,7 +36,8 @@ public class ClockBlockCacheTableTest { ClockBlockCacheTable cacheTable = new ClockBlockCacheTable( createBlockCacheConfig()); - assertThat(cacheTable.getBlockCacheStats().getName(), + assertThat(cacheTable.getBlockCacheStats(), hasSize(1)); + assertThat(cacheTable.getBlockCacheStats().get(0).getName(), equalTo(DEFAULT_NAME)); } @@ -39,7 +46,18 @@ public class ClockBlockCacheTableTest { ClockBlockCacheTable cacheTable = new ClockBlockCacheTable( createBlockCacheConfig().setName(NAME)); - assertThat(cacheTable.getBlockCacheStats().getName(), equalTo(NAME)); + assertThat(cacheTable.getBlockCacheStats(), hasSize(1)); + assertThat(cacheTable.getBlockCacheStats().get(0).getName(), + equalTo(NAME)); + } + + @Test + public void getAllBlockCacheStats() { + ClockBlockCacheTable cacheTable = new ClockBlockCacheTable( + createBlockCacheConfig()); + + List blockCacheStats = cacheTable.getBlockCacheStats(); + assertThat(blockCacheStats, contains(isA(BlockCacheStats.class))); } private static DfsBlockCacheConfig createBlockCacheConfig() { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java index c5c964bcab..e7627bc4ab 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTableTest.java @@ -10,8 +10,10 @@ package org.eclipse.jgit.internal.storage.dfs; +import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheTable.BlockCacheStats; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; import static org.hamcrest.Matchers.sameInstance; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertNotNull; @@ -398,15 +400,51 @@ public class PackExtBlockCacheTableTest { } @Test - public void getBlockCacheStats_getName_returnsPackExtCacheTableName() { - DfsBlockCacheStats packStats = new DfsBlockCacheStats(); - PackExtBlockCacheTable tables = PackExtBlockCacheTable.fromCacheTables( - cacheTableWithStats(/* name= */ "defaultName", packStats), - Map.of(PackExt.PACK, cacheTableWithStats(/* name= */ "packName", - packStats))); + public void getAllBlockCacheStats() { + String defaultTableName = "default table"; + DfsBlockCacheStats defaultStats = new DfsBlockCacheStats( + defaultTableName); + incrementCounter(4, + () -> defaultStats.incrementHit(new TestKey(PackExt.REFTABLE))); + + String packTableName = "pack table"; + DfsBlockCacheStats packStats = new DfsBlockCacheStats(packTableName); + incrementCounter(5, + () -> packStats.incrementHit(new TestKey(PackExt.PACK))); - assertThat(tables.getBlockCacheStats().getName(), - equalTo("defaultName,packName")); + String bitmapTableName = "bitmap table"; + DfsBlockCacheStats bitmapStats = new DfsBlockCacheStats( + bitmapTableName); + incrementCounter(6, () -> bitmapStats + .incrementHit(new TestKey(PackExt.BITMAP_INDEX))); + + DfsBlockCacheTable defaultTable = cacheTableWithStats(defaultStats); + DfsBlockCacheTable packTable = cacheTableWithStats(packStats); + DfsBlockCacheTable bitmapTable = cacheTableWithStats(bitmapStats); + PackExtBlockCacheTable tables = PackExtBlockCacheTable + .fromCacheTables(defaultTable, Map.of(PackExt.PACK, packTable, + PackExt.BITMAP_INDEX, bitmapTable)); + + List statsList = tables.getBlockCacheStats(); + assertThat(statsList, hasSize(3)); + + long[] defaultTableHitCounts = createEmptyStatsArray(); + defaultTableHitCounts[PackExt.REFTABLE.getPosition()] = 4; + assertArrayEquals( + getCacheStatsByName(statsList, defaultTableName).getHitCount(), + defaultTableHitCounts); + + long[] packTableHitCounts = createEmptyStatsArray(); + packTableHitCounts[PackExt.PACK.getPosition()] = 5; + assertArrayEquals( + getCacheStatsByName(statsList, packTableName).getHitCount(), + packTableHitCounts); + + long[] bitmapHitCounts = createEmptyStatsArray(); + bitmapHitCounts[PackExt.BITMAP_INDEX.getPosition()] = 6; + assertArrayEquals( + getCacheStatsByName(statsList, bitmapTableName).getHitCount(), + bitmapHitCounts); } @Test @@ -431,7 +469,8 @@ public class PackExtBlockCacheTableTest { cacheTableWithStats(bitmapStats), PackExt.INDEX, cacheTableWithStats(indexStats))); - assertArrayEquals(tables.getBlockCacheStats().getCurrentSize(), + assertArrayEquals(AggregatedBlockCacheStats + .fromStatsList(tables.getBlockCacheStats()).getCurrentSize(), currentSizes); } @@ -460,7 +499,9 @@ public class PackExtBlockCacheTableTest { cacheTableWithStats(bitmapStats), PackExt.INDEX, cacheTableWithStats(indexStats))); - assertArrayEquals(tables.getBlockCacheStats().getHitCount(), hitCounts); + assertArrayEquals(AggregatedBlockCacheStats + .fromStatsList(tables.getBlockCacheStats()).getHitCount(), + hitCounts); } @Test @@ -488,7 +529,8 @@ public class PackExtBlockCacheTableTest { cacheTableWithStats(bitmapStats), PackExt.INDEX, cacheTableWithStats(indexStats))); - assertArrayEquals(tables.getBlockCacheStats().getMissCount(), + assertArrayEquals(AggregatedBlockCacheStats + .fromStatsList(tables.getBlockCacheStats()).getMissCount(), missCounts); } @@ -523,8 +565,9 @@ public class PackExtBlockCacheTableTest { cacheTableWithStats(bitmapStats), PackExt.INDEX, cacheTableWithStats(indexStats))); - assertArrayEquals(tables.getBlockCacheStats().getTotalRequestCount(), - totalRequestCounts); + assertArrayEquals(AggregatedBlockCacheStats + .fromStatsList(tables.getBlockCacheStats()) + .getTotalRequestCount(), totalRequestCounts); } @Test @@ -554,7 +597,9 @@ public class PackExtBlockCacheTableTest { cacheTableWithStats(bitmapStats), PackExt.INDEX, cacheTableWithStats(indexStats))); - assertArrayEquals(tables.getBlockCacheStats().getHitRatio(), hitRatios); + assertArrayEquals(AggregatedBlockCacheStats + .fromStatsList(tables.getBlockCacheStats()).getHitRatio(), + hitRatios); } @Test @@ -582,10 +627,21 @@ public class PackExtBlockCacheTableTest { cacheTableWithStats(bitmapStats), PackExt.INDEX, cacheTableWithStats(indexStats))); - assertArrayEquals(tables.getBlockCacheStats().getEvictions(), + assertArrayEquals(AggregatedBlockCacheStats + .fromStatsList(tables.getBlockCacheStats()).getEvictions(), evictions); } + private BlockCacheStats getCacheStatsByName( + List blockCacheStats, String name) { + for (BlockCacheStats entry : blockCacheStats) { + if (entry.getName().equals(name)) { + return entry; + } + } + return null; + } + private static void incrementCounter(int amount, Runnable fn) { for (int i = 0; i < amount; i++) { fn.run(); @@ -597,15 +653,16 @@ public class PackExtBlockCacheTableTest { } private static DfsBlockCacheTable cacheTableWithStats( - DfsBlockCacheStats dfsBlockCacheStats) { + BlockCacheStats dfsBlockCacheStats) { return cacheTableWithStats(CACHE_NAME, dfsBlockCacheStats); } private static DfsBlockCacheTable cacheTableWithStats(String name, - DfsBlockCacheStats dfsBlockCacheStats) { + BlockCacheStats dfsBlockCacheStats) { DfsBlockCacheTable cacheTable = mock(DfsBlockCacheTable.class); when(cacheTable.getName()).thenReturn(name); - when(cacheTable.getBlockCacheStats()).thenReturn(dfsBlockCacheStats); + when(cacheTable.getBlockCacheStats()) + .thenReturn(List.of(dfsBlockCacheStats)); return cacheTable; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStats.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStats.java index 743f4606c4..295b702fa7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStats.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/AggregatedBlockCacheStats.java @@ -20,27 +20,23 @@ import org.eclipse.jgit.internal.storage.pack.PackExt; * Aggregates values for all given {@link BlockCacheStats}. */ class AggregatedBlockCacheStats implements BlockCacheStats { - private final String name; - private final List blockCacheStats; - static BlockCacheStats fromStatsList(String name, + static BlockCacheStats fromStatsList( List blockCacheStats) { if (blockCacheStats.size() == 1) { return blockCacheStats.get(0); } - return new AggregatedBlockCacheStats(name, blockCacheStats); + return new AggregatedBlockCacheStats(blockCacheStats); } - private AggregatedBlockCacheStats(String name, - List blockCacheStats) { - this.name = name; + private AggregatedBlockCacheStats(List blockCacheStats) { this.blockCacheStats = blockCacheStats; } @Override public String getName() { - return name; + return AggregatedBlockCacheStats.class.getName(); } @Override diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java index bbee23b061..587d482583 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ClockBlockCacheTable.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.internal.storage.dfs; import java.io.IOException; import java.time.Duration; +import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicReferenceArray; @@ -141,8 +142,8 @@ final class ClockBlockCacheTable implements DfsBlockCacheTable { } @Override - public BlockCacheStats getBlockCacheStats() { - return dfsBlockCacheStats; + public List getBlockCacheStats() { + return List.of(dfsBlockCacheStats); } @Override diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java index 0334450fbe..f8e0831e1f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCache.java @@ -11,7 +11,10 @@ package org.eclipse.jgit.internal.storage.dfs; +import static org.eclipse.jgit.internal.storage.dfs.DfsBlockCacheTable.BlockCacheStats; + import java.io.IOException; +import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.LongStream; @@ -124,7 +127,7 @@ public final class DfsBlockCache { * @return total number of bytes in the cache, per pack file extension. */ public long[] getCurrentSize() { - return dfsBlockCacheTable.getBlockCacheStats().getCurrentSize(); + return getAggregatedBlockCacheStats().getCurrentSize(); } /** @@ -143,7 +146,7 @@ public final class DfsBlockCache { * extension. */ public long[] getHitCount() { - return dfsBlockCacheTable.getBlockCacheStats().getHitCount(); + return getAggregatedBlockCacheStats().getHitCount(); } /** @@ -154,7 +157,7 @@ public final class DfsBlockCache { * extension. */ public long[] getMissCount() { - return dfsBlockCacheTable.getBlockCacheStats().getMissCount(); + return getAggregatedBlockCacheStats().getMissCount(); } /** @@ -163,7 +166,7 @@ public final class DfsBlockCache { * @return total number of requests (hit + miss), per pack file extension. */ public long[] getTotalRequestCount() { - return dfsBlockCacheTable.getBlockCacheStats().getTotalRequestCount(); + return getAggregatedBlockCacheStats().getTotalRequestCount(); } /** @@ -172,7 +175,7 @@ public final class DfsBlockCache { * @return hit ratios */ public long[] getHitRatio() { - return dfsBlockCacheTable.getBlockCacheStats().getHitRatio(); + return getAggregatedBlockCacheStats().getHitRatio(); } /** @@ -183,7 +186,18 @@ public final class DfsBlockCache { * file extension. */ public long[] getEvictions() { - return dfsBlockCacheTable.getBlockCacheStats().getEvictions(); + return getAggregatedBlockCacheStats().getEvictions(); + } + + /** + * Get the list of {@link BlockCacheStats} for all underlying caches. + *

+ * Useful in monitoring caches with breakdown. + * + * @return the list of {@link BlockCacheStats} for all underlying caches. + */ + public List getAllBlockCacheStats() { + return dfsBlockCacheTable.getBlockCacheStats(); } /** @@ -263,6 +277,11 @@ public final class DfsBlockCache { return dfsBlockCacheTable.get(key, position); } + private BlockCacheStats getAggregatedBlockCacheStats() { + return AggregatedBlockCacheStats + .fromStatsList(dfsBlockCacheTable.getBlockCacheStats()); + } + static final class Ref { final DfsStreamKey key; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java index 43ba8c36ab..c3fd07b7bb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheTable.java @@ -11,6 +11,7 @@ package org.eclipse.jgit.internal.storage.dfs; import java.io.IOException; +import java.util.List; /** * Block cache table. @@ -125,13 +126,17 @@ public interface DfsBlockCacheTable { T get(DfsStreamKey key, long position); /** - * Get the {@link BlockCacheStats} object for this block cache table's - * statistics. + * Get the list of {@link BlockCacheStats} held by this cache. + *

+ * The returned list has a {@link BlockCacheStats} per configured cache + * table, with a minimum of 1 {@link BlockCacheStats} object returned. + * + * Use {@link AggregatedBlockCacheStats} to combine the results of the stats + * in the list for an aggregated view of the cache's stats. * - * @return the {@link BlockCacheStats} tracking this block cache table's - * statistics. + * @return the list of {@link BlockCacheStats} held by this cache. */ - BlockCacheStats getBlockCacheStats(); + List getBlockCacheStats(); /** * Get the name of the table. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java index e45643be84..28b021c68f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java @@ -188,11 +188,10 @@ class PackExtBlockCacheTable implements DfsBlockCacheTable { } @Override - public BlockCacheStats getBlockCacheStats() { - return AggregatedBlockCacheStats.fromStatsList(name, - blockCacheTableList.stream() - .map(DfsBlockCacheTable::getBlockCacheStats) - .collect(Collectors.toList())); + public List getBlockCacheStats() { + return blockCacheTableList.stream() + .flatMap(cacheTable -> cacheTable.getBlockCacheStats().stream()) + .collect(Collectors.toList()); } @Override -- cgit v1.2.3 From e5f42ae18e45e5c263ba510924e09cb2bb4bc822 Mon Sep 17 00:00:00 2001 From: Sam Delmerico Date: Mon, 7 Oct 2024 14:34:03 -0700 Subject: PackWriter: make PackWriter.writeIndex() take a PackIndexWriter Previously, the PackWriter implementation required that indexes and their extensions be writable to an OutputStream with a fixed binary format. To support more general index storage formats, allow PackWriter to accept an PackIndexWriter interface which accepts only the objects to store. This allows implementors to choose their storage format. The implementation will be provided by the DfsObjectDatabase. The DfsObjectDatabase is already responsible for providing the OutputStream that was previously used to write indexes. Having it provide a writing interface would be a natural generalization. This idea was previously implemented for PackBitmapIndex writing in https://gerrithub.io/c/eclipse-jgit/jgit/+/1177722. Change-Id: I582d2f3d25d6adb2da243d6d0d7bc405a97d6183 --- .../internal/storage/dfs/DfsGarbageCollector.java | 10 +------ .../jgit/internal/storage/dfs/DfsObjDatabase.java | 34 ++++++++++++++++++++++ .../internal/storage/dfs/DfsPackCompactor.java | 11 +------ .../jgit/internal/storage/pack/PackWriter.java | 26 +++++++++++++---- 4 files changed, 57 insertions(+), 24 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java index a177669788..b933e942d9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java @@ -18,7 +18,6 @@ import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.RE import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE; import static org.eclipse.jgit.internal.storage.dfs.DfsPackCompactor.configureReftable; import static org.eclipse.jgit.internal.storage.pack.PackExt.COMMIT_GRAPH; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.OBJECT_SIZE_INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import static org.eclipse.jgit.internal.storage.pack.PackExt.REFTABLE; @@ -687,14 +686,7 @@ public class DfsGarbageCollector { pack.setBlockSize(PACK, out.blockSize()); } - try (DfsOutputStream out = objdb.writeFile(pack, INDEX)) { - CountingOutputStream cnt = new CountingOutputStream(out); - pw.writeIndex(cnt); - pack.addFileExt(INDEX); - pack.setFileSize(INDEX, cnt.getCount()); - pack.setBlockSize(INDEX, out.blockSize()); - pack.setIndexVersion(pw.getIndexVersion()); - } + pw.writeIndex(objdb.getPackIndexWriter(pack, pw.getIndexVersion())); if (source != UNREACHABLE_GARBAGE && packConfig.getMinBytesForObjSizeIndex() >= 0) { try (DfsOutputStream out = objdb.writeFile(pack, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java index 616563ffdd..efd666ff27 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsObjDatabase.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.internal.storage.dfs; import static java.util.stream.Collectors.joining; import static org.eclipse.jgit.internal.storage.pack.PackExt.BITMAP_INDEX; +import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import java.io.FileNotFoundException; import java.io.IOException; @@ -27,7 +28,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; +import org.eclipse.jgit.internal.storage.file.BasePackIndexWriter; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexWriterV1; +import org.eclipse.jgit.internal.storage.pack.PackIndexWriter; import org.eclipse.jgit.internal.storage.pack.PackBitmapIndexWriter; import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.lib.AnyObjectId; @@ -771,4 +774,35 @@ public abstract class DfsObjDatabase extends ObjectDatabase { } }; } + + /** + * Returns a writer to store the pack index in this object database. + * + * @param pack + * Pack file to which the index is associated. + * @param indexVersion + * which version of the index to write + * @return a writer to store the index associated with the pack + * @throws IOException + * when some I/O problem occurs while creating or writing to + * output stream + */ + public PackIndexWriter getPackIndexWriter( + DfsPackDescription pack, int indexVersion) + throws IOException { + return (objectsToStore, packDataChecksum) -> { + try (DfsOutputStream out = writeFile(pack, INDEX); + CountingOutputStream cnt = new CountingOutputStream(out)) { + final PackIndexWriter iw = BasePackIndexWriter + .createVersion(cnt, + indexVersion); + iw.write(objectsToStore, packDataChecksum); + pack.addFileExt(INDEX); + pack.setFileSize(INDEX, cnt.getCount()); + pack.setBlockSize(INDEX, out.blockSize()); + pack.setIndexVersion(indexVersion); + } + }; + } + } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java index 86144b389c..b32cddae77 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java @@ -12,7 +12,6 @@ package org.eclipse.jgit.internal.storage.dfs; import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.COMPACT; import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; -import static org.eclipse.jgit.internal.storage.pack.PackExt.INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import static org.eclipse.jgit.internal.storage.pack.PackExt.REFTABLE; import static org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA; @@ -45,7 +44,6 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.storage.pack.PackStatistics; import org.eclipse.jgit.util.BlockList; -import org.eclipse.jgit.util.io.CountingOutputStream; /** * Combine several pack files into one pack. @@ -458,14 +456,7 @@ public class DfsPackCompactor { private static void writeIndex(DfsObjDatabase objdb, DfsPackDescription pack, PackWriter pw) throws IOException { - try (DfsOutputStream out = objdb.writeFile(pack, INDEX)) { - CountingOutputStream cnt = new CountingOutputStream(out); - pw.writeIndex(cnt); - pack.addFileExt(INDEX); - pack.setFileSize(INDEX, cnt.getCount()); - pack.setBlockSize(INDEX, out.blockSize()); - pack.setIndexVersion(pw.getIndexVersion()); - } + pw.writeIndex(objdb.getPackIndexWriter(pack, pw.getIndexVersion())); } static ReftableConfig configureReftable(ReftableConfig cfg, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index 4fd2eb5798..4c262b0e3a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -118,7 +118,7 @@ import org.eclipse.jgit.util.TemporaryBuffer; * {@link #preparePack(ProgressMonitor, Set, Set)}, and streaming with * {@link #writePack(ProgressMonitor, ProgressMonitor, OutputStream)}. If the * pack is being stored as a file the matching index can be written out after - * writing the pack by {@link #writeIndex(OutputStream)}. An optional bitmap + * writing the pack by {@link #writeIndex(PackIndexWriter)}. An optional bitmap * index can be made by calling {@link #prepareBitmapIndex(ProgressMonitor)} * followed by {@link #writeBitmapIndex(PackBitmapIndexWriter)}. *

@@ -1099,12 +1099,28 @@ public class PackWriter implements AutoCloseable { * the index data could not be written to the supplied stream. */ public void writeIndex(OutputStream indexStream) throws IOException { + writeIndex(BasePackIndexWriter.createVersion(indexStream, + getIndexVersion())); + } + + /** + * Create an index file to match the pack file just written. + *

+ * Called after + * {@link #writePack(ProgressMonitor, ProgressMonitor, OutputStream)}. + *

+ * Writing an index is only required for local pack storage. Packs sent on + * the network do not need to create an index. + * + * @param iw + * an @code{PackIndexWriter} instance to write the index + * @throws java.io.IOException + * the index data could not be written to the supplied stream. + */ + public void writeIndex(PackIndexWriter iw) throws IOException { if (isIndexDisabled()) throw new IOException(JGitText.get().cachedPacksPreventsIndexCreation); - long writeStart = System.currentTimeMillis(); - PackIndexWriter iw = BasePackIndexWriter.createVersion(indexStream, - getIndexVersion()); iw.write(sortByName(), packcsum); stats.timeWriting += System.currentTimeMillis() - writeStart; } @@ -2448,7 +2464,7 @@ public class PackWriter implements AutoCloseable { * object graph at selected commits. Writing a bitmap index is an optional * feature that not all pack users may require. *

- * Called after {@link #writeIndex(OutputStream)}. + * Called after {@link #writeIndex(PackIndexWriter)}. *

* To reduce memory internal state is cleared during this method, rendering * the PackWriter instance useless for anything further than a call to write -- cgit v1.2.3 From 9c6b36e97ba561d4737130c6427d6febc0a7d431 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 29 Oct 2024 10:57:28 -0700 Subject: DfsInserter: Read minBytesForObjectSizeIndex only from repo config In general, JGit reads the configuration it needs from the repository configuration. minBytesForObjectSizeIndex is a special case with a setter for subclasses but that is unnecessary. Remove the setter and read the conf from the repo. Make the property final and read it directly from the conf (it is clearer than parsing a whole PackConfig to read a single value). Change-Id: I8d77247452ff65e6c431fdcfebb90ed2ce40aed1 --- .../jgit/internal/storage/dfs/DfsInserter.java | 28 ++++++---------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java index 8f09261674..16315bf4f2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsInserter.java @@ -41,12 +41,13 @@ import org.eclipse.jgit.errors.CorruptObjectException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; import org.eclipse.jgit.errors.LargeObjectException; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.file.BasePackIndexWriter; +import org.eclipse.jgit.internal.storage.file.PackIndex; import org.eclipse.jgit.internal.storage.file.PackObjectSizeIndexWriter; import org.eclipse.jgit.internal.storage.pack.PackExt; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdOwnerMap; @@ -54,7 +55,6 @@ import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.ObjectStream; -import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.transport.PackedObjectInfo; import org.eclipse.jgit.util.BlockList; import org.eclipse.jgit.util.IO; @@ -71,6 +71,8 @@ public class DfsInserter extends ObjectInserter { private static final int INDEX_VERSION = 2; final DfsObjDatabase db; + + private final int minBytesForObjectSizeIndex; int compression = Deflater.BEST_COMPRESSION; List objectList; @@ -83,8 +85,6 @@ public class DfsInserter extends ObjectInserter { private boolean rollback; private boolean checkExisting = true; - private int minBytesForObjectSizeIndex = -1; - /** * Initialize a new inserter. * @@ -93,8 +93,9 @@ public class DfsInserter extends ObjectInserter { */ protected DfsInserter(DfsObjDatabase db) { this.db = db; - PackConfig pc = new PackConfig(db.getRepository()); - this.minBytesForObjectSizeIndex = pc.getMinBytesForObjSizeIndex(); + this.minBytesForObjectSizeIndex = db.getRepository().getConfig().getInt( + ConfigConstants.CONFIG_PACK_SECTION, + ConfigConstants.CONFIG_KEY_MIN_BYTES_OBJ_SIZE_INDEX, -1); } /** @@ -112,21 +113,6 @@ public class DfsInserter extends ObjectInserter { void setCompressionLevel(int compression) { this.compression = compression; } - - /** - * Set minimum size for an object to be included in the object size index. - * - *

- * Use 0 for all and -1 for nothing (the pack won't have object size index). - * - * @param minBytes - * only objects with size bigger or equal to this are included in - * the index. - */ - protected void setMinBytesForObjectSizeIndex(int minBytes) { - this.minBytesForObjectSizeIndex = minBytes; - } - @Override public DfsPackParser newPackParser(InputStream in) throws IOException { return new DfsPackParser(db, this, in); -- cgit v1.2.3 From d861ad1f5a1fdaf49b9c4b641e7d298b7acea6ad Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 9 Jul 2024 11:10:02 -0700 Subject: [errorprone] util.Stats: Add summary fragment to javadoc Errorprone complains about missing summary in these javadocs. [MissingSummary] A summary fragment is required; consider using the value of the @return b lock as a summary fragment instead. * @return variance of the added values ^ (see https://google.github.io/styleguide/javaguide.html#s7.2-summary-fragment) Did you mean '*Returns variance of the added values.'? Change-Id: I29d633ec95c18b17cc92b069dd1a94fbb2a75c94 --- .../src/org/eclipse/jgit/util/Stats.java | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/Stats.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/Stats.java index d957deb34c..efa6e7ddc3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/Stats.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/Stats.java @@ -43,14 +43,18 @@ public class Stats { } /** - * @return number of the added values + * Returns the number of added values + * + * @return the number of added values */ public int count() { return n; } /** - * @return minimum of the added values + * Returns the smallest value added + * + * @return the smallest value added */ public double min() { if (n < 1) { @@ -60,7 +64,9 @@ public class Stats { } /** - * @return maximum of the added values + * Returns the biggest value added + * + * @return the biggest value added */ public double max() { if (n < 1) { @@ -70,9 +76,10 @@ public class Stats { } /** - * @return average of the added values + * Returns the average of the added values + * + * @return the average of the added values */ - public double avg() { if (n < 1) { return Double.NaN; @@ -81,7 +88,9 @@ public class Stats { } /** - * @return variance of the added values + * Returns the variance of the added values + * + * @return the variance of the added values */ public double var() { if (n < 2) { @@ -91,7 +100,9 @@ public class Stats { } /** - * @return standard deviation of the added values + * Returns the standard deviation of the added values + * + * @return the standard deviation of the added values */ public double stddev() { return Math.sqrt(this.var()); -- cgit v1.2.3 From 793df21ed5c75613b0eb7f300857d56779d5c502 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 9 Jul 2024 13:29:15 -0700 Subject: [errorprone] ByteArraySet: Add summary fragment to javadoc Reported by error prone. Change-Id: Icaa69c37d0cde19fc605cb3f3c5f9ed9abfb37d3 --- .../src/org/eclipse/jgit/treewalk/filter/ByteArraySet.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/ByteArraySet.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/ByteArraySet.java index bcf79a285d..33db6ea661 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/ByteArraySet.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/filter/ByteArraySet.java @@ -13,12 +13,12 @@ package org.eclipse.jgit.treewalk.filter; -import org.eclipse.jgit.util.RawParseUtils; - import java.util.Arrays; import java.util.Set; import java.util.stream.Collectors; +import org.eclipse.jgit.util.RawParseUtils; + /** * Specialized set for byte arrays, interpreted as strings for use in * {@link PathFilterGroup.Group}. Most methods assume the hash is already know @@ -141,13 +141,19 @@ class ByteArraySet { } /** + * Returns number of arrays in the set + * * @return number of arrays in the set */ int size() { return size; } - /** @return true if {@link #size()} is 0. */ + /** + * Returns true if {@link #size()} is 0 + * + * @return true if {@link #size()} is 0 + */ boolean isEmpty() { return size == 0; } -- cgit v1.2.3 From c9752b0125c84248c468065eba64bf007abae81c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 30 Oct 2024 15:36:09 -0700 Subject: [errorprone] PackWriter: Fix javadoc tag in new #writeIndex method We introduced this method recently and the javadoc is not correct: error: [InvalidInlineTag] This tag is invalid. @code{PackIndexWriter} instance to write the index Change-Id: I34ed3d8b5a121fea9b8163627b46ae4a289c9462 --- .../src/org/eclipse/jgit/internal/storage/pack/PackWriter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java index 4c262b0e3a..f025d4e3d5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriter.java @@ -59,9 +59,9 @@ import org.eclipse.jgit.errors.SearchForReuseTimeout; import org.eclipse.jgit.errors.StoredObjectRepresentationNotAvailableException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.file.BasePackIndexWriter; +import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; import org.eclipse.jgit.internal.storage.file.PackObjectSizeIndexWriter; import org.eclipse.jgit.internal.storage.file.PackReverseIndexWriter; -import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.AsyncObjectSizeQueue; import org.eclipse.jgit.lib.BatchingProgressMonitor; @@ -1113,7 +1113,7 @@ public class PackWriter implements AutoCloseable { * the network do not need to create an index. * * @param iw - * an @code{PackIndexWriter} instance to write the index + * an {@link PackIndexWriter} instance to write the index * @throws java.io.IOException * the index data could not be written to the supplied stream. */ -- cgit v1.2.3 From 92a9641026306af3136530bc351da1c755df0c27 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 30 Oct 2024 15:45:33 -0700 Subject: [errorprone] HttpConnection: Add missing summary in java The constants don't have summary and errorprone complains about it. Change-Id: Id1470ed9fd54cf7fd684045c5631acc1a8d450c2 --- .../org/eclipse/jgit/transport/http/HttpConnection.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/http/HttpConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/http/HttpConnection.java index 125ee6cbe9..95b8221a8b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/http/HttpConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/http/HttpConnection.java @@ -36,29 +36,39 @@ import org.eclipse.jgit.annotations.NonNull; */ public interface HttpConnection { /** + * HttpURLConnection#HTTP_OK + * * @see HttpURLConnection#HTTP_OK */ int HTTP_OK = java.net.HttpURLConnection.HTTP_OK; /** + * HttpURLConnection#HTTP_NOT_AUTHORITATIVE + * * @see HttpURLConnection#HTTP_NOT_AUTHORITATIVE * @since 5.8 */ int HTTP_NOT_AUTHORITATIVE = java.net.HttpURLConnection.HTTP_NOT_AUTHORITATIVE; /** + * HttpURLConnection#HTTP_MOVED_PERM + * * @see HttpURLConnection#HTTP_MOVED_PERM * @since 4.7 */ int HTTP_MOVED_PERM = java.net.HttpURLConnection.HTTP_MOVED_PERM; /** + * HttpURLConnection#HTTP_MOVED_TEMP + * * @see HttpURLConnection#HTTP_MOVED_TEMP * @since 4.9 */ int HTTP_MOVED_TEMP = java.net.HttpURLConnection.HTTP_MOVED_TEMP; /** + * HttpURLConnection#HTTP_SEE_OTHER + * * @see HttpURLConnection#HTTP_SEE_OTHER * @since 4.9 */ @@ -85,16 +95,22 @@ public interface HttpConnection { int HTTP_11_MOVED_PERM = 308; /** + * HttpURLConnection#HTTP_NOT_FOUND + * * @see HttpURLConnection#HTTP_NOT_FOUND */ int HTTP_NOT_FOUND = java.net.HttpURLConnection.HTTP_NOT_FOUND; /** + * HttpURLConnection#HTTP_UNAUTHORIZED + * * @see HttpURLConnection#HTTP_UNAUTHORIZED */ int HTTP_UNAUTHORIZED = java.net.HttpURLConnection.HTTP_UNAUTHORIZED; /** + * HttpURLConnection#HTTP_FORBIDDEN + * * @see HttpURLConnection#HTTP_FORBIDDEN */ int HTTP_FORBIDDEN = java.net.HttpURLConnection.HTTP_FORBIDDEN; -- cgit v1.2.3 From c8b1b822a409167b63bd9be11efac0bcd5476a5c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 8 Jul 2024 14:21:45 -0700 Subject: [errorprone] SeparateClassloadertTestRunner: use #split(String,int) Errorprone recommends to use String.split(String, int) as it has a less surprising behaviour with empty entries. https://errorprone.info/bugpattern/StringSplitter Change-Id: I48a01ee18d66bbb4a177aee576629dc5132d4a38 --- .../src/org/eclipse/jgit/junit/SeparateClassloaderTestRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/SeparateClassloaderTestRunner.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/SeparateClassloaderTestRunner.java index c8c56b21b8..2a482df04a 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/SeparateClassloaderTestRunner.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/SeparateClassloaderTestRunner.java @@ -44,7 +44,7 @@ public class SeparateClassloaderTestRunner extends BlockJUnit4ClassRunner { try { String pathSeparator = System.getProperty("path.separator"); String[] classPathEntries = System.getProperty("java.class.path") - .split(pathSeparator); + .split(pathSeparator, -1); URL[] urls = new URL[classPathEntries.length]; for (int i = 0; i < classPathEntries.length; i++) { urls[i] = Paths.get(classPathEntries[i]).toUri().toURL(); -- cgit v1.2.3 From 7c092ab66e27b3ae68c7fed6d300b8645f7e4173 Mon Sep 17 00:00:00 2001 From: Saril Sudhakaran Date: Tue, 29 Oct 2024 00:17:01 -0500 Subject: DfsGarbageCollector: Add setter for reflog expiration time. JGit reftable writer/compator knows how to prune the history, but the DfsGarbageCollector doesn't expose the time limit. Add a method to DfsGarbageCollector to set the reflog time limit. This value is then passed to the reftable compactor. Callers usually pass here the value from gc.reflogExpire. The reflog block length is stored in 24 bits [1], limiting the size to 16MB. I have observed that in repositories with frequent commits, reflogs hit that size in 6-12 months. [1] https://git-scm.com/docs/reftable Bug: jgit-96 Change-Id: I8b32d6d2b2e1d8af8fb7d9f86225d75f1877eb2f --- .../storage/dfs/DfsGarbageCollectorTest.java | 98 ++++++++++++++++++++++ .../internal/storage/dfs/DfsGarbageCollector.java | 21 +++++ 2 files changed, 119 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java index 2be11d32ea..3edd1056be 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java @@ -6,6 +6,7 @@ import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.IN import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.UNREACHABLE_GARBAGE; import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import static org.eclipse.jgit.internal.storage.pack.PackExt.REFTABLE; +import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -17,6 +18,8 @@ import static org.junit.Assert.fail; import java.io.IOException; import java.util.Arrays; import java.util.Collections; +import java.util.Date; +import java.util.GregorianCalendar; import java.util.concurrent.TimeUnit; import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; @@ -24,6 +27,7 @@ import org.eclipse.jgit.internal.storage.commitgraph.CommitGraphWriter; import org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource; import org.eclipse.jgit.internal.storage.file.PackBitmapIndex; import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.reftable.LogCursor; import org.eclipse.jgit.internal.storage.reftable.RefCursor; import org.eclipse.jgit.internal.storage.reftable.ReftableConfig; import org.eclipse.jgit.internal.storage.reftable.ReftableReader; @@ -37,6 +41,7 @@ import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef; +import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevBlob; @@ -44,6 +49,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.transport.ReceiveCommand; +import org.eclipse.jgit.util.GitDateParser; import org.eclipse.jgit.util.SystemReader; import org.junit.After; import org.junit.Before; @@ -1275,6 +1281,90 @@ public class DfsGarbageCollectorTest { bitmapIndex.getXorBitmapCount() > 0); } + @Test + public void gitGCWithRefLogExpire() throws Exception { + String master = "refs/heads/master"; + RevCommit commit0 = commit().message("0").create(); + RevCommit commit1 = commit().message("1").parent(commit0).create(); + git.update(master, commit1); + DfsGarbageCollector gc = new DfsGarbageCollector(repo); + gc.setReftableConfig(new ReftableConfig()); + run(gc); + DfsPackDescription t1 = odb.newPack(INSERT); + Ref next = new ObjectIdRef.PeeledNonTag(Ref.Storage.LOOSE, + "refs/heads/next", commit0.copy()); + long currentDay = new Date().getTime(); + GregorianCalendar cal = new GregorianCalendar(SystemReader + .getInstance().getTimeZone(), SystemReader.getInstance() + .getLocale()); + long ten_days_ago = GitDateParser.parse("10 days ago",cal,SystemReader.getInstance() + .getLocale()).getTime() ; + long twenty_days_ago = GitDateParser.parse("20 days ago",cal,SystemReader.getInstance() + .getLocale()).getTime() ; + long thirty_days_ago = GitDateParser.parse("30 days ago",cal,SystemReader.getInstance() + .getLocale()).getTime() ;; + long fifty_days_ago = GitDateParser.parse("50 days ago",cal,SystemReader.getInstance() + .getLocale()).getTime() ; + PersonIdent who2 = new PersonIdent("J.Author", "authemail", currentDay, -8 * 60); + PersonIdent who3 = new PersonIdent("J.Author", "authemail", ten_days_ago, -8 * 60); + PersonIdent who4 = new PersonIdent("J.Author", "authemail", twenty_days_ago, -8 * 60); + PersonIdent who5 = new PersonIdent("J.Author", "authemail", thirty_days_ago, -8 * 60); + PersonIdent who6 = new PersonIdent("J.Author", "authemail", fifty_days_ago, -8 * 60); + + try (DfsOutputStream out = odb.writeFile(t1, REFTABLE)) { + ReftableWriter w = new ReftableWriter(out); + w.setMinUpdateIndex(42); + w.setMaxUpdateIndex(42); + w.begin(); + w.sortAndWriteRefs(Collections.singleton(next)); + w.writeLog("refs/heads/branch", 1, who2, ObjectId.zeroId(),id(2), "Branch Message"); + w.writeLog("refs/heads/branch1", 2, who3, ObjectId.zeroId(),id(3), "Branch Message1"); + w.writeLog("refs/heads/branch2", 2, who4, ObjectId.zeroId(),id(4), "Branch Message2"); + w.writeLog("refs/heads/branch3", 2, who5, ObjectId.zeroId(),id(5), "Branch Message3"); + w.writeLog("refs/heads/branch4", 2, who6, ObjectId.zeroId(),id(6), "Branch Message4"); + w.finish(); + t1.addFileExt(REFTABLE); + t1.setReftableStats(w.getStats()); + } + odb.commitPack(Collections.singleton(t1), null); + + gc = new DfsGarbageCollector(repo); + gc.setReftableConfig(new ReftableConfig()); + // Expire ref log entries older than 30 days + gc.setRefLogExpire(new Date(thirty_days_ago)); + run(gc); + + // Single GC pack present with all objects. + assertEquals(1, odb.getPacks().length); + DfsPackFile pack = odb.getPacks()[0]; + DfsPackDescription desc = pack.getPackDescription(); + + DfsReftable table = new DfsReftable(DfsBlockCache.getInstance(), desc); + try (DfsReader ctx = odb.newReader(); + ReftableReader rr = table.open(ctx); + RefCursor rc = rr.allRefs(); + LogCursor lc = rr.allLogs()) { + assertTrue(rc.next()); + assertEquals(master, rc.getRef().getName()); + assertEquals(commit1, rc.getRef().getObjectId()); + assertTrue(rc.next()); + assertEquals(next.getName(), rc.getRef().getName()); + assertEquals(commit0, rc.getRef().getObjectId()); + assertFalse(rc.next()); + assertTrue(lc.next()); + assertEquals(lc.getRefName(),"refs/heads/branch"); + assertTrue(lc.next()); + assertEquals(lc.getRefName(),"refs/heads/branch1"); + assertTrue(lc.next()); + assertEquals(lc.getRefName(),"refs/heads/branch2"); + // Old entries are purged + assertFalse(lc.next()); + + } + + } + + private RevCommit commitChain(RevCommit parent, int length) throws Exception { for (int i = 0; i < length; i++) { @@ -1364,4 +1454,12 @@ public class DfsGarbageCollectorTest { } return cnt; } + private static ObjectId id(int i) { + byte[] buf = new byte[OBJECT_ID_LENGTH]; + buf[0] = (byte) (i & 0xff); + buf[1] = (byte) ((i >>> 8) & 0xff); + buf[2] = (byte) ((i >>> 16) & 0xff); + buf[3] = (byte) (i >>> 24); + return ObjectId.fromRaw(buf); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java index a177669788..91440a6498 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java @@ -29,6 +29,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Collection; +import java.util.Date; import java.util.EnumSet; import java.util.GregorianCalendar; import java.util.HashSet; @@ -100,6 +101,7 @@ public class DfsGarbageCollector { private Set allTags; private Set nonHeads; private Set tagTargets; + private Date refLogExpire; /** * Initialize a garbage collector. @@ -200,6 +202,22 @@ public class DfsGarbageCollector { return this; } + + /** + * Set time limit to the reflog history. + *

+ * Garbage Collector prunes entries from reflog history older than {@code refLogExpire} + *

+ * + * @param refLogExpire + * instant in time which defines refLog expiration + * @return {@code this} + */ + public DfsGarbageCollector setRefLogExpire(Date refLogExpire) { + this.refLogExpire = refLogExpire ; + return this; + } + /** * Set maxUpdateIndex for the initial reftable created during conversion. * @@ -741,6 +759,9 @@ public class DfsGarbageCollector { compact.addAll(stack.readers()); compact.setIncludeDeletes(includeDeletes); compact.setConfig(configureReftable(reftableConfig, out)); + if(refLogExpire != null ){ + compact.setReflogExpireOldestReflogTimeMillis(refLogExpire.getTime()); + } compact.compact(); pack.addFileExt(REFTABLE); pack.setReftableStats(compact.getStats()); -- cgit v1.2.3 From 4ec2413e14043f6d9a0ebd6616fdef2464fe4880 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 31 Oct 2024 12:55:31 -0700 Subject: [errorprone] RefDatabase: #getConflictingNames immutable return Errorprone reports that: This method returns both mutable and immutable collections or maps from different paths. This may be confusing for users of the method. Return always an immutable collection. Change-Id: Id48f3645fd06c8bc72212af180d7d02c7e0b7632 --- org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index 2cf24185c7..114246beb2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -160,7 +160,7 @@ public abstract class RefDatabase { if (existing.startsWith(prefix)) conflicting.add(existing); - return conflicting; + return Collections.unmodifiableList(conflicting); } /** -- cgit v1.2.3 From 562d825f26134ee3db30c1791e918fa8c32095f1 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 31 Oct 2024 12:17:09 -0700 Subject: [errorprone] Remove deprecated security manager Errorprone warns about this deprecated classes. The recommendation is stop using SecurityManager all together. The Security Manager is deprecated and subject to removal in a future release. There is no replacement for the Security Manager. See JEP 411 [1] for discussion and alternatives. [1] https://openjdk.org/jeps/411 Change-Id: I3c67136e97d13cf24b85e41d94408631c26e8be8 --- .../api/SecurityManagerMissingPermissionsTest.java | 126 --------------- .../org/eclipse/jgit/api/SecurityManagerTest.java | 173 --------------------- .../org/eclipse/jgit/internal/JGitText.properties | 2 - .../src/org/eclipse/jgit/internal/JGitText.java | 2 - .../eclipse/jgit/transport/SshSessionFactory.java | 7 +- org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java | 35 +---- .../src/org/eclipse/jgit/util/FS_Win32_Cygwin.java | 11 +- .../src/org/eclipse/jgit/util/SystemReader.java | 6 +- .../eclipse/jgit/util/io/ThrowingPrintWriter.java | 7 +- 9 files changed, 7 insertions(+), 362 deletions(-) delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerMissingPermissionsTest.java delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerMissingPermissionsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerMissingPermissionsTest.java deleted file mode 100644 index d0fbdbd090..0000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerMissingPermissionsTest.java +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright (c) 2019 Alex Jitianu and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -package org.eclipse.jgit.api; - -import static org.junit.Assert.assertEquals; -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.PrintStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.security.Policy; -import java.util.Collections; - -import org.eclipse.jgit.junit.RepositoryTestCase; -import org.eclipse.jgit.util.FileUtils; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Tests that using a SecurityManager does not result in errors logged. - */ -public class SecurityManagerMissingPermissionsTest extends RepositoryTestCase { - - /** - * Collects all logging sent to the logging system. - */ - private final ByteArrayOutputStream errorOutput = new ByteArrayOutputStream(); - - private SecurityManager originalSecurityManager; - - private PrintStream defaultErrorOutput; - - @Override - @Before - public void setUp() throws Exception { - originalSecurityManager = System.getSecurityManager(); - - // 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()); - super.setUp(); - } - - /** - * If a SecurityManager is active a lot of {@link java.io.FilePermission} - * errors are thrown and logged while initializing a repository. - * - * @throws Exception - */ - @Test - public void testCreateNewRepos_MissingPermissions() throws Exception { - File wcTree = new File(getTemporaryDirectory(), - "CreateNewRepositoryTest_testCreateNewRepos"); - - File marker = new File(getTemporaryDirectory(), "marker"); - Files.write(marker.toPath(), Collections.singletonList("Can write")); - assertTrue("Can write in test directory", marker.isFile()); - FileUtils.delete(marker); - assertFalse("Can delete in test direcory", marker.exists()); - - Git git = Git.init().setBare(false) - .setDirectory(new File(wcTree.getAbsolutePath())).call(); - - addRepoToClose(git.getRepository()); - - assertEquals("", errorOutput.toString()); - } - - @Override - @After - public void tearDown() throws Exception { - System.setSecurityManager(originalSecurityManager); - System.setErr(defaultErrorOutput); - super.tearDown(); - } - - /** - * Refresh the Java Security Policy. - * - * @param policy - * the policy object - * - * @throws IOException - * if the temporary file that contains the policy could not be - * created - */ - private static void refreshPolicyAllPermission(Policy policy) - throws IOException { - // Starting with an all permissions policy. - String policyString = "grant { permission java.security.AllPermission; };"; - - // Do not use TemporaryFilesFactory, it will create a dependency cycle - Path policyFile = Files.createTempFile("testpolicy", ".txt"); - - try { - Files.write(policyFile, Collections.singletonList(policyString)); - System.setProperty("java.security.policy", - policyFile.toUri().toURL().toString()); - policy.refresh(); - } finally { - try { - Files.delete(policyFile); - } catch (IOException e) { - // Do not log; the test tests for no logging having occurred - e.printStackTrace(); - } - } - } - -} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerTest.java deleted file mode 100644 index 2b930a1133..0000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/SecurityManagerTest.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (C) 2019 Nail Samatov and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -package org.eclipse.jgit.api; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.File; -import java.io.FilePermission; -import java.io.IOException; -import java.lang.reflect.ReflectPermission; -import java.nio.file.Files; -import java.security.Permission; -import java.security.SecurityPermission; -import java.util.ArrayList; -import java.util.List; -import java.util.PropertyPermission; -import java.util.logging.LoggingPermission; - -import javax.security.auth.AuthPermission; - -import org.eclipse.jgit.api.errors.GitAPIException; -import org.eclipse.jgit.junit.JGitTestUtil; -import org.eclipse.jgit.junit.MockSystemReader; -import org.eclipse.jgit.junit.SeparateClassloaderTestRunner; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.treewalk.TreeWalk; -import org.eclipse.jgit.util.FileUtils; -import org.eclipse.jgit.util.SystemReader; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - -/** - *

- * Tests if jgit works if SecurityManager is enabled. - *

- * - *

- * Note: JGit's classes shouldn't be used before SecurityManager is configured. - * If you use some JGit's class before SecurityManager is replaced then part of - * the code can be invoked outside of our custom SecurityManager and this test - * becomes useless. - *

- * - *

- * For example the class {@link org.eclipse.jgit.util.FS} is used widely in jgit - * sources. It contains DETECTED static field. At the first usage of the class - * FS the field DETECTED is initialized and during initialization many system - * operations that SecurityManager can forbid are invoked. - *

- * - *

- * For this reason this test doesn't extend LocalDiskRepositoryTestCase (it uses - * JGit's classes in setUp() method) and other JGit's utility classes. It's done - * to affect SecurityManager as less as possible. - *

- * - *

- * We use SeparateClassloaderTestRunner to isolate FS.DETECTED field - * initialization between different tests run. - *

- */ -@RunWith(SeparateClassloaderTestRunner.class) -public class SecurityManagerTest { - private File root; - - private SecurityManager originalSecurityManager; - - private List permissions = new ArrayList<>(); - - @Before - public void setUp() throws Exception { - // Create working directory - SystemReader.setInstance(new MockSystemReader()); - root = Files.createTempDirectory("jgit-security").toFile(); - - // Add system permissions - permissions.add(new RuntimePermission("*")); - permissions.add(new SecurityPermission("*")); - permissions.add(new AuthPermission("*")); - permissions.add(new ReflectPermission("*")); - permissions.add(new PropertyPermission("*", "read,write")); - permissions.add(new LoggingPermission("control", null)); - - permissions.add(new FilePermission( - System.getProperty("java.home") + "/-", "read")); - - String tempDir = System.getProperty("java.io.tmpdir"); - permissions.add(new FilePermission(tempDir, "read,write,delete")); - permissions - .add(new FilePermission(tempDir + "/-", "read,write,delete")); - - // Add permissions to dependent jar files. - String classPath = System.getProperty("java.class.path"); - if (classPath != null) { - for (String path : classPath.split(File.pathSeparator)) { - permissions.add(new FilePermission(path, "read")); - } - } - // Add permissions to jgit class files. - String jgitSourcesRoot = new File(System.getProperty("user.dir")) - .getParent(); - permissions.add(new FilePermission(jgitSourcesRoot + "/-", "read")); - - // Add permissions to working dir for jgit. Our git repositories will be - // initialized and cloned here. - permissions.add(new FilePermission(root.getPath() + "/-", - "read,write,delete,execute")); - - // Replace Security Manager - originalSecurityManager = System.getSecurityManager(); - System.setSecurityManager(new SecurityManager() { - - @Override - public void checkPermission(Permission requested) { - for (Permission permission : permissions) { - if (permission.implies(requested)) { - return; - } - } - - super.checkPermission(requested); - } - }); - } - - @After - public void tearDown() throws Exception { - System.setSecurityManager(originalSecurityManager); - - // Note: don't use this method before security manager is replaced in - // setUp() method. The method uses FS.DETECTED internally and can affect - // the test. - FileUtils.delete(root, FileUtils.RECURSIVE | FileUtils.RETRY); - } - - @Test - public void testInitAndClone() throws IOException, GitAPIException { - File remote = new File(root, "remote"); - File local = new File(root, "local"); - - try (Git git = Git.init().setDirectory(remote).call()) { - JGitTestUtil.write(new File(remote, "hello.txt"), "Hello world!"); - git.add().addFilepattern(".").call(); - git.commit().setMessage("Initial commit").call(); - } - - try (Git git = Git.cloneRepository().setURI(remote.toURI().toString()) - .setDirectory(local).call()) { - assertTrue(new File(local, ".git").exists()); - - JGitTestUtil.write(new File(local, "hi.txt"), "Hi!"); - git.add().addFilepattern(".").call(); - RevCommit commit1 = git.commit().setMessage("Commit on local repo") - .call(); - assertEquals("Commit on local repo", commit1.getFullMessage()); - assertNotNull(TreeWalk.forPath(git.getRepository(), "hello.txt", - commit1.getTree())); - } - - } - -} diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index b1450ef057..024ca77f21 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -640,8 +640,6 @@ readFileStoreAttributesFailed=Reading FileStore attributes from user config fail readerIsRequired=Reader is required readingObjectsFromLocalRepositoryFailed=reading objects from local repository failed: {0} readLastModifiedFailed=Reading lastModified of {0} failed -readPipeIsNotAllowed=FS.readPipe() isn't allowed for command ''{0}''. Working directory: ''{1}''. -readPipeIsNotAllowedRequiredPermission=FS.readPipe() isn't allowed for command ''{0}''. Working directory: ''{1}''. Required permission: {2}. readTimedOut=Read timed out after {0} ms receivePackObjectTooLarge1=Object too large, rejecting the pack. Max object size limit is {0} bytes. receivePackObjectTooLarge2=Object too large ({0} bytes), rejecting the pack. Max object size limit is {1} bytes. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 310962b967..0980219e25 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -670,8 +670,6 @@ public class JGitText extends TranslationBundle { /***/ public String readerIsRequired; /***/ public String readingObjectsFromLocalRepositoryFailed; /***/ public String readLastModifiedFailed; - /***/ public String readPipeIsNotAllowed; - /***/ public String readPipeIsNotAllowedRequiredPermission; /***/ public String readTimedOut; /***/ public String receivePackObjectTooLarge1; /***/ public String receivePackObjectTooLarge2; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java index a0194ea8b1..8120df0698 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SshSessionFactory.java @@ -11,8 +11,6 @@ package org.eclipse.jgit.transport; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.Iterator; import java.util.ServiceLoader; @@ -99,9 +97,8 @@ public abstract class SshSessionFactory { * @since 5.2 */ public static String getLocalUserName() { - return AccessController - .doPrivileged((PrivilegedAction) () -> SystemReader - .getInstance().getProperty(Constants.OS_USER_NAME_KEY)); + return SystemReader.getInstance() + .getProperty(Constants.OS_USER_NAME_KEY); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java index 860c1c92fd..59bbacfa76 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS.java @@ -30,7 +30,6 @@ import java.nio.file.InvalidPathException; import java.nio.file.Path; import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.FileTime; -import java.security.AccessControlException; import java.text.MessageFormat; import java.time.Duration; import java.time.Instant; @@ -261,31 +260,6 @@ public abstract class FS { private static final AtomicInteger threadNumber = new AtomicInteger(1); - /** - * Don't use the default thread factory of the ForkJoinPool for the - * CompletableFuture; it runs without any privileges, which causes - * trouble if a SecurityManager is present. - *

- * Instead use normal daemon threads. They'll belong to the - * SecurityManager's thread group, or use the one of the calling thread, - * as appropriate. - *

- * - * @see java.util.concurrent.Executors#newCachedThreadPool() - */ - private static final ExecutorService FUTURE_RUNNER = new ThreadPoolExecutor( - 5, 5, 30L, TimeUnit.SECONDS, - new LinkedBlockingQueue<>(), - runnable -> { - Thread t = new Thread(runnable, - "JGit-FileStoreAttributeReader-" //$NON-NLS-1$ - + threadNumber.getAndIncrement()); - // Make sure these threads don't prevent application/JVM - // shutdown. - t.setDaemon(true); - return t; - }); - /** * Use a separate executor with at most one thread to synchronize * writing to the config. We write asynchronously since the config @@ -463,7 +437,7 @@ public abstract class FS { locks.remove(s); } return attributes; - }, FUTURE_RUNNER); + }); f = f.exceptionally(e -> { LOG.error(e.getLocalizedMessage(), e); return Optional.empty(); @@ -1391,13 +1365,6 @@ public abstract class FS { } } catch (IOException e) { LOG.error("Caught exception in FS.readPipe()", e); //$NON-NLS-1$ - } catch (AccessControlException e) { - LOG.warn(MessageFormat.format( - JGitText.get().readPipeIsNotAllowedRequiredPermission, - command, dir, e.getPermission())); - } catch (SecurityException e) { - LOG.warn(MessageFormat.format(JGitText.get().readPipeIsNotAllowed, - command, dir)); } if (debug) { LOG.debug("readpipe returns null"); //$NON-NLS-1$ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java index 635351ac84..237879110a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/FS_Win32_Cygwin.java @@ -14,8 +14,6 @@ import static java.nio.charset.StandardCharsets.UTF_8; import java.io.File; import java.io.OutputStream; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -43,10 +41,7 @@ public class FS_Win32_Cygwin extends FS_Win32 { * @return true if cygwin is found */ public static boolean isCygwin() { - final String path = AccessController - .doPrivileged((PrivilegedAction) () -> System - .getProperty("java.library.path") //$NON-NLS-1$ - ); + final String path = System.getProperty("java.library.path"); //$NON-NLS-1$ if (path == null) return false; File found = FS.searchPath(path, "cygpath.exe"); //$NON-NLS-1$ @@ -99,9 +94,7 @@ public class FS_Win32_Cygwin extends FS_Win32 { @Override protected File userHomeImpl() { - final String home = AccessController.doPrivileged( - (PrivilegedAction) () -> System.getenv("HOME") //$NON-NLS-1$ - ); + final String home = System.getenv("HOME"); //$NON-NLS-1$ if (home == null || home.length() == 0) return super.userHomeImpl(); return resolve(new File("."), home); //$NON-NLS-1$ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index ed62c71371..03ed925617 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -23,8 +23,6 @@ import java.nio.charset.UnsupportedCharsetException; import java.nio.file.InvalidPathException; import java.nio.file.Path; import java.nio.file.Paths; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Locale; @@ -670,9 +668,7 @@ public abstract class SystemReader { } private String getOsName() { - return AccessController.doPrivileged( - (PrivilegedAction) () -> getProperty("os.name") //$NON-NLS-1$ - ); + return getProperty("os.name"); //$NON-NLS-1$ } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java index 4764676c88..13982b133c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java @@ -11,8 +11,6 @@ package org.eclipse.jgit.util.io; import java.io.IOException; import java.io.Writer; -import java.security.AccessController; -import java.security.PrivilegedAction; import org.eclipse.jgit.util.SystemReader; @@ -35,10 +33,7 @@ public class ThrowingPrintWriter extends Writer { */ public ThrowingPrintWriter(Writer out) { this.out = out; - LF = AccessController - .doPrivileged((PrivilegedAction) () -> SystemReader - .getInstance().getProperty("line.separator") //$NON-NLS-1$ - ); + LF = SystemReader.getInstance().getProperty("line.separator"); //$NON-NLS-1$ } @Override -- cgit v1.2.3 From facddaccf591c3f3da9384269e1b592ca179a794 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 31 Oct 2024 12:50:00 -0700 Subject: [errorprone] BaseRepositoryBuilder: Use #split(sep, limit) String.split(String) and Pattern.split(CharSequence) have surprising behaviour [1]. We use one of the recommended replacements: #split(sep, limit). [1] https://errorprone.info/bugpattern/StringSplitter Change-Id: Ie1cf7590bd8660d21c79c5c3c1bc2765e5d9462b --- .../src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java index d232be6276..0c1da83dfb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BaseRepositoryBuilder.java @@ -15,6 +15,7 @@ import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_BARE; import static org.eclipse.jgit.lib.ConfigConstants.CONFIG_KEY_WORKTREE; import static org.eclipse.jgit.lib.Constants.CONFIG; import static org.eclipse.jgit.lib.Constants.DOT_GIT; +import static org.eclipse.jgit.lib.Constants.GITDIR_FILE; import static org.eclipse.jgit.lib.Constants.GIT_ALTERNATE_OBJECT_DIRECTORIES_KEY; import static org.eclipse.jgit.lib.Constants.GIT_CEILING_DIRECTORIES_KEY; import static org.eclipse.jgit.lib.Constants.GIT_COMMON_DIR_KEY; @@ -23,7 +24,6 @@ import static org.eclipse.jgit.lib.Constants.GIT_INDEX_FILE_KEY; import static org.eclipse.jgit.lib.Constants.GIT_OBJECT_DIRECTORY_KEY; import static org.eclipse.jgit.lib.Constants.GIT_WORK_TREE_KEY; import static org.eclipse.jgit.lib.Constants.OBJECTS; -import static org.eclipse.jgit.lib.Constants.GITDIR_FILE; import java.io.File; import java.io.IOException; @@ -485,7 +485,7 @@ public class BaseRepositoryBuilder Date: Fri, 1 Nov 2024 08:58:27 -0700 Subject: DfsPackCompactor: write object size index Currently the compactor is not writing the object size index for packs. As it is using PackWriter to generate the packs, it needs to explicitely call the writes of each extension. Invoke writeObjectSizeIndex in the compactor. The pack writer will write one if the configuration says so. Change-Id: I8d6bbbb5bd67bfc7dd511aa76463512b1e86a45d --- .../internal/storage/dfs/DfsPackCompacterTest.java | 44 ++++++++++++++++++++++ .../internal/storage/dfs/DfsPackCompactor.java | 17 +++++++++ 2 files changed, 61 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackCompacterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackCompacterTest.java index c516e30f50..c3b6aa85a2 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackCompacterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsPackCompacterTest.java @@ -12,13 +12,18 @@ package org.eclipse.jgit.internal.storage.dfs; import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.COMPACT; import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.INSERT; +import static org.eclipse.jgit.internal.storage.pack.PackExt.OBJECT_SIZE_INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.IOException; +import java.util.Arrays; +import java.util.Optional; import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.revwalk.RevCommit; import org.junit.Before; import org.junit.Test; @@ -98,6 +103,40 @@ public class DfsPackCompacterTest { pack.getPackDescription().getEstimatedPackSize()); } + @Test + public void testObjectSizeIndexWritten() throws Exception { + writeObjectSizeIndex(repo, true); + RevCommit commit0 = commit().message("0").create(); + RevCommit commit1 = commit().message("1").parent(commit0).create(); + git.update("master", commit1); + + compact(); + + Optional compactPack = Arrays.stream(odb.getPacks()) + .filter(pack -> pack.getPackDescription() + .getPackSource() == COMPACT) + .findFirst(); + assertTrue(compactPack.isPresent()); + assertTrue(compactPack.get().getPackDescription().hasFileExt(OBJECT_SIZE_INDEX)); + } + + @Test + public void testObjectSizeIndexNotWritten() throws Exception { + writeObjectSizeIndex(repo, false); + RevCommit commit0 = commit().message("0").create(); + RevCommit commit1 = commit().message("1").parent(commit0).create(); + git.update("master", commit1); + + compact(); + + Optional compactPack = Arrays.stream(odb.getPacks()) + .filter(pack -> pack.getPackDescription() + .getPackSource() == COMPACT) + .findFirst(); + assertTrue(compactPack.isPresent()); + assertFalse(compactPack.get().getPackDescription().hasFileExt(OBJECT_SIZE_INDEX)); + } + private TestRepository.CommitBuilder commit() { return git.commit(); } @@ -108,4 +147,9 @@ public class DfsPackCompacterTest { compactor.compact(null); odb.clearCache(); } + + private static void writeObjectSizeIndex(DfsRepository repo, boolean should) { + repo.getConfig().setInt(ConfigConstants.CONFIG_PACK_SECTION, null, + ConfigConstants.CONFIG_KEY_MIN_BYTES_OBJ_SIZE_INDEX, should ? 0 : -1); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java index b32cddae77..f9c01b9d6e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.internal.storage.dfs; import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.COMPACT; import static org.eclipse.jgit.internal.storage.dfs.DfsObjDatabase.PackSource.GC; +import static org.eclipse.jgit.internal.storage.pack.PackExt.OBJECT_SIZE_INDEX; import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import static org.eclipse.jgit.internal.storage.pack.PackExt.REFTABLE; import static org.eclipse.jgit.internal.storage.pack.StoredObjectRepresentation.PACK_DELTA; @@ -44,6 +45,7 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.storage.pack.PackStatistics; import org.eclipse.jgit.util.BlockList; +import org.eclipse.jgit.util.io.CountingOutputStream; /** * Combine several pack files into one pack. @@ -247,6 +249,7 @@ public class DfsPackCompactor { try { writePack(objdb, outDesc, pw, pm); writeIndex(objdb, outDesc, pw); + writeObjectSizeIndex(objdb, outDesc, pw); PackStatistics stats = pw.getStatistics(); @@ -459,6 +462,20 @@ public class DfsPackCompactor { pw.writeIndex(objdb.getPackIndexWriter(pack, pw.getIndexVersion())); } + private static void writeObjectSizeIndex(DfsObjDatabase objdb, + DfsPackDescription pack, + PackWriter pw) throws IOException { + try (DfsOutputStream out = objdb.writeFile(pack, OBJECT_SIZE_INDEX)) { + CountingOutputStream cnt = new CountingOutputStream(out); + pw.writeObjectSizeIndex(cnt); + if (cnt.getCount() > 0) { + pack.addFileExt(OBJECT_SIZE_INDEX); + pack.setFileSize(OBJECT_SIZE_INDEX, cnt.getCount()); + pack.setBlockSize(OBJECT_SIZE_INDEX, out.blockSize()); + } + } + } + static ReftableConfig configureReftable(ReftableConfig cfg, DfsOutputStream out) { int bs = out.blockSize(); -- cgit v1.2.3 From 4f48a5b1e3842aeeae6b8f0f5d517819373221a4 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Mon, 21 Oct 2024 20:26:35 -0600 Subject: Add Union merge strategy support Allow users to specify the `union` strategy in their .gitattributes file in order to keep lines from both versions of a conflict [1]. [1] https://git-scm.com/docs/gitattributes.html#Documentation/gitattributes.txt-union Change-Id: I74cecceb2db819a8551b95fb10dfe7c2b160b709 --- .../attributes/merge/MergeGitAttributeTest.java | 45 +++ .../jgit/merge/MergeAlgorithmUnionTest.java | 328 +++++++++++++++++++++ org.eclipse.jgit/.settings/.api_filters | 16 + .../src/org/eclipse/jgit/lib/Constants.java | 7 + .../eclipse/jgit/merge/ContentMergeStrategy.java | 11 +- .../src/org/eclipse/jgit/merge/MergeAlgorithm.java | 13 +- .../src/org/eclipse/jgit/merge/ResolveMerger.java | 14 +- 7 files changed, 430 insertions(+), 4 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmUnionTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java index 009ca8a152..ac30c6c526 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/merge/MergeGitAttributeTest.java @@ -267,6 +267,51 @@ public class MergeGitAttributeTest extends RepositoryTestCase { } } + @Test + public void mergeTextualFile_SetUnionMerge() throws NoWorkTreeException, + NoFilepatternException, GitAPIException, IOException { + try (Git git = createRepositoryBinaryConflict(g -> { + try { + writeTrashFile(".gitattributes", "*.cat merge=union"); + writeTrashFile("main.cat", "A\n" + "B\n" + "C\n" + "D\n"); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }, g -> { + try { + writeTrashFile("main.cat", "A\n" + "G\n" + "C\n" + "F\n"); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }, g -> { + try { + writeTrashFile("main.cat", "A\n" + "E\n" + "C\n" + "D\n"); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + })) { + // Check that the merge attribute is set to union + assertAddMergeAttributeCustom(REFS_HEADS_LEFT, "main.cat", "union"); + assertAddMergeAttributeCustom(REFS_HEADS_RIGHT, "main.cat", + "union"); + + checkoutBranch(REFS_HEADS_LEFT); + // Merge refs/heads/left -> refs/heads/right + + MergeResult mergeResult = git.merge() + .include(git.getRepository().resolve(REFS_HEADS_RIGHT)) + .call(); + assertEquals(MergeStatus.MERGED, mergeResult.getMergeStatus()); + + // Check that the file is the union of both branches (no conflict + // marker added) + String result = read(writeTrashFile("res.cat", + "A\n" + "G\n" + "E\n" + "C\n" + "F\n")); + assertEquals(result, read(git.getRepository().getWorkTree().toPath() + .resolve("main.cat").toFile())); + } + } + @Test public void mergeBinaryFile_NoAttr_Conflict() throws IllegalStateException, IOException, NoHeadException, ConcurrentRefUpdateException, diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmUnionTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmUnionTest.java new file mode 100644 index 0000000000..3a8af7a00e --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/MergeAlgorithmUnionTest.java @@ -0,0 +1,328 @@ +/* + * Copyright (C) 2024 Qualcomm Innovation Center, Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.merge; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; + +import org.eclipse.jgit.diff.RawText; +import org.eclipse.jgit.diff.RawTextComparator; +import org.eclipse.jgit.lib.Constants; +import org.junit.Assume; +import org.junit.Test; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.runner.RunWith; + +@RunWith(Theories.class) +public class MergeAlgorithmUnionTest { + MergeFormatter fmt = new MergeFormatter(); + + private final boolean newlineAtEnd; + + @DataPoints + public static boolean[] newlineAtEndDataPoints = { false, true }; + + public MergeAlgorithmUnionTest(boolean newlineAtEnd) { + this.newlineAtEnd = newlineAtEnd; + } + + /** + * Check for a conflict where the second text was changed similar to the + * first one, but the second texts modification covers one more line. + * + * @throws java.io.IOException + */ + @Test + public void testTwoConflictingModifications() throws IOException { + assertEquals(t("abZZdefghij"), + merge("abcdefghij", "abZdefghij", "aZZdefghij")); + } + + /** + * Test a case where we have three consecutive chunks. The first text + * modifies all three chunks. The second text modifies the first and the + * last chunk. This should be reported as one conflicting region. + * + * @throws java.io.IOException + */ + @Test + public void testOneAgainstTwoConflictingModifications() throws IOException { + assertEquals(t("aZZcZefghij"), + merge("abcdefghij", "aZZZefghij", "aZcZefghij")); + } + + /** + * Test a merge where only the second text contains modifications. Expect as + * merge result the second text. + * + * @throws java.io.IOException + */ + @Test + public void testNoAgainstOneModification() throws IOException { + assertEquals(t("aZcZefghij"), + merge("abcdefghij", "abcdefghij", "aZcZefghij")); + } + + /** + * Both texts contain modifications but not on the same chunks. Expect a + * non-conflict merge result. + * + * @throws java.io.IOException + */ + @Test + public void testTwoNonConflictingModifications() throws IOException { + assertEquals(t("YbZdefghij"), + merge("abcdefghij", "abZdefghij", "Ybcdefghij")); + } + + /** + * Merge two complicated modifications. The merge algorithm has to extend + * and combine conflicting regions to get to the expected merge result. + * + * @throws java.io.IOException + */ + @Test + public void testTwoComplicatedModifications() throws IOException { + assertEquals(t("aZZZZfZhZjbYdYYYYiY"), + merge("abcdefghij", "aZZZZfZhZj", "abYdYYYYiY")); + } + + /** + * Merge two modifications with a shared delete at the end. The underlying + * diff algorithm has to provide consistent edit results to get the expected + * merge result. + * + * @throws java.io.IOException + */ + @Test + public void testTwoModificationsWithSharedDelete() throws IOException { + assertEquals(t("Cb}n}"), merge("ab}n}n}", "ab}n}", "Cb}n}")); + } + + /** + * Merge modifications with a shared insert in the middle. The underlying + * diff algorithm has to provide consistent edit results to get the expected + * merge result. + * + * @throws java.io.IOException + */ + @Test + public void testModificationsWithMiddleInsert() throws IOException { + assertEquals(t("aBcd123123uvwxPq"), + merge("abcd123uvwxpq", "aBcd123123uvwxPq", "abcd123123uvwxpq")); + } + + /** + * Merge modifications with a shared delete in the middle. The underlying + * diff algorithm has to provide consistent edit results to get the expected + * merge result. + * + * @throws java.io.IOException + */ + @Test + public void testModificationsWithMiddleDelete() throws IOException { + assertEquals(t("Abz}z123Q"), + merge("abz}z}z123q", "Abz}z123Q", "abz}z123q")); + } + + @Test + public void testInsertionAfterDeletion() throws IOException { + assertEquals(t("abcd"), merge("abd", "ad", "abcd")); + } + + @Test + public void testInsertionBeforeDeletion() throws IOException { + assertEquals(t("acbd"), merge("abd", "ad", "acbd")); + } + + /** + * Test a conflicting region at the very start of the text. + * + * @throws java.io.IOException + */ + @Test + public void testConflictAtStart() throws IOException { + assertEquals(t("ZYbcdefghij"), + merge("abcdefghij", "Zbcdefghij", "Ybcdefghij")); + } + + /** + * Test a conflicting region at the very end of the text. + * + * @throws java.io.IOException + */ + @Test + public void testConflictAtEnd() throws IOException { + assertEquals(t("abcdefghiZY"), + merge("abcdefghij", "abcdefghiZ", "abcdefghiY")); + } + + /** + * Check for a conflict where the second text was changed similar to the + * first one, but the second texts modification covers one more line. + * + * @throws java.io.IOException + */ + @Test + public void testSameModification() throws IOException { + assertEquals(t("abZdefghij"), + merge("abcdefghij", "abZdefghij", "abZdefghij")); + } + + /** + * Check that a deleted vs. a modified line shows up as conflict (see Bug + * 328551) + * + * @throws java.io.IOException + */ + @Test + public void testDeleteVsModify() throws IOException { + assertEquals(t("abZdefghij"), + merge("abcdefghij", "abdefghij", "abZdefghij")); + } + + @Test + public void testInsertVsModify() throws IOException { + assertEquals(t("abZXY"), merge("ab", "abZ", "aXY")); + } + + @Test + public void testAdjacentModifications() throws IOException { + assertEquals(t("aZcbYd"), merge("abcd", "aZcd", "abYd")); + } + + @Test + public void testSeparateModifications() throws IOException { + assertEquals(t("aZcYe"), merge("abcde", "aZcde", "abcYe")); + } + + @Test + public void testBlankLines() throws IOException { + assertEquals(t("aZc\nYe"), merge("abc\nde", "aZc\nde", "abc\nYe")); + } + + /** + * Test merging two contents which do one similar modification and one + * insertion is only done by one side, in the middle. Between modification + * and insertion is a block which is common between the two contents and the + * common base + * + * @throws java.io.IOException + */ + @Test + public void testTwoSimilarModsAndOneInsert() throws IOException { + assertEquals(t("aBcDde"), merge("abcde", "aBcde", "aBcDde")); + + assertEquals(t("IAAAJCAB"), merge("iACAB", "IACAB", "IAAAJCAB")); + + assertEquals(t("HIAAAJCAB"), merge("HiACAB", "HIACAB", "HIAAAJCAB")); + + assertEquals(t("AGADEFHIAAAJCAB"), + merge("AGADEFHiACAB", "AGADEFHIACAB", "AGADEFHIAAAJCAB")); + } + + /** + * Test merging two contents which do one similar modification and one + * insertion is only done by one side, at the end. Between modification and + * insertion is a block which is common between the two contents and the + * common base + * + * @throws java.io.IOException + */ + @Test + public void testTwoSimilarModsAndOneInsertAtEnd() throws IOException { + Assume.assumeTrue(newlineAtEnd); + assertEquals(t("IAAJ"), merge("iA", "IA", "IAAJ")); + + assertEquals(t("IAJ"), merge("iA", "IA", "IAJ")); + + assertEquals(t("IAAAJ"), merge("iA", "IA", "IAAAJ")); + } + + @Test + public void testTwoSimilarModsAndOneInsertAtEndNoNewlineAtEnd() + throws IOException { + Assume.assumeFalse(newlineAtEnd); + assertEquals(t("IAAAJ"), merge("iA", "IA", "IAAJ")); + + assertEquals(t("IAAJ"), merge("iA", "IA", "IAJ")); + + assertEquals(t("IAAAAJ"), merge("iA", "IA", "IAAAJ")); + } + + // Test situations where (at least) one input value is the empty text + + @Test + public void testEmptyTextModifiedAgainstDeletion() throws IOException { + // NOTE: git.git merge-file appends a '\n' to the end of the file even + // when the input files do not have a newline at the end. That appears + // to be a bug in git.git. + assertEquals(t("AB"), merge("A", "AB", "")); + assertEquals(t("AB"), merge("A", "", "AB")); + } + + @Test + public void testEmptyTextUnmodifiedAgainstDeletion() throws IOException { + assertEquals(t(""), merge("AB", "AB", "")); + + assertEquals(t(""), merge("AB", "", "AB")); + } + + @Test + public void testEmptyTextDeletionAgainstDeletion() throws IOException { + assertEquals(t(""), merge("AB", "", "")); + } + + private String merge(String commonBase, String ours, String theirs) + throws IOException { + MergeAlgorithm ma = new MergeAlgorithm(); + ma.setContentMergeStrategy(ContentMergeStrategy.UNION); + MergeResult r = ma.merge(RawTextComparator.DEFAULT, + T(commonBase), T(ours), T(theirs)); + ByteArrayOutputStream bo = new ByteArrayOutputStream(50); + fmt.formatMerge(bo, r, "B", "O", "T", UTF_8); + return bo.toString(UTF_8); + } + + public String t(String text) { + StringBuilder r = new StringBuilder(); + for (int i = 0; i < text.length(); i++) { + char c = text.charAt(i); + switch (c) { + case '<': + r.append("<<<<<<< O\n"); + break; + case '=': + r.append("=======\n"); + break; + case '|': + r.append("||||||| B\n"); + break; + case '>': + r.append(">>>>>>> T\n"); + break; + default: + r.append(c); + if (newlineAtEnd || i < text.length() - 1) + r.append('\n'); + } + } + return r.toString(); + } + + public RawText T(String text) { + return new RawText(Constants.encode(t(text))); + } +} diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 50a04d20f0..28b20ab01f 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -16,4 +16,20 @@ + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 60a23dde05..1a97d111e3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -493,6 +493,13 @@ public final class Constants { */ public static final String ATTR_BUILTIN_BINARY_MERGER = "binary"; //$NON-NLS-1$ + /** + * Union built-in merge driver + * + * @since 6.10.1 + */ + public static final String ATTR_BUILTIN_UNION_MERGE_DRIVER = "union"; //$NON-NLS-1$ + /** * Create a new digest function for objects. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ContentMergeStrategy.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ContentMergeStrategy.java index 6d568643d5..a835a1dfc5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ContentMergeStrategy.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ContentMergeStrategy.java @@ -23,5 +23,12 @@ public enum ContentMergeStrategy { OURS, /** Resolve the conflict hunk using the theirs version. */ - THEIRS -} \ No newline at end of file + THEIRS, + + /** + * Resolve the conflict hunk using a union of both ours and theirs versions. + * + * @since 6.10.1 + */ + UNION +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java index 5734a25276..d0d4d367b9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/MergeAlgorithm.java @@ -120,6 +120,7 @@ public final class MergeAlgorithm { result.add(1, 0, 0, ConflictState.NO_CONFLICT); break; case THEIRS: + case UNION: result.add(2, 0, theirs.size(), ConflictState.NO_CONFLICT); break; @@ -148,6 +149,7 @@ public final class MergeAlgorithm { // we modified, they deleted switch (strategy) { case OURS: + case UNION: result.add(1, 0, ours.size(), ConflictState.NO_CONFLICT); break; case THEIRS: @@ -158,7 +160,7 @@ public final class MergeAlgorithm { result.add(1, 0, ours.size(), ConflictState.FIRST_CONFLICTING_RANGE); result.add(0, 0, base.size(), - ConflictState.BASE_CONFLICTING_RANGE); + ConflictState.BASE_CONFLICTING_RANGE); result.add(2, 0, 0, ConflictState.NEXT_CONFLICTING_RANGE); break; } @@ -329,6 +331,15 @@ public final class MergeAlgorithm { ConflictState.NO_CONFLICT); break; case THEIRS: + result.add(2, theirsBeginB + commonPrefix, + theirsEndB - commonSuffix, + ConflictState.NO_CONFLICT); + break; + case UNION: + result.add(1, oursBeginB + commonPrefix, + oursEndB - commonSuffix, + ConflictState.NO_CONFLICT); + result.add(2, theirsBeginB + commonPrefix, theirsEndB - commonSuffix, ConflictState.NO_CONFLICT); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 1ad41be423..85b85cf855 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -1489,11 +1489,23 @@ public class ResolveMerger extends ThreeWayMerger { : getRawText(ours.getEntryObjectId(), attributes[T_OURS]); RawText theirsText = theirs == null ? RawText.EMPTY_TEXT : getRawText(theirs.getEntryObjectId(), attributes[T_THEIRS]); - mergeAlgorithm.setContentMergeStrategy(strategy); + mergeAlgorithm.setContentMergeStrategy( + getAttributesContentMergeStrategy(attributes[T_OURS], + strategy)); return mergeAlgorithm.merge(RawTextComparator.DEFAULT, baseText, ourText, theirsText); } + private ContentMergeStrategy getAttributesContentMergeStrategy( + Attributes attributes, ContentMergeStrategy strategy) { + Attribute attr = attributes.get(Constants.ATTR_MERGE); + if (attr != null && attr.getValue() + .equals(Constants.ATTR_BUILTIN_UNION_MERGE_DRIVER)) { + return ContentMergeStrategy.UNION; + } + return strategy; + } + private boolean isIndexDirty() { if (inCore) { return false; -- cgit v1.2.3 From 3a7a9cb0e89de263d0a5133949c9c9bed5141916 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Tue, 29 Oct 2024 17:22:15 -0600 Subject: ResolveMerger: Allow setting the TreeWalk AttributesNodeProvider When a merger is created without a Repository, no AttributesNodeProvider is created in the TreeWalk. Since mergers are often created with a custom ObjectInserter and no repo, they skip any lookups of attributes from any of the gitattributes files (within a tree, in the repo info/ dir, or user/global). Since there are potentially merge-affecting attributes in those files, callers might want to use both a custom ObjectInserter and an AttributesNodeProvider. Change-Id: I7997309003bbb598e1002261b3be7f2cc52066c8 --- org.eclipse.jgit/.settings/.api_filters | 20 +++++++++++++++++++ .../src/org/eclipse/jgit/merge/ResolveMerger.java | 23 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 28b20ab01f..2c22f0231c 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -32,4 +32,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index 85b85cf855..a6a287bcf4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -41,6 +41,7 @@ import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.attributes.Attribute; import org.eclipse.jgit.attributes.Attributes; +import org.eclipse.jgit.attributes.AttributesNodeProvider; import org.eclipse.jgit.diff.DiffAlgorithm; import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; import org.eclipse.jgit.diff.RawText; @@ -837,6 +838,13 @@ public class ResolveMerger extends ThreeWayMerger { @NonNull private ContentMergeStrategy contentStrategy = ContentMergeStrategy.CONFLICT; + /** + * The {@link AttributesNodeProvider} to use while merging trees. + * + * @since 6.10.1 + */ + protected AttributesNodeProvider attributesNodeProvider; + private static MergeAlgorithm getMergeAlgorithm(Config config) { SupportedAlgorithm diffAlg = config.getEnum( CONFIG_DIFF_SECTION, null, CONFIG_KEY_ALGORITHM, @@ -1836,6 +1844,18 @@ public class ResolveMerger extends ThreeWayMerger { this.workingTreeIterator = workingTreeIterator; } + /** + * Sets the {@link AttributesNodeProvider} to be used by this merger. + * + * @param attributesNodeProvider + * the attributeNodeProvider to set + * @since 6.10.1 + */ + public void setAttributesNodeProvider( + AttributesNodeProvider attributesNodeProvider) { + this.attributesNodeProvider = attributesNodeProvider; + } + /** * The resolve conflict way of three way merging @@ -1880,6 +1900,9 @@ public class ResolveMerger extends ThreeWayMerger { WorkTreeUpdater.createWorkTreeUpdater(db, dircache); dircache = workTreeUpdater.getLockedDirCache(); tw = new NameConflictTreeWalk(db, reader); + if (attributesNodeProvider != null) { + tw.setAttributesNodeProvider(attributesNodeProvider); + } tw.addTree(baseTree); tw.setHead(tw.addTree(headTree)); -- cgit v1.2.3 From 1342502ad0954526589437fd309ef70a36ee3099 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 5 Nov 2024 01:28:14 +0100 Subject: Add missing @since 7.1 to UploadPack#implies Change-Id: Iabbe1f18a5022b4669a3352493c6fd35920ef25f --- org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 216cde1e37..2270c5e5c5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -155,8 +155,10 @@ public class UploadPack implements Closeable { /** * Check if the current policy implies another, based on its bitmask. * - * @param implied the implied policy based on its bitmask. + * @param implied + * the implied policy based on its bitmask. * @return true if the policy is implied. + * @since 7.1 */ public boolean implies(RequestPolicy implied) { return (bitmask & implied.bitmask) != 0; -- cgit v1.2.3 From 6042cbc12960f4b2d6deb924705238717de0d6fd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 5 Nov 2024 01:42:16 +0100 Subject: Update bytebuddy to 1.15.10 Change-Id: I49cd5bedd86601380a26f7a7213fc78ebd091393 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 21 files changed, 60 insertions(+), 60 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index d1ed57487d..dc4d322558 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "0d26263eb7524252d98e602fc6942996a3195e29", ) -BYTE_BUDDY_VERSION = "1.15.7" +BYTE_BUDDY_VERSION = "1.15.10" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "658064662e33b045bb9499b1c8afeae656974b18", + sha1 = "635c873fadd853c084f84fdc3cbd58c5dd8537f9", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "0f0a8a3b1440714d548ec54093eb34e3f2726013", + sha1 = "0e8eb255b2c378b9a6c7341e7b0e12f0a5636377", ) maven_jar( 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 872ff86d22..d16431df75 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 d58275a415..ac9d7c4e95 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 be15fdd693..f7fd352a32 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 7de5d871d8..a03692ab28 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 6a5e8160b3..d90aa60409 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 4e860ff28a..2f7eb7adfb 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 7af598f034..4dd26b9961 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 2ca0d56c60..e0a4bab260 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 262ae68cee..700b813313 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 e33f0b0c1a..a03967df61 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 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 65fa024ada..528f6bb74b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index e189127718..dd960ee053 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 49442a97f4..dada6487ec 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 18c4707c82..403ed29801 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index 0c23c0c176..f812d63086 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index e6ee190905..6bcc689650 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 4cc1959d01..c99e59d7a9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 0dfe190bc7..fe7e9d292a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.7 + 1.15.10 jar net.bytebuddy byte-buddy-agent - 1.15.7 + 1.15.10 jar 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 5e29950bc0..630107daed 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.15.7" + version = "1.15.10" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.15.7" + version = "1.15.10" } } diff --git a/pom.xml b/pom.xml index 00a89e3c10..a35c81ebd2 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.26.3 5.15.0 - 1.15.7 + 1.15.10 jacoco -- cgit v1.2.3 From 31ff8955d6ed23aa41456b00b1f151913f28120d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 5 Nov 2024 02:00:24 +0100 Subject: Update bouncycastle to 1.79 Change-Id: Ib81d73075ebc9dcdc73aacf30fa02ad56a502d51 --- WORKSPACE | 18 +++++++++--------- .../internal/keys/OCBPBEProtectionRemoverFactory.java | 7 +++++++ .../org.eclipse.jgit.target/jgit-4.17.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.18.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.19.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.20.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.21.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.22.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.23.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.24.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.25.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.26.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.27.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.28.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.29.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.30.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.31.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.32.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.33.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.34.target | 10 +++++----- .../org.eclipse.jgit.target/maven/dependencies.tpd | 8 ++++---- pom.xml | 2 +- 22 files changed, 111 insertions(+), 104 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index dc4d322558..1050a44cff 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -296,32 +296,32 @@ maven_jar( sha1 = "6f4beb9b482ea0d9db9db0564742aa2e4e0bf3c4", ) -BOUNCYCASTLE_VER = "1.78.1" +BOUNCYCASTLE_VER = "1.79" maven_jar( name = "bcpg", artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "6c8dbcec20355278ec54840e735f63db2479150e", - src_sha1 = "2ddef60d84dd8c14ebce4c13100f0bc55fed6922", + sha1 = "904dd8a8e1c9f7d58d1ffa7f4ca3fb00736a601f", + src_sha1 = "9e372826141edb213d5921131ee68dc276dc99ef", ) maven_jar( name = "bcprov", artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "39e9e45359e20998eb79c1828751f94a818d25f8", - src_sha1 = "70f58ec93da543dda6a21614b768cb2e386fd512", + sha1 = "4d8e2732bcee15f1db93df266c3f5b70ce5cac21", + src_sha1 = "8647816d667ee526a8e3a456229ac5f9f96d2315", ) maven_jar( name = "bcutil", artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "5353ca39fe2f148dab9ca1d637a43d0750456254", - src_sha1 = "8d2e0747f5d806f39a602f7f91610444d88c4e2c", + sha1 = "ecfc5aef97cc7676ea0de5c53c407b9f533f0ad5", + src_sha1 = "00df03977fb0b80395da655623abca9d7d7dcb66", ) maven_jar( name = "bcpkix", artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "17b3541f736df97465f87d9f5b5dfa4991b37bb3", - src_sha1 = "3aeaf221772ad0c9c04593688cb86c6eb74d48b9", + sha1 = "7693cec3b8779b74b35466dcaeeaac7409872954", + src_sha1 = "57a60d1d9f75320eef70a095dfae679d97ade1c2", ) diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java index 3924d68596..e6f1decbc1 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java @@ -120,6 +120,13 @@ class OCBPBEProtectionRemoverFactory } } } + + @Override + public byte[] recoverKeyData(int encAlgorithm, int aeadAlgorithm, + byte[] s2kKey, byte[] iv, int packetTag, int keyVersion, + byte[] keyData, byte[] pubkeyData) throws PGPException { + throw new UnsupportedOperationException(); + } }; } } \ No newline at end of file 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 d16431df75..623e964217 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 ac9d7c4e95..66d68e06f2 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 f7fd352a32..16b9706b3e 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 a03692ab28..9604132842 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 d90aa60409..78149754b4 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 2f7eb7adfb..b5fcaf31dc 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 4dd26b9961..b57ac90a93 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 e0a4bab260..dd7081e0ae 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 700b813313..e5cbf9b35a 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 a03967df61..48ffc2f27f 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 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 528f6bb74b..5c7e1a4596 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index dd960ee053..735d1cf5c9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index dada6487ec..9357dee548 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 403ed29801..295b9c3c46 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index f812d63086..b9b690ccca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 6bcc689650..2407a8708f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index c99e59d7a9..78433361fe 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index fe7e9d292a..c913b9dcca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcprov-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcpkix-jdk18on - 1.78.1 + 1.79 jar org.bouncycastle bcutil-jdk18on - 1.78.1 + 1.79 jar 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 630107daed..68b457c0f3 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 @@ -69,22 +69,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.78.1" + version = "1.79" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.78.1" + version = "1.79" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.78.1" + version = "1.79" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.78.1" + version = "1.79" } } diff --git a/pom.xml b/pom.xml index a35c81ebd2..e7f24fe083 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 1.7.36 3.6.3 2.11.0 - 1.78.1 + 1.79 4.8.5.0 3.5.1 3.3.2 -- cgit v1.2.3 From a3dbf3af63db5dce8566a3a1ad03f67c1e0bd090 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 5 Nov 2024 15:03:26 -0800 Subject: [errorprone] bc: Remove unused SExprParser#parseSecretKey errorprone complains about using Date in the SExprParser class. All the usages are in a variant of the parseSecretKey method that doesn't have any callers. Remove the unused method. Change-Id: I80f5aa58877b9da31729cb90b0219e45d96144a8 --- .../jgit/gpg/bc/internal/keys/SExprParser.java | 148 --------------------- 1 file changed, 148 deletions(-) diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SExprParser.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SExprParser.java index fd030ee032..b062eadb43 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SExprParser.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SExprParser.java @@ -28,7 +28,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.math.BigInteger; -import java.util.Date; import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.x9.ECNamedCurveTable; @@ -40,8 +39,6 @@ import org.bouncycastle.bcpg.ECSecretBCPGKey; import org.bouncycastle.bcpg.ElGamalPublicBCPGKey; import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; -import org.bouncycastle.bcpg.PublicKeyPacket; import org.bouncycastle.bcpg.RSAPublicBCPGKey; import org.bouncycastle.bcpg.RSASecretBCPGKey; import org.bouncycastle.bcpg.S2K; @@ -50,7 +47,6 @@ import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator; import org.bouncycastle.openpgp.operator.PBEProtectionRemoverFactory; import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; import org.bouncycastle.openpgp.operator.PGPDigestCalculator; @@ -262,150 +258,6 @@ public class SExprParser { throw new PGPException("unknown key type found"); } - /** - * Parse a secret key from one of the GPG S expression keys. - * - * @param inputStream - * to read from - * @param keyProtectionRemoverFactory - * for decrypting encrypted keys - * @param fingerPrintCalculator - * for calculating key fingerprints - * - * @return a secret key object. - * @throws IOException - * if an IO error occurred - * @throws PGPException - * if a PGP error occurred - */ - public PGPSecretKey parseSecretKey(InputStream inputStream, - PBEProtectionRemoverFactory keyProtectionRemoverFactory, - KeyFingerPrintCalculator fingerPrintCalculator) - throws IOException, PGPException { - SXprUtils.skipOpenParenthesis(inputStream); - - String type; - - type = SXprUtils.readString(inputStream, inputStream.read()); - if (type.equals("protected-private-key") - || type.equals("private-key")) { - SXprUtils.skipOpenParenthesis(inputStream); - - String keyType = SXprUtils.readString(inputStream, - inputStream.read()); - if (keyType.equals("ecc")) { - SXprUtils.skipOpenParenthesis(inputStream); - - String curveID = SXprUtils.readString(inputStream, - inputStream.read()); - String curveName = SXprUtils.readString(inputStream, - inputStream.read()); - - if (curveName.startsWith("NIST ")) { - curveName = curveName.substring("NIST ".length()); - } - - SXprUtils.skipCloseParenthesis(inputStream); - - byte[] qVal; - - SXprUtils.skipOpenParenthesis(inputStream); - - type = SXprUtils.readString(inputStream, inputStream.read()); - // JGit: c.f. https://github.com/bcgit/bc-java/issues/1590. - // There may be a flags sub-list here for ed25519 or curve25519. - if (type.equals("flags")) { - SXprUtils.readString(inputStream, inputStream.read()); - SXprUtils.skipCloseParenthesis(inputStream); - SXprUtils.skipOpenParenthesis(inputStream); - type = SXprUtils.readString(inputStream, - inputStream.read()); - } - if (type.equals("q")) { - qVal = SXprUtils.readBytes(inputStream, inputStream.read()); - } else { - throw new PGPException("no q value found"); - } - - PublicKeyPacket pubPacket = new PublicKeyPacket( - PublicKeyAlgorithmTags.ECDSA, new Date(), - new ECDSAPublicBCPGKey( - ECNamedCurveTable.getOID(curveName), - new BigInteger(1, qVal))); - - SXprUtils.skipCloseParenthesis(inputStream); - - BigInteger d = processECSecretKey(inputStream, curveID, - curveName, qVal, keyProtectionRemoverFactory); - - return new PGPSecretKey( - new SecretKeyPacket(pubPacket, - SymmetricKeyAlgorithmTags.NULL, null, null, - new ECSecretBCPGKey(d).getEncoded()), - new PGPPublicKey(pubPacket, fingerPrintCalculator)); - } else if (keyType.equals("dsa")) { - BigInteger p = readBigInteger("p", inputStream); - BigInteger q = readBigInteger("q", inputStream); - BigInteger g = readBigInteger("g", inputStream); - - BigInteger y = readBigInteger("y", inputStream); - - BigInteger x = processDSASecretKey(inputStream, p, q, g, y, - keyProtectionRemoverFactory); - - PublicKeyPacket pubPacket = new PublicKeyPacket( - PublicKeyAlgorithmTags.DSA, new Date(), - new DSAPublicBCPGKey(p, q, g, y)); - - return new PGPSecretKey( - new SecretKeyPacket(pubPacket, - SymmetricKeyAlgorithmTags.NULL, null, null, - new DSASecretBCPGKey(x).getEncoded()), - new PGPPublicKey(pubPacket, fingerPrintCalculator)); - } else if (keyType.equals("elg")) { - BigInteger p = readBigInteger("p", inputStream); - BigInteger g = readBigInteger("g", inputStream); - - BigInteger y = readBigInteger("y", inputStream); - - BigInteger x = processElGamalSecretKey(inputStream, p, g, y, - keyProtectionRemoverFactory); - - PublicKeyPacket pubPacket = new PublicKeyPacket( - PublicKeyAlgorithmTags.ELGAMAL_ENCRYPT, new Date(), - new ElGamalPublicBCPGKey(p, g, y)); - - return new PGPSecretKey( - new SecretKeyPacket(pubPacket, - SymmetricKeyAlgorithmTags.NULL, null, null, - new ElGamalSecretBCPGKey(x).getEncoded()), - new PGPPublicKey(pubPacket, fingerPrintCalculator)); - } else if (keyType.equals("rsa")) { - BigInteger n = readBigInteger("n", inputStream); - BigInteger e = readBigInteger("e", inputStream); - - BigInteger[] values = processRSASecretKey(inputStream, n, e, - keyProtectionRemoverFactory); - - // TODO: type of RSA key? - PublicKeyPacket pubPacket = new PublicKeyPacket( - PublicKeyAlgorithmTags.RSA_GENERAL, new Date(), - new RSAPublicBCPGKey(n, e)); - - return new PGPSecretKey( - new SecretKeyPacket(pubPacket, - SymmetricKeyAlgorithmTags.NULL, null, null, - new RSASecretBCPGKey(values[0], values[1], - values[2]).getEncoded()), - new PGPPublicKey(pubPacket, fingerPrintCalculator)); - } else { - throw new PGPException("unknown key type: " + keyType); - } - } - - throw new PGPException("unknown key type found"); - } - private BigInteger readBigInteger(String expectedType, InputStream inputStream) throws IOException, PGPException { SXprUtils.skipOpenParenthesis(inputStream); -- cgit v1.2.3 From b2accb0e9c07fa40fa9d7bf266a5763a1f63cc90 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Wed, 6 Nov 2024 19:14:47 +0100 Subject: GPG: use BC PGP secret key parsing out of the box Remove the custom S-expression parsing; BC has gotten many improvements in 1.79 regarding PGP ed25519 keys, AES/OCB encryption, and generally parsing key files. It now can do all we need. Change-Id: I392443e040cce150a9575d18795a7cb8195a3515 Signed-off-by: Thomas Wolf --- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 11 +- .../jgit/gpg/bc/internal/keys/SecretKeysTest.java | 62 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 37 +- org.eclipse.jgit.gpg.bc/about.html | 26 - .../eclipse/jgit/gpg/bc/internal/BCText.properties | 14 +- .../org/eclipse/jgit/gpg/bc/internal/BCText.java | 16 +- .../gpg/bc/internal/BouncyCastleGpgSigner.java | 3 +- .../keys/OCBPBEProtectionRemoverFactory.java | 132 ---- .../jgit/gpg/bc/internal/keys/SExprParser.java | 711 --------------------- .../jgit/gpg/bc/internal/keys/SXprUtils.java | 110 ---- .../jgit/gpg/bc/internal/keys/SecretKeys.java | 557 ++-------------- 11 files changed, 94 insertions(+), 1585 deletions(-) delete mode 100644 org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java delete mode 100644 org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SExprParser.java delete mode 100644 org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SXprUtils.java diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index c71f9b6541..a86f5ab2c6 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -8,11 +8,12 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.bouncycastle.jce.provider;version="[1.65.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.65.0,2.0.0)", - org.bouncycastle.openpgp.operator;version="[1.65.0,2.0.0)", - org.bouncycastle.openpgp.operator.jcajce;version="[1.65.0,2.0.0)", - org.bouncycastle.util.encoders;version="[1.65.0,2.0.0)", +Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.79.0,2.0.0)", + org.bouncycastle.jce.provider;version="[1.79.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.79.0,2.0.0)", + org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)", + org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", + org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", org.eclipse.jgit.gpg.bc.internal;version="[7.1.0,7.2.0)", org.eclipse.jgit.gpg.bc.internal.keys;version="[7.1.0,7.2.0)", org.eclipse.jgit.util.sha1;version="[7.1.0,7.2.0)", diff --git a/org.eclipse.jgit.gpg.bc.test/tst/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeysTest.java b/org.eclipse.jgit.gpg.bc.test/tst/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeysTest.java index fed06103b6..d486c977f0 100644 --- a/org.eclipse.jgit.gpg.bc.test/tst/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeysTest.java +++ b/org.eclipse.jgit.gpg.bc.test/tst/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeysTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Thomas Wolf and others + * Copyright (C) 2021, 2024 Thomas Wolf and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -9,10 +9,7 @@ */ package org.eclipse.jgit.gpg.bc.internal.keys; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import java.io.BufferedInputStream; import java.io.IOException; @@ -20,8 +17,6 @@ import java.io.InputStream; import java.security.Security; import java.util.Iterator; -import javax.crypto.Cipher; - import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; @@ -49,39 +44,15 @@ public class SecretKeysTest { } } - private static volatile Boolean haveOCB; - - private static boolean ocbAvailable() { - Boolean haveIt = haveOCB; - if (haveIt != null) { - return haveIt.booleanValue(); - } - try { - Cipher c = Cipher.getInstance("AES/OCB/NoPadding"); //$NON-NLS-1$ - if (c == null) { - haveOCB = Boolean.FALSE; - return false; - } - } catch (NoClassDefFoundError | Exception e) { - haveOCB = Boolean.FALSE; - return false; - } - haveOCB = Boolean.TRUE; - return true; - } - private static class TestData { final String name; final boolean encrypted; - final boolean keyValue; - - TestData(String name, boolean encrypted, boolean keyValue) { + TestData(String name, boolean encrypted) { this.name = name; this.encrypted = encrypted; - this.keyValue = keyValue; } @Override @@ -93,19 +64,12 @@ public class SecretKeysTest { @Parameters(name = "{0}") public static TestData[] initTestData() { return new TestData[] { - new TestData("AFDA8EA10E185ACF8C0D0F8885A0EF61A72ECB11", false, false), - new TestData("2FB05DBB70FC07CB84C13431F640CA6CEA1DBF8A", false, true), - new TestData("66CCECEC2AB46A9735B10FEC54EDF9FD0F77BAF9", true, true), - new TestData("F727FAB884DA3BD402B6E0F5472E108D21033124", true, true), - new TestData("62D43D7F117F7A5E4998ECB6617EE9942D069C14", true, true), - new TestData("faked", false, true) }; - } - - private static byte[] readTestKey(String filename) throws Exception { - try (InputStream in = new BufferedInputStream( - SecretKeysTest.class.getResourceAsStream(filename))) { - return SecretKeys.keyFromNameValueFormat(in); - } + new TestData("AFDA8EA10E185ACF8C0D0F8885A0EF61A72ECB11", false), + new TestData("2FB05DBB70FC07CB84C13431F640CA6CEA1DBF8A", false), + new TestData("66CCECEC2AB46A9735B10FEC54EDF9FD0F77BAF9", true), + new TestData("F727FAB884DA3BD402B6E0F5472E108D21033124", true), + new TestData("62D43D7F117F7A5E4998ECB6617EE9942D069C14", true), + new TestData("faked", false) }; } private static PGPPublicKey readAsc(InputStream in) @@ -131,11 +95,6 @@ public class SecretKeysTest { @Test public void testKeyRead() throws Exception { - if (data.keyValue) { - byte[] bytes = readTestKey(data.name + ".key"); - assertEquals('(', bytes[0]); - assertEquals(')', bytes[bytes.length - 1]); - } try (InputStream pubIn = this.getClass() .getResourceAsStream(data.name + ".asc")) { if (pubIn != null) { @@ -151,11 +110,6 @@ public class SecretKeysTest { : null, publicKey); assertNotNull(secretKey); - } catch (PGPException e) { - // Currently we may not be able to load OCB-encrypted keys. - assertTrue(e.toString(), e.getMessage().contains("OCB")); - assertTrue(data.encrypted); - assertFalse(ocbAvailable()); } } } diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 6e3321ebf6..1413c44dcb 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -8,26 +8,23 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)", - org.bouncycastle.asn1.x9;version="[1.69.0,2.0.0)", - org.bouncycastle.bcpg;version="[1.69.0,2.0.0)", - org.bouncycastle.bcpg.sig;version="[1.69.0,2.0.0)", - org.bouncycastle.crypto.ec;version="[1.69.0,2.0.0)", - org.bouncycastle.gpg;version="[1.69.0,2.0.0)", - org.bouncycastle.gpg.keybox;version="[1.69.0,2.0.0)", - org.bouncycastle.gpg.keybox.jcajce;version="[1.69.0,2.0.0)", - org.bouncycastle.jcajce.interfaces;version="[1.69.0,2.0.0)", - org.bouncycastle.jcajce.util;version="[1.69.0,2.0.0)", - org.bouncycastle.jce.provider;version="[1.69.0,2.0.0)", - org.bouncycastle.math.ec;version="[1.69.0,2.0.0)", - org.bouncycastle.math.field;version="[1.69.0,2.0.0)", - org.bouncycastle.openpgp;version="[1.69.0,2.0.0)", - org.bouncycastle.openpgp.jcajce;version="[1.69.0,2.0.0)", - org.bouncycastle.openpgp.operator;version="[1.69.0,2.0.0)", - org.bouncycastle.openpgp.operator.jcajce;version="[1.69.0,2.0.0)", - org.bouncycastle.util;version="[1.69.0,2.0.0)", - org.bouncycastle.util.encoders;version="[1.69.0,2.0.0)", - org.bouncycastle.util.io;version="[1.69.0,2.0.0)", +Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", + org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", + org.bouncycastle.bcpg;version="[1.79.0,2.0.0)", + org.bouncycastle.bcpg.sig;version="[1.79.0,2.0.0)", + org.bouncycastle.crypto.ec;version="[1.79.0,2.0.0)", + org.bouncycastle.gpg;version="[1.79.0,2.0.0)", + org.bouncycastle.gpg.keybox;version="[1.79.0,2.0.0)", + org.bouncycastle.gpg.keybox.jcajce;version="[1.79.0,2.0.0)", + org.bouncycastle.jcajce.interfaces;version="[1.79.0,2.0.0)", + org.bouncycastle.jcajce.util;version="[1.79.0,2.0.0)", + org.bouncycastle.math.ec;version="[1.79.0,2.0.0)", + org.bouncycastle.math.field;version="[1.79.0,2.0.0)", + org.bouncycastle.openpgp;version="[1.79.0,2.0.0)", + org.bouncycastle.openpgp.jcajce;version="[1.79.0,2.0.0)", + org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)", + org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", + org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test", org.eclipse.jgit.gpg.bc.internal.keys;version="7.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/about.html b/org.eclipse.jgit.gpg.bc/about.html index fc527d5a3a..92b9409831 100644 --- a/org.eclipse.jgit.gpg.bc/about.html +++ b/org.eclipse.jgit.gpg.bc/about.html @@ -58,32 +58,6 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-
-

org.eclipse.jgit.gpg.bc.internal.keys.SExprParser - MIT

- -

Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc. -(https://www.bouncycastle.org)

- -

-Permission is hereby granted, free of charge, to any person obtaining a copy of this software -and associated documentation files (the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: -

-

-The above copyright notice and this permission notice shall be included in all copies or substantial -portions of the Software. -

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR -PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -

- diff --git a/org.eclipse.jgit.gpg.bc/resources/org/eclipse/jgit/gpg/bc/internal/BCText.properties b/org.eclipse.jgit.gpg.bc/resources/org/eclipse/jgit/gpg/bc/internal/BCText.properties index 77ca2cd0a4..9e7f98cab1 100644 --- a/org.eclipse.jgit.gpg.bc/resources/org/eclipse/jgit/gpg/bc/internal/BCText.properties +++ b/org.eclipse.jgit.gpg.bc/resources/org/eclipse/jgit/gpg/bc/internal/BCText.properties @@ -1,7 +1,5 @@ corrupt25519Key=Ed25519/Curve25519 public key has wrong length: {0} credentialPassphrase=Passphrase -cryptCipherError=Cannot create cipher to decrypt: {0} -cryptWrongDecryptedLength=Decrypted key has wrong length; expected {0} bytes, got only {1} bytes gpgFailedToParseSecretKey=Failed to parse secret key file {0}. Is the entered passphrase correct? gpgNoCredentialsProvider=missing credentials provider gpgNoKeygrip=Cannot find key {0}: cannot determine key grip @@ -9,22 +7,14 @@ gpgNoKeyring=neither pubring.kbx nor secring.gpg files found gpgNoKeyInLegacySecring=no matching secret key found in legacy secring.gpg for key or user id: {0} gpgNoPublicKeyFound=Unable to find a public-key with key or user id: {0} gpgNoSecretKeyForPublicKey=unable to find associated secret key for public key: {0} -gpgNoSuchAlgorithm=Cannot decrypt encrypted secret key: encryption algorithm {0} is not available gpgNotASigningKey=Secret key ({0}) is not suitable for signing gpgKeyInfo=GPG Key (fingerprint {0}) gpgSigningCancelled=Signing was cancelled +keyAlgorithmMismatch=Secret key has a different algorithm than the public key +keyMismatch=Secret key does not match public key; public key is {0} {1} while secret key is for {2} {3} logWarnGnuPGHome=Cannot access GPG home directory given by environment variable GNUPGHOME={} logWarnGpgHomeProperty=Cannot access GPG home directory given by Java system property jgit.gpg.home={} nonSignatureError=Signature does not decode into a signature object -secretKeyTooShort=Secret key file corrupt; only {0} bytes read -sexprHexNotClosed=Hex number in s-expression not closed -sexprHexOdd=Hex number in s-expression has an odd number of digits -sexprStringInvalidEscape=Invalid escape {0} in s-expression -sexprStringInvalidEscapeAtEnd=Invalid s-expression: quoted string ends with escape character -sexprStringInvalidHexEscape=Invalid hex escape in s-expression -sexprStringInvalidOctalEscape=Invalid octal escape in s-expression -sexprStringNotClosed=String in s-expression not closed -sexprUnhandled=Unhandled token {0} in s-expression signatureInconsistent=Inconsistent signature; key ID {0} does not match issuer fingerprint {1} signatureKeyLookupError=Error occurred while looking for public key signatureNoKeyInfo=No way to determine a public key from the signature diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BCText.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BCText.java index 705e195e44..fcae7c2b98 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BCText.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BCText.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2021 Salesforce and others + * Copyright (C) 2018, 2024 Salesforce and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -30,8 +30,6 @@ public final class BCText extends TranslationBundle { // @formatter:off /***/ public String corrupt25519Key; /***/ public String credentialPassphrase; - /***/ public String cryptCipherError; - /***/ public String cryptWrongDecryptedLength; /***/ public String gpgFailedToParseSecretKey; /***/ public String gpgNoCredentialsProvider; /***/ public String gpgNoKeygrip; @@ -39,22 +37,14 @@ public final class BCText extends TranslationBundle { /***/ public String gpgNoKeyInLegacySecring; /***/ public String gpgNoPublicKeyFound; /***/ public String gpgNoSecretKeyForPublicKey; - /***/ public String gpgNoSuchAlgorithm; /***/ public String gpgNotASigningKey; /***/ public String gpgKeyInfo; /***/ public String gpgSigningCancelled; + /***/ public String keyAlgorithmMismatch; + /***/ public String keyMismatch; /***/ public String logWarnGnuPGHome; /***/ public String logWarnGpgHomeProperty; /***/ public String nonSignatureError; - /***/ public String secretKeyTooShort; - /***/ public String sexprHexNotClosed; - /***/ public String sexprHexOdd; - /***/ public String sexprStringInvalidEscape; - /***/ public String sexprStringInvalidEscapeAtEnd; - /***/ public String sexprStringInvalidHexEscape; - /***/ public String sexprStringInvalidOctalEscape; - /***/ public String sexprStringNotClosed; - /***/ public String sexprUnhandled; /***/ public String signatureInconsistent; /***/ public String signatureKeyLookupError; /***/ public String signatureNoKeyInfo; diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java index 1d187a5db2..adac9b199d 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgSigner.java @@ -105,7 +105,8 @@ public class BouncyCastleGpgSigner implements Signer { PGPSignatureGenerator signatureGenerator = new PGPSignatureGenerator( new JcaPGPContentSignerBuilder( publicKey.getAlgorithm(), - HashAlgorithmTags.SHA256)); + HashAlgorithmTags.SHA256), + publicKey); signatureGenerator.init(PGPSignature.BINARY_DOCUMENT, privateKey); PGPSignatureSubpacketGenerator subpackets = new PGPSignatureSubpacketGenerator(); subpackets.setIssuerFingerprint(false, publicKey); diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java deleted file mode 100644 index e6f1decbc1..0000000000 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/OCBPBEProtectionRemoverFactory.java +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright (C) 2021 Thomas Wolf and others - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ -package org.eclipse.jgit.gpg.bc.internal.keys; - -import java.security.NoSuchAlgorithmException; -import java.text.MessageFormat; - -import javax.crypto.Cipher; -import javax.crypto.SecretKey; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; - -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPUtil; -import org.bouncycastle.openpgp.operator.PBEProtectionRemoverFactory; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; -import org.bouncycastle.util.Arrays; -import org.eclipse.jgit.gpg.bc.internal.BCText; - -/** - * A {@link PBEProtectionRemoverFactory} using AES/OCB/NoPadding for decryption. - * It accepts an AAD in the factory's constructor, so the factory can be used to - * create a {@link PBESecretKeyDecryptor} only for a particular input. - *

- * For JGit's needs, this is sufficient, but for a general upstream - * implementation that limitation might not be acceptable. - *

- */ -class OCBPBEProtectionRemoverFactory - implements PBEProtectionRemoverFactory { - - private final PGPDigestCalculatorProvider calculatorProvider; - - private final char[] passphrase; - - private final byte[] aad; - - /** - * Creates a new factory instance with the given parameters. - *

- * Because the AAD is given at factory level, the {@link PBESecretKeyDecryptor}s - * created by the factory can be used to decrypt only a particular input - * matching this AAD. - *

- * - * @param passphrase to use for secret key derivation - * @param calculatorProvider for computing digests - * @param aad for the OCB decryption - */ - OCBPBEProtectionRemoverFactory(char[] passphrase, - PGPDigestCalculatorProvider calculatorProvider, byte[] aad) { - this.calculatorProvider = calculatorProvider; - this.passphrase = passphrase; - this.aad = aad; - } - - @Override - public PBESecretKeyDecryptor createDecryptor(String protection) - throws PGPException { - return new PBESecretKeyDecryptor(passphrase, calculatorProvider) { - - @Override - public byte[] recoverKeyData(int encAlgorithm, byte[] key, - byte[] iv, byte[] encrypted, int encryptedOffset, - int encryptedLength) throws PGPException { - String algorithmName = PGPUtil - .getSymmetricCipherName(encAlgorithm); - byte[] decrypted = null; - try { - // errorprone: "Dynamically constructed transformation - // strings are also flagged, as they may conceal an instance - // of ECB mode." - @SuppressWarnings("InsecureCryptoUsage") - Cipher c = Cipher - .getInstance(algorithmName + "/OCB/NoPadding"); //$NON-NLS-1$ - SecretKey secretKey = new SecretKeySpec(key, algorithmName); - c.init(Cipher.DECRYPT_MODE, secretKey, - new IvParameterSpec(iv)); - c.updateAAD(aad); - decrypted = new byte[c.getOutputSize(encryptedLength)]; - int decryptedLength = c.update(encrypted, encryptedOffset, - encryptedLength, decrypted); - // doFinal() for OCB will check the MAC and throw an - // exception if it doesn't match - decryptedLength += c.doFinal(decrypted, decryptedLength); - if (decryptedLength != decrypted.length) { - throw new PGPException(MessageFormat.format( - BCText.get().cryptWrongDecryptedLength, - Integer.valueOf(decryptedLength), - Integer.valueOf(decrypted.length))); - } - byte[] result = decrypted; - decrypted = null; // Don't clear in finally - return result; - } catch (NoClassDefFoundError e) { - String msg = MessageFormat.format( - BCText.get().gpgNoSuchAlgorithm, - algorithmName + "/OCB"); //$NON-NLS-1$ - throw new PGPException(msg, - new NoSuchAlgorithmException(msg, e)); - } catch (PGPException e) { - throw e; - } catch (Exception e) { - throw new PGPException( - MessageFormat.format(BCText.get().cryptCipherError, - e.getLocalizedMessage()), - e); - } finally { - if (decrypted != null) { - // Prevent halfway decrypted data leaking. - Arrays.fill(decrypted, (byte) 0); - } - } - } - - @Override - public byte[] recoverKeyData(int encAlgorithm, int aeadAlgorithm, - byte[] s2kKey, byte[] iv, int packetTag, int keyVersion, - byte[] keyData, byte[] pubkeyData) throws PGPException { - throw new UnsupportedOperationException(); - } - }; - } -} \ No newline at end of file diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SExprParser.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SExprParser.java deleted file mode 100644 index b062eadb43..0000000000 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SExprParser.java +++ /dev/null @@ -1,711 +0,0 @@ -/* - * Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) - *

- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software - * and associated documentation files (the "Software"), to deal in the Software without restriction, - *including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - *

- *

- * The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. - *

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *

- */ -package org.eclipse.jgit.gpg.bc.internal.keys; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.math.BigInteger; - -import org.bouncycastle.asn1.ASN1ObjectIdentifier; -import org.bouncycastle.asn1.x9.ECNamedCurveTable; -import org.bouncycastle.bcpg.DSAPublicBCPGKey; -import org.bouncycastle.bcpg.DSASecretBCPGKey; -import org.bouncycastle.bcpg.ECDSAPublicBCPGKey; -import org.bouncycastle.bcpg.ECPublicBCPGKey; -import org.bouncycastle.bcpg.ECSecretBCPGKey; -import org.bouncycastle.bcpg.ElGamalPublicBCPGKey; -import org.bouncycastle.bcpg.ElGamalSecretBCPGKey; -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.RSAPublicBCPGKey; -import org.bouncycastle.bcpg.RSASecretBCPGKey; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.bcpg.SecretKeyPacket; -import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; -import org.bouncycastle.openpgp.PGPException; -import org.bouncycastle.openpgp.PGPPublicKey; -import org.bouncycastle.openpgp.PGPSecretKey; -import org.bouncycastle.openpgp.operator.PBEProtectionRemoverFactory; -import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor; -import org.bouncycastle.openpgp.operator.PGPDigestCalculator; -import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; -import org.bouncycastle.util.Arrays; -import org.bouncycastle.util.Strings; - -/** - * A parser for secret keys stored in s-expressions. Original BouncyCastle code - * modified by the JGit team to: - *
    - *
  • handle unencrypted DSA, EC, and ElGamal keys (upstream only handles - * unencrypted RSA)
    • - *
  • handle secret keys using AES/OCB as encryption (those don't have a - * hash)
    • - *
  • fix EC parsing to account for "flags" sub-list present for ed25519 and - * curve25519
    • - *
  • add support for ed25519 OIDs unknown to BouncyCastle
    • - *
- */ -@SuppressWarnings("nls") -public class SExprParser { - private final PGPDigestCalculatorProvider digestProvider; - - /** - * Base constructor. - * - * @param digestProvider - * a provider for digest calculations. Used to confirm key - * protection hashes. - */ - public SExprParser(PGPDigestCalculatorProvider digestProvider) { - this.digestProvider = digestProvider; - } - - /** - * Parse a secret key from one of the GPG S expression keys associating it - * with the passed in public key. - * - * @param inputStream - * to read from - * @param keyProtectionRemoverFactory - * for decrypting encrypted keys - * @param pubKey - * the private key should belong to - * - * @return a secret key object. - * @throws IOException - * if an IO error occurred - * @throws PGPException - * if some PGP error occurred - */ - public PGPSecretKey parseSecretKey(InputStream inputStream, - PBEProtectionRemoverFactory keyProtectionRemoverFactory, - PGPPublicKey pubKey) throws IOException, PGPException { - SXprUtils.skipOpenParenthesis(inputStream); - - String type; - - type = SXprUtils.readString(inputStream, inputStream.read()); - if (type.equals("protected-private-key") - || type.equals("private-key")) { - SXprUtils.skipOpenParenthesis(inputStream); - - String keyType = SXprUtils.readString(inputStream, - inputStream.read()); - if (keyType.equals("ecc")) { - SXprUtils.skipOpenParenthesis(inputStream); - - String curveID = SXprUtils.readString(inputStream, - inputStream.read()); - String curveName = SXprUtils.readString(inputStream, - inputStream.read()); - - SXprUtils.skipCloseParenthesis(inputStream); - - byte[] qVal; - - SXprUtils.skipOpenParenthesis(inputStream); - - type = SXprUtils.readString(inputStream, inputStream.read()); - // JGit: c.f. https://github.com/bcgit/bc-java/issues/1590. - // There may be a flags sub-list here for ed25519 or curve25519. - if (type.equals("flags")) { - SXprUtils.readString(inputStream, inputStream.read()); - SXprUtils.skipCloseParenthesis(inputStream); - SXprUtils.skipOpenParenthesis(inputStream); - type = SXprUtils.readString(inputStream, - inputStream.read()); - } - if (type.equals("q")) { - qVal = SXprUtils.readBytes(inputStream, inputStream.read()); - } else { - throw new PGPException("no q value found"); - } - - SXprUtils.skipCloseParenthesis(inputStream); - - BigInteger d = processECSecretKey(inputStream, curveID, - curveName, qVal, keyProtectionRemoverFactory); - - if (curveName.startsWith("NIST ")) { - curveName = curveName.substring("NIST ".length()); - } - - // JGit: BC doesn't know Ed25519 curve name. - ASN1ObjectIdentifier curveOid = ECNamedCurveTable - .getOID(curveName); - if (curveOid == null) { - curveOid = ObjectIds.getByName(curveName); - } - ECPublicBCPGKey basePubKey = new ECDSAPublicBCPGKey( - curveOid, - new BigInteger(1, qVal)); - ECPublicBCPGKey assocPubKey = (ECPublicBCPGKey) pubKey - .getPublicKeyPacket().getKey(); - if (!ObjectIds.match(basePubKey.getCurveOID(), - assocPubKey.getCurveOID()) - || !basePubKey.getEncodedPoint() - .equals(assocPubKey.getEncodedPoint())) { - throw new PGPException( - "passed in public key does not match secret key"); - } - - return new PGPSecretKey( - new SecretKeyPacket(pubKey.getPublicKeyPacket(), - SymmetricKeyAlgorithmTags.NULL, null, null, - new ECSecretBCPGKey(d).getEncoded()), - pubKey); - } else if (keyType.equals("dsa")) { - BigInteger p = readBigInteger("p", inputStream); - BigInteger q = readBigInteger("q", inputStream); - BigInteger g = readBigInteger("g", inputStream); - - BigInteger y = readBigInteger("y", inputStream); - - BigInteger x = processDSASecretKey(inputStream, p, q, g, y, - keyProtectionRemoverFactory); - - DSAPublicBCPGKey basePubKey = new DSAPublicBCPGKey(p, q, g, y); - DSAPublicBCPGKey assocPubKey = (DSAPublicBCPGKey) pubKey - .getPublicKeyPacket().getKey(); - if (!basePubKey.getP().equals(assocPubKey.getP()) - || !basePubKey.getQ().equals(assocPubKey.getQ()) - || !basePubKey.getG().equals(assocPubKey.getG()) - || !basePubKey.getY().equals(assocPubKey.getY())) { - throw new PGPException( - "passed in public key does not match secret key"); - } - return new PGPSecretKey( - new SecretKeyPacket(pubKey.getPublicKeyPacket(), - SymmetricKeyAlgorithmTags.NULL, null, null, - new DSASecretBCPGKey(x).getEncoded()), - pubKey); - } else if (keyType.equals("elg")) { - BigInteger p = readBigInteger("p", inputStream); - BigInteger g = readBigInteger("g", inputStream); - - BigInteger y = readBigInteger("y", inputStream); - - BigInteger x = processElGamalSecretKey(inputStream, p, g, y, - keyProtectionRemoverFactory); - - ElGamalPublicBCPGKey basePubKey = new ElGamalPublicBCPGKey(p, g, - y); - ElGamalPublicBCPGKey assocPubKey = (ElGamalPublicBCPGKey) pubKey - .getPublicKeyPacket().getKey(); - if (!basePubKey.getP().equals(assocPubKey.getP()) - || !basePubKey.getG().equals(assocPubKey.getG()) - || !basePubKey.getY().equals(assocPubKey.getY())) { - throw new PGPException( - "passed in public key does not match secret key"); - } - - return new PGPSecretKey( - new SecretKeyPacket(pubKey.getPublicKeyPacket(), - SymmetricKeyAlgorithmTags.NULL, null, null, - new ElGamalSecretBCPGKey(x).getEncoded()), - pubKey); - } else if (keyType.equals("rsa")) { - BigInteger n = readBigInteger("n", inputStream); - BigInteger e = readBigInteger("e", inputStream); - - BigInteger[] values = processRSASecretKey(inputStream, n, e, - keyProtectionRemoverFactory); - - // TODO: type of RSA key? - RSAPublicBCPGKey basePubKey = new RSAPublicBCPGKey(n, e); - RSAPublicBCPGKey assocPubKey = (RSAPublicBCPGKey) pubKey - .getPublicKeyPacket().getKey(); - if (!basePubKey.getModulus().equals(assocPubKey.getModulus()) - || !basePubKey.getPublicExponent() - .equals(assocPubKey.getPublicExponent())) { - throw new PGPException( - "passed in public key does not match secret key"); - } - - return new PGPSecretKey(new SecretKeyPacket( - pubKey.getPublicKeyPacket(), - SymmetricKeyAlgorithmTags.NULL, null, null, - new RSASecretBCPGKey(values[0], values[1], values[2]) - .getEncoded()), - pubKey); - } else { - throw new PGPException("unknown key type: " + keyType); - } - } - - throw new PGPException("unknown key type found"); - } - - private BigInteger readBigInteger(String expectedType, - InputStream inputStream) throws IOException, PGPException { - SXprUtils.skipOpenParenthesis(inputStream); - - String type = SXprUtils.readString(inputStream, inputStream.read()); - if (!type.equals(expectedType)) { - throw new PGPException(expectedType + " value expected"); - } - - byte[] nBytes = SXprUtils.readBytes(inputStream, inputStream.read()); - BigInteger v = new BigInteger(1, nBytes); - - SXprUtils.skipCloseParenthesis(inputStream); - - return v; - } - - private static byte[][] extractData(InputStream inputStream, - PBEProtectionRemoverFactory keyProtectionRemoverFactory) - throws PGPException, IOException { - byte[] data; - byte[] protectedAt = null; - - SXprUtils.skipOpenParenthesis(inputStream); - - String type = SXprUtils.readString(inputStream, inputStream.read()); - if (type.equals("protected")) { - String protection = SXprUtils.readString(inputStream, - inputStream.read()); - - SXprUtils.skipOpenParenthesis(inputStream); - - S2K s2k = SXprUtils.parseS2K(inputStream); - - byte[] iv = SXprUtils.readBytes(inputStream, inputStream.read()); - - SXprUtils.skipCloseParenthesis(inputStream); - - byte[] secKeyData = SXprUtils.readBytes(inputStream, - inputStream.read()); - - SXprUtils.skipCloseParenthesis(inputStream); - - PBESecretKeyDecryptor keyDecryptor = keyProtectionRemoverFactory - .createDecryptor(protection); - - // TODO: recognise other algorithms - byte[] key = keyDecryptor.makeKeyFromPassPhrase( - SymmetricKeyAlgorithmTags.AES_128, s2k); - - data = keyDecryptor.recoverKeyData( - SymmetricKeyAlgorithmTags.AES_128, key, iv, secKeyData, 0, - secKeyData.length); - - // check if protected at is present - if (inputStream.read() == '(') { - ByteArrayOutputStream bOut = new ByteArrayOutputStream(); - - bOut.write('('); - int ch; - while ((ch = inputStream.read()) >= 0 && ch != ')') { - bOut.write(ch); - } - - if (ch != ')') { - throw new IOException("unexpected end to SExpr"); - } - - bOut.write(')'); - - protectedAt = bOut.toByteArray(); - } - - SXprUtils.skipCloseParenthesis(inputStream); - SXprUtils.skipCloseParenthesis(inputStream); - } else if (type.equals("d") || type.equals("x")) { - // JGit modification: unencrypted DSA or ECC keys can have an "x" - // here - return null; - } else { - throw new PGPException("protected block not found"); - } - - return new byte[][] { data, protectedAt }; - } - - private BigInteger processDSASecretKey(InputStream inputStream, - BigInteger p, BigInteger q, BigInteger g, BigInteger y, - PBEProtectionRemoverFactory keyProtectionRemoverFactory) - throws IOException, PGPException { - String type; - byte[][] basicData = extractData(inputStream, - keyProtectionRemoverFactory); - - // JGit modification: handle unencrypted DSA keys - if (basicData == null) { - byte[] nBytes = SXprUtils.readBytes(inputStream, - inputStream.read()); - BigInteger x = new BigInteger(1, nBytes); - SXprUtils.skipCloseParenthesis(inputStream); - return x; - } - - byte[] keyData = basicData[0]; - byte[] protectedAt = basicData[1]; - - // - // parse the secret key S-expr - // - InputStream keyIn = new ByteArrayInputStream(keyData); - - SXprUtils.skipOpenParenthesis(keyIn); - SXprUtils.skipOpenParenthesis(keyIn); - - BigInteger x = readBigInteger("x", keyIn); - - SXprUtils.skipCloseParenthesis(keyIn); - - // JGit modification: OCB-encrypted keys don't have and don't need a - // hash - if (keyProtectionRemoverFactory instanceof OCBPBEProtectionRemoverFactory) { - return x; - } - - SXprUtils.skipOpenParenthesis(keyIn); - type = SXprUtils.readString(keyIn, keyIn.read()); - - if (!type.equals("hash")) { - throw new PGPException("hash keyword expected"); - } - type = SXprUtils.readString(keyIn, keyIn.read()); - - if (!type.equals("sha1")) { - throw new PGPException("hash keyword expected"); - } - - byte[] hashBytes = SXprUtils.readBytes(keyIn, keyIn.read()); - - SXprUtils.skipCloseParenthesis(keyIn); - - if (digestProvider != null) { - PGPDigestCalculator digestCalculator = digestProvider - .get(HashAlgorithmTags.SHA1); - - OutputStream dOut = digestCalculator.getOutputStream(); - - dOut.write(Strings.toByteArray("(3:dsa")); - writeCanonical(dOut, "p", p); - writeCanonical(dOut, "q", q); - writeCanonical(dOut, "g", g); - writeCanonical(dOut, "y", y); - writeCanonical(dOut, "x", x); - - // check protected-at - if (protectedAt != null) { - dOut.write(protectedAt); - } - - dOut.write(Strings.toByteArray(")")); - - byte[] check = digestCalculator.getDigest(); - if (!Arrays.constantTimeAreEqual(check, hashBytes)) { - throw new PGPException( - "checksum on protected data failed in SExpr"); - } - } - - return x; - } - - private BigInteger processElGamalSecretKey(InputStream inputStream, - BigInteger p, BigInteger g, BigInteger y, - PBEProtectionRemoverFactory keyProtectionRemoverFactory) - throws IOException, PGPException { - String type; - byte[][] basicData = extractData(inputStream, - keyProtectionRemoverFactory); - - // JGit modification: handle unencrypted EC keys - if (basicData == null) { - byte[] nBytes = SXprUtils.readBytes(inputStream, - inputStream.read()); - BigInteger x = new BigInteger(1, nBytes); - SXprUtils.skipCloseParenthesis(inputStream); - return x; - } - - byte[] keyData = basicData[0]; - byte[] protectedAt = basicData[1]; - - // - // parse the secret key S-expr - // - InputStream keyIn = new ByteArrayInputStream(keyData); - - SXprUtils.skipOpenParenthesis(keyIn); - SXprUtils.skipOpenParenthesis(keyIn); - - BigInteger x = readBigInteger("x", keyIn); - - SXprUtils.skipCloseParenthesis(keyIn); - - // JGit modification: OCB-encrypted keys don't have and don't need a - // hash - if (keyProtectionRemoverFactory instanceof OCBPBEProtectionRemoverFactory) { - return x; - } - - SXprUtils.skipOpenParenthesis(keyIn); - type = SXprUtils.readString(keyIn, keyIn.read()); - - if (!type.equals("hash")) { - throw new PGPException("hash keyword expected"); - } - type = SXprUtils.readString(keyIn, keyIn.read()); - - if (!type.equals("sha1")) { - throw new PGPException("hash keyword expected"); - } - - byte[] hashBytes = SXprUtils.readBytes(keyIn, keyIn.read()); - - SXprUtils.skipCloseParenthesis(keyIn); - - if (digestProvider != null) { - PGPDigestCalculator digestCalculator = digestProvider - .get(HashAlgorithmTags.SHA1); - - OutputStream dOut = digestCalculator.getOutputStream(); - - dOut.write(Strings.toByteArray("(3:elg")); - writeCanonical(dOut, "p", p); - writeCanonical(dOut, "g", g); - writeCanonical(dOut, "y", y); - writeCanonical(dOut, "x", x); - - // check protected-at - if (protectedAt != null) { - dOut.write(protectedAt); - } - - dOut.write(Strings.toByteArray(")")); - - byte[] check = digestCalculator.getDigest(); - if (!Arrays.constantTimeAreEqual(check, hashBytes)) { - throw new PGPException( - "checksum on protected data failed in SExpr"); - } - } - - return x; - } - - private BigInteger processECSecretKey(InputStream inputStream, - String curveID, String curveName, byte[] qVal, - PBEProtectionRemoverFactory keyProtectionRemoverFactory) - throws IOException, PGPException { - String type; - - byte[][] basicData = extractData(inputStream, - keyProtectionRemoverFactory); - - // JGit modification: handle unencrypted EC keys - if (basicData == null) { - byte[] nBytes = SXprUtils.readBytes(inputStream, - inputStream.read()); - BigInteger d = new BigInteger(1, nBytes); - SXprUtils.skipCloseParenthesis(inputStream); - return d; - } - - byte[] keyData = basicData[0]; - byte[] protectedAt = basicData[1]; - - // - // parse the secret key S-expr - // - InputStream keyIn = new ByteArrayInputStream(keyData); - - SXprUtils.skipOpenParenthesis(keyIn); - SXprUtils.skipOpenParenthesis(keyIn); - BigInteger d = readBigInteger("d", keyIn); - SXprUtils.skipCloseParenthesis(keyIn); - - // JGit modification: OCB-encrypted keys don't have and don't need a - // hash - if (keyProtectionRemoverFactory instanceof OCBPBEProtectionRemoverFactory) { - return d; - } - - SXprUtils.skipOpenParenthesis(keyIn); - - type = SXprUtils.readString(keyIn, keyIn.read()); - - if (!type.equals("hash")) { - throw new PGPException("hash keyword expected"); - } - type = SXprUtils.readString(keyIn, keyIn.read()); - - if (!type.equals("sha1")) { - throw new PGPException("hash keyword expected"); - } - - byte[] hashBytes = SXprUtils.readBytes(keyIn, keyIn.read()); - - SXprUtils.skipCloseParenthesis(keyIn); - - if (digestProvider != null) { - PGPDigestCalculator digestCalculator = digestProvider - .get(HashAlgorithmTags.SHA1); - - OutputStream dOut = digestCalculator.getOutputStream(); - - dOut.write(Strings.toByteArray("(3:ecc")); - - dOut.write(Strings.toByteArray("(" + curveID.length() + ":" - + curveID + curveName.length() + ":" + curveName + ")")); - - writeCanonical(dOut, "q", qVal); - writeCanonical(dOut, "d", d); - - // check protected-at - if (protectedAt != null) { - dOut.write(protectedAt); - } - - dOut.write(Strings.toByteArray(")")); - - byte[] check = digestCalculator.getDigest(); - - if (!Arrays.constantTimeAreEqual(check, hashBytes)) { - throw new PGPException( - "checksum on protected data failed in SExpr"); - } - } - - return d; - } - - private BigInteger[] processRSASecretKey(InputStream inputStream, - BigInteger n, BigInteger e, - PBEProtectionRemoverFactory keyProtectionRemoverFactory) - throws IOException, PGPException { - String type; - byte[][] basicData = extractData(inputStream, - keyProtectionRemoverFactory); - - byte[] keyData; - byte[] protectedAt = null; - - InputStream keyIn; - BigInteger d; - - if (basicData == null) { - keyIn = inputStream; - byte[] nBytes = SXprUtils.readBytes(inputStream, - inputStream.read()); - d = new BigInteger(1, nBytes); - - SXprUtils.skipCloseParenthesis(inputStream); - - } else { - keyData = basicData[0]; - protectedAt = basicData[1]; - - keyIn = new ByteArrayInputStream(keyData); - - SXprUtils.skipOpenParenthesis(keyIn); - SXprUtils.skipOpenParenthesis(keyIn); - d = readBigInteger("d", keyIn); - } - - // - // parse the secret key S-expr - // - - BigInteger p = readBigInteger("p", keyIn); - BigInteger q = readBigInteger("q", keyIn); - BigInteger u = readBigInteger("u", keyIn); - - // JGit modification: OCB-encrypted keys don't have and don't need a - // hash - if (basicData == null - || keyProtectionRemoverFactory instanceof OCBPBEProtectionRemoverFactory) { - return new BigInteger[] { d, p, q, u }; - } - - SXprUtils.skipCloseParenthesis(keyIn); - - SXprUtils.skipOpenParenthesis(keyIn); - type = SXprUtils.readString(keyIn, keyIn.read()); - - if (!type.equals("hash")) { - throw new PGPException("hash keyword expected"); - } - type = SXprUtils.readString(keyIn, keyIn.read()); - - if (!type.equals("sha1")) { - throw new PGPException("hash keyword expected"); - } - - byte[] hashBytes = SXprUtils.readBytes(keyIn, keyIn.read()); - - SXprUtils.skipCloseParenthesis(keyIn); - - if (digestProvider != null) { - PGPDigestCalculator digestCalculator = digestProvider - .get(HashAlgorithmTags.SHA1); - - OutputStream dOut = digestCalculator.getOutputStream(); - - dOut.write(Strings.toByteArray("(3:rsa")); - - writeCanonical(dOut, "n", n); - writeCanonical(dOut, "e", e); - writeCanonical(dOut, "d", d); - writeCanonical(dOut, "p", p); - writeCanonical(dOut, "q", q); - writeCanonical(dOut, "u", u); - - // check protected-at - if (protectedAt != null) { - dOut.write(protectedAt); - } - - dOut.write(Strings.toByteArray(")")); - - byte[] check = digestCalculator.getDigest(); - - if (!Arrays.constantTimeAreEqual(check, hashBytes)) { - throw new PGPException( - "checksum on protected data failed in SExpr"); - } - } - - return new BigInteger[] { d, p, q, u }; - } - - private void writeCanonical(OutputStream dOut, String label, BigInteger i) - throws IOException { - writeCanonical(dOut, label, i.toByteArray()); - } - - private void writeCanonical(OutputStream dOut, String label, byte[] data) - throws IOException { - dOut.write(Strings.toByteArray( - "(" + label.length() + ":" + label + data.length + ":")); - dOut.write(data); - dOut.write(Strings.toByteArray(")")); - } -} diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SXprUtils.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SXprUtils.java deleted file mode 100644 index 220aa285ff..0000000000 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SXprUtils.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) - *

- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software - * and associated documentation files (the "Software"), to deal in the Software without restriction, - *including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - *

- *

- * The above copyright notice and this permission notice shall be included in all copies or substantial - * portions of the Software. - *

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, - * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR - * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - *

- */ -package org.eclipse.jgit.gpg.bc.internal.keys; - -// This class is an unmodified copy from Bouncy Castle; needed because it's package-visible only and used by SExprParser. - -import java.io.IOException; -import java.io.InputStream; - -import org.bouncycastle.bcpg.HashAlgorithmTags; -import org.bouncycastle.bcpg.S2K; -import org.bouncycastle.util.io.Streams; - -/** - * Utility functions for looking a S-expression keys. This class will move when - * it finds a better home! - *

- * Format documented here: - * http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob;f=agent/keyformat.txt;h=42c4b1f06faf1bbe71ffadc2fee0fad6bec91a97;hb=refs/heads/master - *

- */ -class SXprUtils { - private static int readLength(InputStream in, int ch) throws IOException { - int len = ch - '0'; - - while ((ch = in.read()) >= 0 && ch != ':') { - len = len * 10 + ch - '0'; - } - - return len; - } - - static String readString(InputStream in, int ch) throws IOException { - int len = readLength(in, ch); - - char[] chars = new char[len]; - - for (int i = 0; i != chars.length; i++) { - chars[i] = (char) in.read(); - } - - return new String(chars); - } - - static byte[] readBytes(InputStream in, int ch) throws IOException { - int len = readLength(in, ch); - - byte[] data = new byte[len]; - - Streams.readFully(in, data); - - return data; - } - - static S2K parseS2K(InputStream in) throws IOException { - skipOpenParenthesis(in); - - // Algorithm is hard-coded to SHA1 below anyway. - readString(in, in.read()); - byte[] iv = readBytes(in, in.read()); - final long iterationCount = Long.parseLong(readString(in, in.read())); - - skipCloseParenthesis(in); - - // we have to return the actual iteration count provided. - S2K s2k = new S2K(HashAlgorithmTags.SHA1, iv, (int) iterationCount) { - @Override - public long getIterationCount() { - return iterationCount; - } - }; - - return s2k; - } - - static void skipOpenParenthesis(InputStream in) throws IOException { - int ch = in.read(); - if (ch != '(') { - throw new IOException( - "unknown character encountered: " + (char) ch); //$NON-NLS-1$ - } - } - - static void skipCloseParenthesis(InputStream in) throws IOException { - int ch = in.read(); - if (ch != ')') { - throw new IOException("unknown character encountered"); //$NON-NLS-1$ - } - } -} diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeys.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeys.java index a659d38fd3..a56e418bf4 100644 --- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeys.java +++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeys.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Thomas Wolf and others + * Copyright (C) 2021, 2024 Thomas Wolf and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -9,34 +9,36 @@ */ package org.eclipse.jgit.gpg.bc.internal.keys; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.EOFException; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.StreamCorruptedException; import java.net.URISyntaxException; -import java.nio.charset.StandardCharsets; import java.text.MessageFormat; -import java.util.Arrays; +import org.bouncycastle.bcpg.ECPublicBCPGKey; +import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; +import org.bouncycastle.gpg.PGPSecretKeyParser; +import org.bouncycastle.gpg.SExprParser; +import org.bouncycastle.openpgp.OpenedPGPKeyData; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKey; import org.bouncycastle.openpgp.PGPSecretKey; import org.bouncycastle.openpgp.operator.PBEProtectionRemoverFactory; import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider; +import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; import org.bouncycastle.openpgp.operator.jcajce.JcePBEProtectionRemoverFactory; -import org.bouncycastle.util.io.Streams; import org.eclipse.jgit.api.errors.CanceledException; import org.eclipse.jgit.errors.UnsupportedCredentialItem; import org.eclipse.jgit.gpg.bc.internal.BCText; -import org.eclipse.jgit.util.RawParseUtils; /** * Utilities for reading GPG secret keys from a gpg-agent key file. */ public final class SecretKeys { + // Maximum nesting depth of sub-lists in an S-Expression for a secret key. + private static final int MAX_SEXPR_NESTING = 20; + private SecretKeys() { // No instantiation. } @@ -64,12 +66,6 @@ public final class SecretKeys { UnsupportedCredentialItem, URISyntaxException; } - private static final byte[] PROTECTED_KEY = "protected-private-key" //$NON-NLS-1$ - .getBytes(StandardCharsets.US_ASCII); - - private static final byte[] OCB_PROTECTED = "openpgp-s2k3-ocb-aes" //$NON-NLS-1$ - .getBytes(StandardCharsets.US_ASCII); - /** * Reads a GPG secret key from the given stream. * @@ -99,500 +95,59 @@ public final class SecretKeys { PassphraseSupplier passphraseSupplier, PGPPublicKey publicKey) throws IOException, PGPException, CanceledException, UnsupportedCredentialItem, URISyntaxException { - byte[] data = Streams.readAll(in); - if (data.length == 0) { - throw new EOFException(); - } else if (data.length < 4 + PROTECTED_KEY.length) { - // +4 for "(21:" for a binary protected key - throw new IOException( - MessageFormat.format(BCText.get().secretKeyTooShort, - Integer.toUnsignedString(data.length))); - } - SExprParser parser = new SExprParser(calculatorProvider); - byte firstChar = data[0]; - try { - if (firstChar == '(') { - // Binary format. - PBEProtectionRemoverFactory decryptor = null; - if (matches(data, 4, PROTECTED_KEY)) { - // AES/CBC encrypted. - decryptor = new JcePBEProtectionRemoverFactory( - passphraseSupplier.getPassphrase(), - calculatorProvider); - } - try (InputStream sIn = new ByteArrayInputStream(data)) { - return parser.parseSecretKey(sIn, decryptor, publicKey); - } - } - // Assume it's the new key-value format. - try (ByteArrayInputStream keyIn = new ByteArrayInputStream(data)) { - byte[] rawData = keyFromNameValueFormat(keyIn); - if (!matches(rawData, 1, PROTECTED_KEY)) { - // Not encrypted human-readable format. - try (InputStream sIn = new ByteArrayInputStream( - convertSexpression(rawData))) { - return parser.parseSecretKey(sIn, null, publicKey); - } - } - // An encrypted key from a key-value file. Most likely AES/OCB - // encrypted. - boolean isOCB[] = { false }; - byte[] sExp = convertSexpression(rawData, isOCB); - PBEProtectionRemoverFactory decryptor; - if (isOCB[0]) { - decryptor = new OCBPBEProtectionRemoverFactory( - passphraseSupplier.getPassphrase(), - calculatorProvider, getAad(sExp)); - } else { - decryptor = new JcePBEProtectionRemoverFactory( - passphraseSupplier.getPassphrase(), - calculatorProvider); - } - try (InputStream sIn = new ByteArrayInputStream(sExp)) { - return parser.parseSecretKey(sIn, decryptor, publicKey); - } - } - } catch (IOException e) { - throw new PGPException(e.getLocalizedMessage(), e); - } - } - - /** - * Extract the AAD for the OCB decryption from an s-expression. - * - * @param sExp - * buffer containing a valid binary s-expression - * @return the AAD - */ - private static byte[] getAad(byte[] sExp) { - // Given a key - // @formatter:off - // (protected-private-key (rsa ... (protected openpgp-s2k3-ocb-aes ... )(protected-at ...))) - // A B C D - // The AAD is [A..B)[C..D). (From the binary serialized form.) - // @formatter:on - int i = 1; // Skip initial '(' - while (sExp[i] != '(') { - i++; - } - int aadStart = i++; - int aadEnd = skip(sExp, aadStart); - byte[] protectedPrefix = "(9:protected" //$NON-NLS-1$ - .getBytes(StandardCharsets.US_ASCII); - while (!matches(sExp, i, protectedPrefix)) { - i++; - } - int protectedStart = i; - int protectedEnd = skip(sExp, protectedStart); - byte[] aadData = new byte[aadEnd - aadStart - - (protectedEnd - protectedStart)]; - System.arraycopy(sExp, aadStart, aadData, 0, protectedStart - aadStart); - System.arraycopy(sExp, protectedEnd, aadData, protectedStart - aadStart, - aadEnd - protectedEnd); - return aadData; - } - - /** - * Skips a list including nested lists. - * - * @param sExp - * buffer containing valid binary s-expression data - * @param start - * index of the opening '(' of the list to skip - * @return the index after the closing ')' of the skipped list - */ - private static int skip(byte[] sExp, int start) { - int i = start + 1; - int depth = 1; - while (depth > 0) { - switch (sExp[i]) { - case '(': - depth++; - break; - case ')': - depth--; - break; - default: - // We must be on a length - int j = i; - while (sExp[j] >= '0' && sExp[j] <= '9') { - j++; - } - // j is on the colon - int length = Integer.parseInt( - new String(sExp, i, j - i, StandardCharsets.US_ASCII)); - i = j + length; - } - i++; - } - return i; - } - - /** - * Checks whether the {@code needle} matches {@code src} at offset - * {@code from}. - * - * @param src - * to match against {@code needle} - * @param from - * position in {@code src} to start matching - * @param needle - * to match against - * @return {@code true} if {@code src} contains {@code needle} at position - * {@code from}, {@code false} otherwise - */ - private static boolean matches(byte[] src, int from, byte[] needle) { - if (from < 0 || from + needle.length > src.length) { - return false; - } - return org.bouncycastle.util.Arrays.constantTimeAreEqual(needle.length, - src, from, needle, 0); - } - - /** - * Converts a human-readable serialized s-expression into a binary - * serialized s-expression. - * - * @param humanForm - * to convert - * @return the converted s-expression - * @throws IOException - * if the conversion fails - */ - private static byte[] convertSexpression(byte[] humanForm) - throws IOException { - boolean[] isOCB = { false }; - return convertSexpression(humanForm, isOCB); - } - - /** - * Converts a human-readable serialized s-expression into a binary - * serialized s-expression. - * - * @param humanForm - * to convert - * @param isOCB - * returns whether the s-expression specified AES/OCB encryption - * @return the converted s-expression - * @throws IOException - * if the conversion fails - */ - private static byte[] convertSexpression(byte[] humanForm, boolean[] isOCB) - throws IOException { - int pos = 0; - try (ByteArrayOutputStream out = new ByteArrayOutputStream( - humanForm.length)) { - while (pos < humanForm.length) { - byte b = humanForm[pos]; - if (b == '(' || b == ')') { - out.write(b); - pos++; - } else if (isGpgSpace(b)) { - pos++; - } else if (b == '#') { - // Hex value follows up to the next # - int i = ++pos; - while (i < humanForm.length && isHex(humanForm[i])) { - i++; - } - if (i == pos || humanForm[i] != '#') { - throw new StreamCorruptedException( - BCText.get().sexprHexNotClosed); - } - if ((i - pos) % 2 != 0) { - throw new StreamCorruptedException( - BCText.get().sexprHexOdd); - } - int l = (i - pos) / 2; - out.write(Integer.toString(l) - .getBytes(StandardCharsets.US_ASCII)); - out.write(':'); - while (pos < i) { - int x = (nibble(humanForm[pos]) << 4) - | nibble(humanForm[pos + 1]); - pos += 2; - out.write(x); - } - pos = i + 1; - } else if (isTokenChar(b)) { - // Scan the token - int start = pos++; - while (pos < humanForm.length - && isTokenChar(humanForm[pos])) { - pos++; - } - int l = pos - start; - if (pos - start == OCB_PROTECTED.length - && matches(humanForm, start, OCB_PROTECTED)) { - isOCB[0] = true; - } - out.write(Integer.toString(l) - .getBytes(StandardCharsets.US_ASCII)); - out.write(':'); - out.write(humanForm, start, pos - start); - } else if (b == '"') { - // Potentially quoted string. - int start = ++pos; - boolean escaped = false; - while (pos < humanForm.length - && (escaped || humanForm[pos] != '"')) { - int ch = humanForm[pos++]; - escaped = !escaped && ch == '\\'; - } - if (pos >= humanForm.length) { - throw new StreamCorruptedException( - BCText.get().sexprStringNotClosed); - } - // start is on the first character of the string, pos on the - // closing quote. - byte[] dq = dequote(humanForm, start, pos); - out.write(Integer.toString(dq.length) - .getBytes(StandardCharsets.US_ASCII)); - out.write(':'); - out.write(dq); - pos++; - } else { - throw new StreamCorruptedException( - MessageFormat.format(BCText.get().sexprUnhandled, - Integer.toHexString(b & 0xFF))); - } - } - return out.toByteArray(); + OpenedPGPKeyData data; + try (InputStream keyIn = new BufferedInputStream(in)) { + data = PGPSecretKeyParser.parse(keyIn, MAX_SEXPR_NESTING); } - } - - /** - * GPG-style string de-quoting, which is basically C-style, with some - * literal CR/LF escaping. - * - * @param in - * buffer containing the quoted string - * @param from - * index after the opening quote in {@code in} - * @param to - * index of the closing quote in {@code in} - * @return the dequoted raw string value - * @throws StreamCorruptedException - * if object stream is corrupt - */ - private static byte[] dequote(byte[] in, int from, int to) - throws StreamCorruptedException { - // Result must be shorter or have the same length - byte[] out = new byte[to - from]; - int j = 0; - int i = from; - while (i < to) { - byte b = in[i++]; - if (b != '\\') { - out[j++] = b; - continue; - } - if (i == to) { - throw new StreamCorruptedException( - BCText.get().sexprStringInvalidEscapeAtEnd); - } - b = in[i++]; - switch (b) { - case 'b': - out[j++] = '\b'; - break; - case 'f': - out[j++] = '\f'; - break; - case 'n': - out[j++] = '\n'; - break; - case 'r': - out[j++] = '\r'; - break; - case 't': - out[j++] = '\t'; - break; - case 'v': - out[j++] = 0x0B; - break; - case '"': - case '\'': - case '\\': - out[j++] = b; - break; - case '\r': - // Escaped literal line end. If an LF is following, skip that, - // too. - if (i < to && in[i] == '\n') { - i++; - } - break; - case '\n': - // Same for LF possibly followed by CR. - if (i < to && in[i] == '\r') { - i++; - } - break; - case 'x': - if (i + 1 >= to || !isHex(in[i]) || !isHex(in[i + 1])) { - throw new StreamCorruptedException( - BCText.get().sexprStringInvalidHexEscape); - } - out[j++] = (byte) ((nibble(in[i]) << 4) | nibble(in[i + 1])); - i += 2; - break; - case '0': - case '1': - case '2': - case '3': - if (i + 2 >= to || !isOctal(in[i]) || !isOctal(in[i + 1]) - || !isOctal(in[i + 2])) { - throw new StreamCorruptedException( - BCText.get().sexprStringInvalidOctalEscape); - } - out[j++] = (byte) (((((in[i] - '0') << 3) - | (in[i + 1] - '0')) << 3) | (in[i + 2] - '0')); - i += 3; - break; - default: - throw new StreamCorruptedException(MessageFormat.format( - BCText.get().sexprStringInvalidEscape, - Integer.toHexString(b & 0xFF))); - } + PBEProtectionRemoverFactory decryptor = null; + if (isProtected(data)) { + decryptor = new JcePBEProtectionRemoverFactory( + passphraseSupplier.getPassphrase(), calculatorProvider); } - return Arrays.copyOf(out, j); - } - - /** - * Extracts the key from a GPG name-value-pair key file. - *

- * Package-visible for tests only. - *

- * - * @param in - * {@link InputStream} to read from; should be buffered - * @return the raw key data as extracted from the file - * @throws IOException - * if the {@code in} stream cannot be read or does not contain a - * key - */ - static byte[] keyFromNameValueFormat(InputStream in) throws IOException { - // It would be nice if we could use RawParseUtils here, but GPG compares - // names case-insensitively. We're only interested in the "Key:" - // name-value pair. - int[] nameLow = { 'k', 'e', 'y', ':' }; - int[] nameCap = { 'K', 'E', 'Y', ':' }; - int nameIdx = 0; - for (;;) { - int next = in.read(); - if (next < 0) { - throw new EOFException(); + switch (publicKey.getAlgorithm()) { + case PublicKeyAlgorithmTags.EDDSA_LEGACY: + case PublicKeyAlgorithmTags.Ed25519: + // If we let Bouncy Castle check whether the secret key matches the + // given public key it may get into trouble in some cases with + // ed25519 keys. It appears that we may end up with secret keys + // using the official RFC 8410 OID for ed25519, "1.3.101.112", while + // the public key passed in may have a non-standard OpenPGP-specific + // OID "1.3.6.1.4.1.11591.15.1", or vice versa. Bouncy Castle then + // throws an exception because of the different OIDs. + // + // The work-around is to just read the secret key, and double-check + // later that the OIDs are compatible and the curve points match. + PGPSecretKey secret = data.getKeyData(null, calculatorProvider, + decryptor, new JcaKeyFingerprintCalculator(), + MAX_SEXPR_NESTING); + PGPPublicKey pubKeyRead = secret.getPublicKey(); + int algoRead = pubKeyRead.getAlgorithm(); + if (algoRead != PublicKeyAlgorithmTags.EDDSA_LEGACY + && algoRead != PublicKeyAlgorithmTags.Ed25519) { + throw new PGPException(BCText.get().keyAlgorithmMismatch); } - if (next == '\n') { - nameIdx = 0; - } else if (nameIdx >= 0) { - if (nameLow[nameIdx] == next || nameCap[nameIdx] == next) { - nameIdx++; - if (nameIdx == nameLow.length) { - break; - } - } else { - nameIdx = -1; - } - } - } - // We're after "Key:". Read the value as continuation lines. - int last = ':'; - byte[] rawData; - try (ByteArrayOutputStream out = new ByteArrayOutputStream(8192)) { - for (;;) { - int next = in.read(); - if (next < 0) { - break; - } - if (last == '\n') { - if (next == ' ' || next == '\t') { - // Continuation line; skip this whitespace - last = next; - continue; - } - break; // Not a continuation line - } - out.write(next); - last = next; + ECPublicBCPGKey ec1 = (ECPublicBCPGKey) publicKey + .getPublicKeyPacket().getKey(); + ECPublicBCPGKey ec2 = (ECPublicBCPGKey) pubKeyRead + .getPublicKeyPacket().getKey(); + if (!ObjectIds.match(ec1.getCurveOID(), ec2.getCurveOID()) + || !ec1.getEncodedPoint().equals(ec2.getEncodedPoint())) { + throw new PGPException( + MessageFormat.format(BCText.get().keyMismatch, + ec1.getCurveOID(), ec1.getEncodedPoint(), + ec2.getCurveOID(), ec2.getEncodedPoint())); } - rawData = out.toByteArray(); - } - // GPG trims off trailing whitespace, and a line having only whitespace - // is a single LF. - try (ByteArrayOutputStream out = new ByteArrayOutputStream( - rawData.length)) { - int lineStart = 0; - boolean trimLeading = true; - while (lineStart < rawData.length) { - int nextLineStart = RawParseUtils.nextLF(rawData, lineStart); - if (trimLeading) { - while (lineStart < nextLineStart - && isGpgSpace(rawData[lineStart])) { - lineStart++; - } - } - // Trim trailing - int i = nextLineStart - 1; - while (lineStart < i && isGpgSpace(rawData[i])) { - i--; - } - if (i <= lineStart) { - // Empty line signifies LF - out.write('\n'); - trimLeading = true; - } else { - out.write(rawData, lineStart, i - lineStart + 1); - trimLeading = false; - } - lineStart = nextLineStart; - } - return out.toByteArray(); - } - } - - private static boolean isGpgSpace(int ch) { - return ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n'; - } - - private static boolean isTokenChar(int ch) { - switch (ch) { - case '-': - case '.': - case '/': - case '_': - case ':': - case '*': - case '+': - case '=': - return true; + return secret; default: - if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') - || (ch >= '0' && ch <= '9')) { - return true; - } - return false; + // For other key types let Bouncy Castle do the check. + return data.getKeyData(publicKey, calculatorProvider, decryptor, + null, MAX_SEXPR_NESTING); } } - private static boolean isHex(int ch) { - return (ch >= '0' && ch <= '9') || (ch >= 'A' && ch <= 'F') - || (ch >= 'a' && ch <= 'f'); + private static boolean isProtected(OpenedPGPKeyData data) { + return SExprParser.ProtectionFormatTypeTags.PROTECTED_PRIVATE_KEY == SExprParser + .getProtectionType(data.getKeyExpression().getString(0)); } - private static boolean isOctal(int ch) { - return (ch >= '0' && ch <= '7'); - } - - private static int nibble(int ch) { - if (ch >= '0' && ch <= '9') { - return ch - '0'; - } else if (ch >= 'A' && ch <= 'F') { - return ch - 'A' + 10; - } else if (ch >= 'a' && ch <= 'f') { - return ch - 'a' + 10; - } - return -1; - } } -- cgit v1.2.3 From 958d053920a27ee1de0b5290099e4f7149de2c4b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 7 Nov 2024 23:35:13 +0100 Subject: Enhance CommitBuilder#parent to tolerate null parent Change-Id: Ifdeafd040bca8331804c3e7568da0bee5cbd01df --- .../src/org/eclipse/jgit/junit/TestRepository.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index a2e0a571eb..66cf739ef1 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -30,6 +30,7 @@ import java.util.List; import java.util.Set; import java.util.TimeZone; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheBuilder; @@ -1144,15 +1145,18 @@ public class TestRepository implements AutoCloseable { } /** - * set parent commit + * Set parent commit * * @param p - * parent commit + * parent commit, can be {@code null} * @return this commit builder * @throws Exception * if an error occurred */ - public CommitBuilder parent(RevCommit p) throws Exception { + public CommitBuilder parent(@Nullable RevCommit p) throws Exception { + if (p == null) { + return this; + } if (parents.isEmpty()) { DirCacheBuilder b = tree.builder(); parseBody(p); -- cgit v1.2.3 From 93ede18ffd17df936da4e8d0ef28e2ba69019c93 Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Fri, 20 Sep 2024 08:47:13 +0200 Subject: Add `numberOfPackFilesAfterBitmap` to RepoStatistics Introduce a `numberOfPackFilesAfterBitmap` that contains the number of packfiles created since the latest bitmap generation. Notes: * the `repo.getObjectDatabase().getPacks()` that obtains the list of packs (in the existing `getStatistics` function) uses `PackDirectory.scanPacks` that boils down to call `PackDirectory.scanPacksImpl` which is sorting packs prior returning them therefore the `numberOfPackFilesAfterBitmap` is just all packs before the one that has bitmap attached * the improved version of `packAndPrune` function (one that skips non-existent packfiles) was introduced for testing Change-Id: I608011462f104fc002ac527aa405f492a8a4b0c2 --- ...NumberOfPackFilesAfterBitmapStatisticsTest.java | 173 +++++++++++++++++++++ .../org/eclipse/jgit/internal/storage/file/GC.java | 13 +- 2 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java new file mode 100644 index 0000000000..e5a391f2e3 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2024 Jacek Centkowski and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import static org.junit.Assert.assertEquals; + +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.StreamSupport; + +import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackWriter; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.util.FileUtils; +import org.junit.Test; + +public class GcNumberOfPackFilesAfterBitmapStatisticsTest extends GcTestCase { + @Test + public void testShouldReportZeroObjectsForInitializedRepo() + throws IOException { + assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap); + } + + @Test + public void testShouldReportAllPackFilesWhenNoGcWasPerformed() + throws Exception { + packAndPrune(); + long result = gc.getStatistics().numberOfPackFilesAfterBitmap; + + assertEquals(repo.getObjectDatabase().getPacks().size(), result); + } + + @Test + public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception { + // given + addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap); + } + + @Test + public void testShouldReportNewObjectsAfterGcWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap); + } + + @Test + public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & gc + parent = addCommit(parent); + gc.gc().get(); + assertEquals(2L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap); + } + + private void packAndPrune() throws Exception { + try (SkipNonExistingFilesTestRepository testRepo = new SkipNonExistingFilesTestRepository( + repo)) { + testRepo.packAndPrune(); + } + } + + private RevCommit addCommit(RevCommit parent) throws Exception { + return tr.branch("master").commit() + .author(new PersonIdent("repo-metrics", "repo@metrics.com")) + .parent(parent).create(); + } + + private long repositoryBitmapFiles() throws IOException { + return StreamSupport + .stream(Files + .newDirectoryStream(repo.getObjectDatabase() + .getPackDirectory().toPath(), "pack-*.bitmap") + .spliterator(), false) + .count(); + } + + /** + * The TestRepository has a {@link TestRepository#packAndPrune()} function + * but it fails in the last step after GC was performed as it doesn't + * SKIP_MISSING files. In order to circumvent it was copied and improved + * here. + */ + private static class SkipNonExistingFilesTestRepository + extends TestRepository { + private final FileRepository repo; + + private SkipNonExistingFilesTestRepository(FileRepository db) throws IOException { + super(db); + repo = db; + } + + @Override + public void packAndPrune() throws Exception { + ObjectDirectory odb = repo.getObjectDatabase(); + NullProgressMonitor m = NullProgressMonitor.INSTANCE; + + final PackFile pack, idx; + try (PackWriter pw = new PackWriter(repo)) { + Set all = new HashSet<>(); + for (Ref r : repo.getRefDatabase().getRefs()) + all.add(r.getObjectId()); + pw.preparePack(m, all, PackWriter.NONE); + + pack = new PackFile(odb.getPackDirectory(), pw.computeName(), + PackExt.PACK); + try (OutputStream out = new BufferedOutputStream( + new FileOutputStream(pack))) { + pw.writePack(m, m, out); + } + pack.setReadOnly(); + + idx = pack.create(PackExt.INDEX); + try (OutputStream out = new BufferedOutputStream( + new FileOutputStream(idx))) { + pw.writeIndex(out); + } + idx.setReadOnly(); + } + + odb.openPack(pack); + updateServerInfo(); + + // alternative packAndPrune implementation that skips missing files + // after GC. + for (Pack p : odb.getPacks()) { + for (MutableEntry e : p) + FileUtils.delete(odb.fileFor(e.toObjectId()), + FileUtils.SKIP_MISSING); + } + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index cf26f8d284..ee6abc372c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1508,6 +1508,12 @@ public class GC { */ public long numberOfPackFiles; + /** + * The number of pack files that were created after the last bitmap + * generation. + */ + public long numberOfPackFilesAfterBitmap; + /** * The number of objects stored as loose objects. */ @@ -1543,6 +1549,8 @@ public class GC { final StringBuilder b = new StringBuilder(); b.append("numberOfPackedObjects=").append(numberOfPackedObjects); //$NON-NLS-1$ b.append(", numberOfPackFiles=").append(numberOfPackFiles); //$NON-NLS-1$ + b.append(", numberOfPackFilesAfterBitmap=") //$NON-NLS-1$ + .append(numberOfPackFilesAfterBitmap); b.append(", numberOfLooseObjects=").append(numberOfLooseObjects); //$NON-NLS-1$ b.append(", numberOfLooseRefs=").append(numberOfLooseRefs); //$NON-NLS-1$ b.append(", numberOfPackedRefs=").append(numberOfPackedRefs); //$NON-NLS-1$ @@ -1567,8 +1575,11 @@ public class GC { ret.numberOfPackedObjects += p.getIndex().getObjectCount(); ret.numberOfPackFiles++; ret.sizeOfPackedObjects += p.getPackFile().length(); - if (p.getBitmapIndex() != null) + if (p.getBitmapIndex() != null) { ret.numberOfBitmaps += p.getBitmapIndex().getBitmapCount(); + } else { + ret.numberOfPackFilesAfterBitmap++; + } } File objDir = repo.getObjectsDirectory(); String[] fanout = objDir.list(); -- cgit v1.2.3 From 88f8321bafeb9476bbb9b42b349521c68e375e4f Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 4 Nov 2024 14:21:24 -0800 Subject: SystemReader: Offer methods with java.time API Error prone explains: The Date API is full of major design flaws and pitfalls and should be avoided at all costs. Prefer the java.time APIs, specifically, java.time.Instant (for physical time) and java.time.LocalDate[Time] (for civil time). Add to SystemReader methods to get the time and timezone in the new java.time classes (Instant/ZoneId) and mark as deprecated their old counterparts. The mapping of methods is: * #getCurrentTime -> #now (returns Instant instead of int) * #getTimezone -> #getTimeZoneAt (returns ZoneOffset intead of int) * #getTimeZone -> #getTimeZoneId (return ZoneId instead of TimeZone) Change-Id: Ic55b2f442a40046ff0ed24f61f566fc7416471be --- .../org/eclipse/jgit/junit/MockSystemReader.java | 18 +++++++ org.eclipse.jgit/.settings/.api_filters | 14 +++++ .../src/org/eclipse/jgit/util/SystemReader.java | 61 ++++++++++++++++++++++ 3 files changed, 93 insertions(+) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index 419fdb1966..b0365aa7e1 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -18,6 +18,9 @@ import java.lang.reflect.Field; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.Duration; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -201,6 +204,11 @@ public class MockSystemReader extends SystemReader { return now; } + @Override + public Instant now() { + return Instant.ofEpochMilli(now); + } + @Override public MonotonicClock getClock() { return () -> { @@ -236,11 +244,21 @@ public class MockSystemReader extends SystemReader { return getTimeZone().getOffset(when) / (60 * 1000); } + @Override + public ZoneOffset getTimeZoneAt(Instant when) { + return getTimeZoneId().getRules().getOffset(when); + } + @Override public TimeZone getTimeZone() { return TimeZone.getTimeZone("GMT-03:30"); } + @Override + public ZoneId getTimeZoneId() { + return ZoneOffset.ofHoursMinutes(-3, 30); + } + @Override public Locale getLocale() { return Locale.US; diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index f2c73f5c48..aed6683062 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -36,4 +36,18 @@ + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 03ed925617..7150e471bc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -25,6 +25,9 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.text.DateFormat; import java.text.SimpleDateFormat; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.Locale; import java.util.TimeZone; import java.util.concurrent.atomic.AtomicReference; @@ -166,10 +169,20 @@ public abstract class SystemReader { return System.currentTimeMillis(); } + @Override + public Instant now() { + return Instant.now(); + } + @Override public int getTimezone(long when) { return getTimeZone().getOffset(when) / (60 * 1000); } + + @Override + public ZoneOffset getTimeZoneAt(Instant when) { + return getTimeZoneId().getRules().getOffset(when); + } } /** @@ -227,10 +240,20 @@ public abstract class SystemReader { return delegate.getCurrentTime(); } + @Override + public Instant now() { + return delegate.now(); + } + @Override public int getTimezone(long when) { return delegate.getTimezone(when); } + + @Override + public ZoneOffset getTimeZoneAt(Instant when) { + return delegate.getTimeZoneAt(when); + } } private static volatile SystemReader INSTANCE = DEFAULT; @@ -501,9 +524,21 @@ public abstract class SystemReader { * Get the current system time * * @return the current system time + * + * @deprecated Use {@link #now()} */ + @Deprecated public abstract long getCurrentTime(); + /** + * Get the current system time + * + * @return the current system time + * + * @since 7.1 + */ + public abstract Instant now(); + /** * Get clock instance preferred by this system. * @@ -520,19 +555,45 @@ public abstract class SystemReader { * @param when * a system timestamp * @return the local time zone + * + * @deprecated Use {@link #getTimeZoneAt(Instant)} instead. */ + @Deprecated public abstract int getTimezone(long when); + /** + * Get the local time zone offset at "when" time + * + * @param when + * a system timestamp + * @return the local time zone + * @since 7.1 + */ + public abstract ZoneOffset getTimeZoneAt(Instant when); + /** * Get system time zone, possibly mocked for testing * * @return system time zone, possibly mocked for testing * @since 1.2 + * + * @deprecated Use {@link #getTimeZoneId()} */ + @Deprecated public TimeZone getTimeZone() { return TimeZone.getDefault(); } + /** + * Get system time zone, possibly mocked for testing + * + * @return system time zone, possibly mocked for testing + * @since 7.1 + */ + public ZoneId getTimeZoneId() { + return ZoneId.systemDefault(); + } + /** * Get the locale to use * -- cgit v1.2.3 From a7b5f056d8ff68a0df8968fdd10d3f7faa66d290 Mon Sep 17 00:00:00 2001 From: Laura Hamelin Date: Wed, 6 Nov 2024 13:41:30 -0800 Subject: DfsBlockCacheConfig: propagate hotmap configs to pack ext cache configs CacheHotMap is currently only set on the base DfsBlockCacheConfig and is not propagated down to PackExt specific caches. Because CacheHotMap is set from a method call rather than from Configs, this change sets per-PackExt CacheHotMap configs on PackExt cache configs both when DfsBlockCacheConfig#setCacheHotMap(...) is called, and when DfsBlockCacheConfig#configure(...) is called after setCacheHotMap. The outer DfsBlockCacheConfig keeps the full CacheHotMap for the same reason that the CacheHotMap config is propagated in both setCacheHotMap and configure: the order of operations setting the configuration from Configs and calling setCacheHotMap is not guaranteed. Change-Id: Id9dc32fedca99ecc83c9dc90c24d9616873a202e --- .../storage/dfs/DfsBlockCacheConfigTest.java | 71 ++++++++++++++++++++++ .../internal/storage/dfs/DfsBlockCacheConfig.java | 22 +++++++ 2 files changed, 93 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java index 65774e6d6c..afa3179cde 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfigTest.java @@ -179,6 +179,76 @@ public class DfsBlockCacheConfigTest { is(indexConfig)); } + @Test + public void fromConfig_withExistingCacheHotMap_configWithPackExtConfigsHasHotMaps() { + Config config = new Config(); + addPackExtConfigEntry(config, "pack", List.of(PackExt.PACK), + /* blockLimit= */ 20 * 512, /* blockSize= */ 512); + + addPackExtConfigEntry(config, "bitmap", List.of(PackExt.BITMAP_INDEX), + /* blockLimit= */ 25 * 1024, /* blockSize= */ 1024); + + addPackExtConfigEntry(config, "index", + List.of(PackExt.INDEX, PackExt.OBJECT_SIZE_INDEX, + PackExt.REVERSE_INDEX), + /* blockLimit= */ 30 * 1024, /* blockSize= */ 1024); + + Map cacheHotMap = Map.of(PackExt.PACK, 1, + PackExt.BITMAP_INDEX, 2, PackExt.INDEX, 3, PackExt.REFTABLE, 4); + + DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig(); + cacheConfig.setCacheHotMap(cacheHotMap); + cacheConfig.fromConfig(config); + + var configs = cacheConfig.getPackExtCacheConfigurations(); + assertThat(cacheConfig.getCacheHotMap(), is(cacheHotMap)); + assertThat(configs, hasSize(3)); + var packConfig = getConfigForExt(configs, PackExt.PACK); + assertThat(packConfig.getCacheHotMap(), is(Map.of(PackExt.PACK, 1))); + + var bitmapConfig = getConfigForExt(configs, PackExt.BITMAP_INDEX); + assertThat(bitmapConfig.getCacheHotMap(), + is(Map.of(PackExt.BITMAP_INDEX, 2))); + + var indexConfig = getConfigForExt(configs, PackExt.INDEX); + assertThat(indexConfig.getCacheHotMap(), is(Map.of(PackExt.INDEX, 3))); + } + + @Test + public void setCacheHotMap_configWithPackExtConfigs_setsHotMaps() { + Config config = new Config(); + addPackExtConfigEntry(config, "pack", List.of(PackExt.PACK), + /* blockLimit= */ 20 * 512, /* blockSize= */ 512); + + addPackExtConfigEntry(config, "bitmap", List.of(PackExt.BITMAP_INDEX), + /* blockLimit= */ 25 * 1024, /* blockSize= */ 1024); + + addPackExtConfigEntry(config, "index", + List.of(PackExt.INDEX, PackExt.OBJECT_SIZE_INDEX, + PackExt.REVERSE_INDEX), + /* blockLimit= */ 30 * 1024, /* blockSize= */ 1024); + + Map cacheHotMap = Map.of(PackExt.PACK, 1, + PackExt.BITMAP_INDEX, 2, PackExt.INDEX, 3, PackExt.REFTABLE, 4); + + DfsBlockCacheConfig cacheConfig = new DfsBlockCacheConfig() + .fromConfig(config); + cacheConfig.setCacheHotMap(cacheHotMap); + + var configs = cacheConfig.getPackExtCacheConfigurations(); + assertThat(cacheConfig.getCacheHotMap(), is(cacheHotMap)); + assertThat(configs, hasSize(3)); + var packConfig = getConfigForExt(configs, PackExt.PACK); + assertThat(packConfig.getCacheHotMap(), is(Map.of(PackExt.PACK, 1))); + + var bitmapConfig = getConfigForExt(configs, PackExt.BITMAP_INDEX); + assertThat(bitmapConfig.getCacheHotMap(), + is(Map.of(PackExt.BITMAP_INDEX, 2))); + + var indexConfig = getConfigForExt(configs, PackExt.INDEX); + assertThat(indexConfig.getCacheHotMap(), is(Map.of(PackExt.INDEX, 3))); + } + @Test public void fromConfigs_baseConfigOnly_nameSetFromConfigDfsSubSection() { Config config = new Config(); @@ -291,6 +361,7 @@ public class DfsBlockCacheConfigTest { " Name: dfs.pack", " BlockLimit: " + 20 * 512, " BlockSize: 512", " StreamRatio: 0.3", " ConcurrencyLevel: 32", + " CacheHotMapEntry: " + PackExt.PACK + " : " + 10, " PackExts: " + List.of(PackExt.PACK)))); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index acd7add5a9..d63c208bbb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -30,6 +30,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Consumer; +import java.util.function.Function; import java.util.stream.Collectors; import org.eclipse.jgit.internal.JGitText; @@ -300,12 +301,24 @@ public class DfsBlockCacheConfig { * map of hot count per pack extension for {@code DfsBlockCache}. * @return {@code this} */ + /* + * TODO The cache HotMap configuration should be set as a config option and + * not passed in through a setter. + */ public DfsBlockCacheConfig setCacheHotMap( Map cacheHotMap) { this.cacheHotMap = Collections.unmodifiableMap(cacheHotMap); + setCacheHotMapToPackExtConfigs(this.cacheHotMap); return this; } + private void setCacheHotMapToPackExtConfigs( + Map cacheHotMap) { + for (DfsBlockCachePackExtConfig packExtConfig : packExtCacheConfigurations) { + packExtConfig.setCacheHotMap(cacheHotMap); + } + } + /** * Get the consumer of cache index events. * @@ -433,6 +446,7 @@ public class DfsBlockCacheConfig { cacheConfigs.add(cacheConfig); } packExtCacheConfigurations = cacheConfigs; + setCacheHotMapToPackExtConfigs(this.cacheHotMap); } private static Set intersection(Set first, Set second) { @@ -551,6 +565,14 @@ public class DfsBlockCacheConfig { return packExtCacheConfiguration; } + void setCacheHotMap(Map cacheHotMap) { + Map packExtHotMap = packExts.stream() + .filter(cacheHotMap::containsKey) + .collect(Collectors.toUnmodifiableMap(Function.identity(), + cacheHotMap::get)); + packExtCacheConfiguration.setCacheHotMap(packExtHotMap); + } + private static DfsBlockCachePackExtConfig fromConfig(Config config, String section, String subSection) { String packExtensions = config.getString(section, subSection, -- cgit v1.2.3 From 20d0bfbb348674a65b6c84826b549ab22ff22c13 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 8 Nov 2024 18:18:21 +0100 Subject: ssh: Minor simplification in SerialRangeSet Instead of set.headMap(x).lastKey() use set.floorKey(x) and instead of set.tailMap(x).firstKey() use set.ceilingKey(x). Change-Id: I22f44cbe82b9ead06d6ff517d609dfdbc89a758c --- .../jgit/internal/signing/ssh/SerialRangeSet.java | 31 +++++++++------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SerialRangeSet.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SerialRangeSet.java index 6a0cec8821..f4eb884239 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SerialRangeSet.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/SerialRangeSet.java @@ -9,7 +9,6 @@ */ package org.eclipse.jgit.internal.signing.ssh; -import java.util.SortedMap; import java.util.TreeMap; import org.eclipse.jgit.internal.transport.sshd.SshdText; @@ -50,14 +49,14 @@ class SerialRangeSet { } } - // We use the same data structure as OpenSSH,; basically a - // TreeSet of mutable elements. To get "mutability", the set is - // implemented as a TreeMap with the same elements as keys and values. + // We use the same data structure as OpenSSH; basically a TreeSet of mutable + // SerialRanges. To get "mutability", the set is implemented as a TreeMap + // with the same elements as keys and values. // // get(x) will return null if none of the serial numbers in the range x is // in the set, and some range (partially) overlapping with x otherwise. // - // containsKey will return true if there is any (partially) overlapping + // containsKey(x) will return true if there is any (partially) overlapping // range in the TreeMap. private final TreeMap ranges = new TreeMap<>( SerialRangeSet::compare); @@ -117,21 +116,15 @@ class SerialRangeSet { } // No overlapping range exists: check for coalescing with the // previous/next range - SortedMap head = ranges.headMap(newRange); - if (!head.isEmpty()) { - SerialRange prev = head.lastKey(); - if (newRange.from() - prev.to() == 1) { - ranges.remove(prev); - newRange = new Range(prev.from(), newRange.to()); - } + SerialRange prev = ranges.floorKey(newRange); + if (prev != null && newRange.from() - prev.to() == 1) { + ranges.remove(prev); + newRange = new Range(prev.from(), newRange.to()); } - SortedMap tail = ranges.tailMap(newRange); - if (!tail.isEmpty()) { - SerialRange next = tail.firstKey(); - if (next.from() - newRange.to() == 1) { - ranges.remove(next); - newRange = new Range(newRange.from(), next.to()); - } + SerialRange next = ranges.ceilingKey(newRange); + if (next != null && next.from() - newRange.to() == 1) { + ranges.remove(next); + newRange = new Range(newRange.from(), next.to()); } ranges.put(newRange, newRange); } -- cgit v1.2.3 From 9ea537d5c44876c12d154331c94a7ba14eaa64f8 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 8 Nov 2024 08:49:09 -0800 Subject: DfsGarbageCollector: #setReflogExpire with Instant instead of Date The Date API is full of major design flaws and pitfalls and should be avoided at all costs. Prefer the java.time APIs, specifically, java.time.Instant (for physical time) and java.time.LocalDate[Time] (for civil time). [1] Replace the Date with Instant in the DfsGarbageCollector#setReflogExpire method. [1] https://errorprone.info/bugpattern/JavaUtilDate Change-Id: Ie98e426e63621e8bef96c31bca56aec0c8eef5a6 --- .../jgit/internal/storage/dfs/DfsGarbageCollectorTest.java | 3 ++- .../jgit/internal/storage/dfs/DfsGarbageCollector.java | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java index 3edd1056be..f9fbfe8db0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java @@ -16,6 +16,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.IOException; +import java.time.Instant; import java.util.Arrays; import java.util.Collections; import java.util.Date; @@ -1331,7 +1332,7 @@ public class DfsGarbageCollectorTest { gc = new DfsGarbageCollector(repo); gc.setReftableConfig(new ReftableConfig()); // Expire ref log entries older than 30 days - gc.setRefLogExpire(new Date(thirty_days_ago)); + gc.setRefLogExpire(Instant.ofEpochMilli(thirty_days_ago)); run(gc); // Single GC pack present with all objects. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java index 6861fe8099..e6068a15ec 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java @@ -24,11 +24,11 @@ import static org.eclipse.jgit.internal.storage.pack.PackExt.REFTABLE; import static org.eclipse.jgit.internal.storage.pack.PackWriter.NONE; import java.io.IOException; +import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Collection; -import java.util.Date; import java.util.EnumSet; import java.util.GregorianCalendar; import java.util.HashSet; @@ -100,7 +100,7 @@ public class DfsGarbageCollector { private Set allTags; private Set nonHeads; private Set tagTargets; - private Date refLogExpire; + private Instant refLogExpire; /** * Initialize a garbage collector. @@ -212,8 +212,8 @@ public class DfsGarbageCollector { * instant in time which defines refLog expiration * @return {@code this} */ - public DfsGarbageCollector setRefLogExpire(Date refLogExpire) { - this.refLogExpire = refLogExpire ; + public DfsGarbageCollector setRefLogExpire(Instant refLogExpire) { + this.refLogExpire = refLogExpire; return this; } @@ -752,7 +752,8 @@ public class DfsGarbageCollector { compact.setIncludeDeletes(includeDeletes); compact.setConfig(configureReftable(reftableConfig, out)); if(refLogExpire != null ){ - compact.setReflogExpireOldestReflogTimeMillis(refLogExpire.getTime()); + compact.setReflogExpireOldestReflogTimeMillis( + refLogExpire.toEpochMilli()); } compact.compact(); pack.addFileExt(REFTABLE); -- cgit v1.2.3 From e8c414b9cc72cd0e4f8c66b836de4c43f134b102 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 6 Sep 2024 12:26:44 +0200 Subject: Replace custom encoder `Constants#encode` by JDK implementation Using the implementation provided in the JDK since Java 1.6 by `String#getBytes(Charset)` reduces JGit maintenance effort and improves performance. The method Constants#encode was implemented when JGit still used Java 1.5. See [1]. Kudos to Marcin for proposing to use this improvement in RefWriter [2]. I think it should be used generally. [1] https://repo.or.cz/jgit.git?a=commit;h=bfa3da225f198b19061158499b1135aff07d85b3 [2] https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1195180 Also-By: Marcin Czech Change-Id: I361ed6286b98351a315b8a8ffc3cb845831d35b2 (cherry picked from commit e5d2898997462e0f2409c09497ab62c6cda2dbaf) --- org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 1a97d111e3..5d7eacb4b8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -14,7 +14,6 @@ package org.eclipse.jgit.lib; import static java.nio.charset.StandardCharsets.UTF_8; -import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -688,17 +687,7 @@ public final class Constants { * @see #CHARACTER_ENCODING */ public static byte[] encode(String str) { - final ByteBuffer bb = UTF_8.encode(str); - final int len = bb.limit(); - if (bb.hasArray() && bb.arrayOffset() == 0) { - final byte[] arr = bb.array(); - if (arr.length == len) - return arr; - } - - final byte[] arr = new byte[len]; - bb.get(arr); - return arr; + return str.getBytes(UTF_8); } static { -- cgit v1.2.3 From d34f8b523638fc95b2e7006d02c9f6a756cbba85 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 6 Sep 2024 13:42:27 +0200 Subject: Replace custom encoder Constants#encodeASCII by JDK implementation Ensure that the method still throws an IllegalArgumentException for malformed input or if the String contains unmappable characters. Change-Id: I6a340aa1af60c315272ff13b6bf2041ba30c94ca (cherry picked from commit 0fd76114e3436ac635641d06371fd8833179312d) --- .../src/org/eclipse/jgit/lib/Constants.java | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java index 5d7eacb4b8..1a2f735622 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Constants.java @@ -12,9 +12,14 @@ package org.eclipse.jgit.lib; +import static java.nio.charset.StandardCharsets.US_ASCII; import static java.nio.charset.StandardCharsets.UTF_8; import java.nio.charset.Charset; +import java.nio.CharBuffer; +import java.nio.charset.CharacterCodingException; +import java.nio.charset.CharsetEncoder; +import java.nio.charset.CodingErrorAction; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.text.MessageFormat; @@ -667,14 +672,15 @@ public final class Constants { * the 7-bit ASCII character space. */ public static byte[] encodeASCII(String s) { - final byte[] r = new byte[s.length()]; - for (int k = r.length - 1; k >= 0; k--) { - final char c = s.charAt(k); - if (c > 127) - throw new IllegalArgumentException(MessageFormat.format(JGitText.get().notASCIIString, s)); - r[k] = (byte) c; + try { + CharsetEncoder encoder = US_ASCII.newEncoder() + .onUnmappableCharacter(CodingErrorAction.REPORT) + .onMalformedInput(CodingErrorAction.REPORT); + return encoder.encode(CharBuffer.wrap(s)).array(); + } catch (CharacterCodingException e) { + throw new IllegalArgumentException( + MessageFormat.format(JGitText.get().notASCIIString, s), e); } - return r; } /** -- cgit v1.2.3 From ce3a7ca3bf0b5f8ad9d14efb730c8d3d204e802a Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Mon, 11 Nov 2024 12:36:03 +0100 Subject: Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmap As sugested in I608011462f1. Change-Id: If66226dd7b08ae768413fa614df5dcb6b44dc118 --- ...NumberOfPackFilesAfterBitmapStatisticsTest.java | 180 --------------------- ...NumberOfPackFilesSinceBitmapStatisticsTest.java | 180 +++++++++++++++++++++ .../org/eclipse/jgit/internal/storage/file/GC.java | 8 +- 3 files changed, 184 insertions(+), 184 deletions(-) delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java deleted file mode 100644 index 820f0c768d..0000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright (c) 2024 Jacek Centkowski and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package org.eclipse.jgit.internal.storage.file; - -import static org.junit.Assert.assertEquals; - -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.file.Files; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.StreamSupport; - -import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; -import org.eclipse.jgit.internal.storage.pack.PackExt; -import org.eclipse.jgit.internal.storage.pack.PackWriter; -import org.eclipse.jgit.junit.TestRepository; -import org.eclipse.jgit.lib.NullProgressMonitor; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.PersonIdent; -import org.eclipse.jgit.lib.Ref; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.util.FileUtils; -import org.junit.Test; - -public class GcNumberOfPackFilesAfterBitmapStatisticsTest extends GcTestCase { - @Test - public void testShouldReportZeroObjectsForInitializedRepo() - throws IOException { - assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap); - } - - @Test - public void testShouldReportAllPackFilesWhenNoGcWasPerformed() - throws Exception { - packAndPrune(); - long result = gc.getStatistics().numberOfPackFilesAfterBitmap; - - assertEquals(repo.getObjectDatabase().getPacks().size(), result); - } - - @Test - public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception { - // given - addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap); - } - - @Test - public void testShouldReportNewObjectsAfterGcWhenRepositoryProgresses() - throws Exception { - // commit & gc - RevCommit parent = addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - - // progress & pack - addCommit(parent); - packAndPrune(); - - assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap); - } - - @Test - public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresses() - throws Exception { - // commit & gc - RevCommit parent = addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - - // progress & gc - parent = addCommit(parent); - gc.gc().get(); - assertEquals(2L, repositoryBitmapFiles()); - - // progress & pack - addCommit(parent); - packAndPrune(); - - assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap); - } - - private void packAndPrune() throws Exception { - try (SkipNonExistingFilesTestRepository testRepo = new SkipNonExistingFilesTestRepository( - repo)) { - testRepo.packAndPrune(); - } - } - - private RevCommit addCommit(RevCommit parent) throws Exception { - PersonIdent ident = new PersonIdent("repo-metrics", "repo@metrics.com"); - TestRepository.CommitBuilder builder = tr.commit() - .author(ident); - if (parent != null) { - builder.parent(parent); - } - RevCommit commit = builder.create(); - tr.update("master", commit); - parent = commit; - return parent; - } - - private long repositoryBitmapFiles() throws IOException { - return StreamSupport - .stream(Files - .newDirectoryStream(repo.getObjectDatabase() - .getPackDirectory().toPath(), "pack-*.bitmap") - .spliterator(), false) - .count(); - } - - /** - * The TestRepository has a {@link TestRepository#packAndPrune()} function - * but it fails in the last step after GC was performed as it doesn't - * SKIP_MISSING files. In order to circumvent it was copied and improved - * here. - */ - private static class SkipNonExistingFilesTestRepository - extends TestRepository { - private final FileRepository repo; - - private SkipNonExistingFilesTestRepository(FileRepository db) throws IOException { - super(db); - repo = db; - } - - @Override - public void packAndPrune() throws Exception { - ObjectDirectory odb = repo.getObjectDatabase(); - NullProgressMonitor m = NullProgressMonitor.INSTANCE; - - final PackFile pack, idx; - try (PackWriter pw = new PackWriter(repo)) { - Set all = new HashSet<>(); - for (Ref r : repo.getRefDatabase().getRefs()) - all.add(r.getObjectId()); - pw.preparePack(m, all, PackWriter.NONE); - - pack = new PackFile(odb.getPackDirectory(), pw.computeName(), - PackExt.PACK); - try (OutputStream out = new BufferedOutputStream( - new FileOutputStream(pack))) { - pw.writePack(m, m, out); - } - pack.setReadOnly(); - - idx = pack.create(PackExt.INDEX); - try (OutputStream out = new BufferedOutputStream( - new FileOutputStream(idx))) { - pw.writeIndex(out); - } - idx.setReadOnly(); - } - - odb.openPack(pack); - updateServerInfo(); - - // alternative packAndPrune implementation that skips missing files - // after GC. - for (Pack p : odb.getPacks()) { - for (MutableEntry e : p) - FileUtils.delete(odb.fileFor(e.toObjectId()), - FileUtils.SKIP_MISSING); - } - } - } -} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java new file mode 100644 index 0000000000..42b99ae512 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java @@ -0,0 +1,180 @@ +/* + * Copyright (c) 2024 Jacek Centkowski and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import static org.junit.Assert.assertEquals; + +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.StreamSupport; + +import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackWriter; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.util.FileUtils; +import org.junit.Test; + +public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { + @Test + public void testShouldReportZeroObjectsForInitializedRepo() + throws IOException { + assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportAllPackFilesWhenNoGcWasPerformed() + throws Exception { + packAndPrune(); + long result = gc.getStatistics().numberOfPackFilesSinceBitmap; + + assertEquals(repo.getObjectDatabase().getPacks().size(), result); + } + + @Test + public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception { + // given + addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportNewObjectsSinceGcWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & gc + parent = addCommit(parent); + gc.gc().get(); + assertEquals(2L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + private void packAndPrune() throws Exception { + try (SkipNonExistingFilesTestRepository testRepo = new SkipNonExistingFilesTestRepository( + repo)) { + testRepo.packAndPrune(); + } + } + + private RevCommit addCommit(RevCommit parent) throws Exception { + PersonIdent ident = new PersonIdent("repo-metrics", "repo@metrics.com"); + TestRepository.CommitBuilder builder = tr.commit() + .author(ident); + if (parent != null) { + builder.parent(parent); + } + RevCommit commit = builder.create(); + tr.update("master", commit); + parent = commit; + return parent; + } + + private long repositoryBitmapFiles() throws IOException { + return StreamSupport + .stream(Files + .newDirectoryStream(repo.getObjectDatabase() + .getPackDirectory().toPath(), "pack-*.bitmap") + .spliterator(), false) + .count(); + } + + /** + * The TestRepository has a {@link TestRepository#packAndPrune()} function + * but it fails in the last step after GC was performed as it doesn't + * SKIP_MISSING files. In order to circumvent it was copied and improved + * here. + */ + private static class SkipNonExistingFilesTestRepository + extends TestRepository { + private final FileRepository repo; + + private SkipNonExistingFilesTestRepository(FileRepository db) throws IOException { + super(db); + repo = db; + } + + @Override + public void packAndPrune() throws Exception { + ObjectDirectory odb = repo.getObjectDatabase(); + NullProgressMonitor m = NullProgressMonitor.INSTANCE; + + final PackFile pack, idx; + try (PackWriter pw = new PackWriter(repo)) { + Set all = new HashSet<>(); + for (Ref r : repo.getRefDatabase().getRefs()) + all.add(r.getObjectId()); + pw.preparePack(m, all, PackWriter.NONE); + + pack = new PackFile(odb.getPackDirectory(), pw.computeName(), + PackExt.PACK); + try (OutputStream out = new BufferedOutputStream( + new FileOutputStream(pack))) { + pw.writePack(m, m, out); + } + pack.setReadOnly(); + + idx = pack.create(PackExt.INDEX); + try (OutputStream out = new BufferedOutputStream( + new FileOutputStream(idx))) { + pw.writeIndex(out); + } + idx.setReadOnly(); + } + + odb.openPack(pack); + updateServerInfo(); + + // alternative packAndPrune implementation that skips missing files + // after GC. + for (Pack p : odb.getPacks()) { + for (MutableEntry e : p) + FileUtils.delete(odb.fileFor(e.toObjectId()), + FileUtils.SKIP_MISSING); + } + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 34b5ec01e1..d8eb751136 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1512,7 +1512,7 @@ public class GC { * The number of pack files that were created after the last bitmap * generation. */ - public long numberOfPackFilesAfterBitmap; + public long numberOfPackFilesSinceBitmap; /** * The number of objects stored as loose objects. @@ -1549,8 +1549,8 @@ public class GC { final StringBuilder b = new StringBuilder(); b.append("numberOfPackedObjects=").append(numberOfPackedObjects); //$NON-NLS-1$ b.append(", numberOfPackFiles=").append(numberOfPackFiles); //$NON-NLS-1$ - b.append(", numberOfPackFilesAfterBitmap=") //$NON-NLS-1$ - .append(numberOfPackFilesAfterBitmap); + b.append(", numberOfPackFilesSinceBitmap=") //$NON-NLS-1$ + .append(numberOfPackFilesSinceBitmap); b.append(", numberOfLooseObjects=").append(numberOfLooseObjects); //$NON-NLS-1$ b.append(", numberOfLooseRefs=").append(numberOfLooseRefs); //$NON-NLS-1$ b.append(", numberOfPackedRefs=").append(numberOfPackedRefs); //$NON-NLS-1$ @@ -1578,7 +1578,7 @@ public class GC { if (p.getBitmapIndex() != null) ret.numberOfBitmaps += p.getBitmapIndex().getBitmapCount(); else - ret.numberOfPackFilesAfterBitmap++; + ret.numberOfPackFilesSinceBitmap++; } File objDir = repo.getObjectsDirectory(); String[] fanout = objDir.list(); -- cgit v1.2.3 From e682a023936b190c25c7b708a85b6cf0db7c80c5 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Mon, 23 Sep 2024 12:10:17 -0700 Subject: Pack.java: Recover more often in Pack.copyAsIs2() The PACK class is designed to throw StoredObjectRepresentationNotAvailableException at times when it cannot find an object which previously was believed to be in its packfile and it is still possible for the caller, PackWriter.writeObjectImpl(), to retry copying the object from another file and potentially avoid causing a user facing error for this fairly common expected situation. This retry helps handle when repacking causes a packfile to be replaced by new files with the same objects. Improve copyAsIs2() to drastically make recovery possible in more situations. Once any data for a specific object, has been sent it is very difficult to recover from that object being relocated to another pack. But if a read error is detected in copyAsIs2() before sending the object header (and thus any data), then it should still be recoverable. Fix three places where we could have recovered because we hadn't sent the header yet, and adjust another place to send the header a bit later, after having read some data from the object successfully. Basically, if the header has not been written yet, throw StoredObjectRepresentationNotAvailableException to signal that this is still recoverable. These fixes should drastically improve the chances of recovery since due to unix file semantics, if the partial read succeeds, then the full read will very likely succeed. This is because while the file may no longer be open when the first read is done (the WindowCache may have evicted it), once the first read completes it will likely still be open and even if the file is deleted the WindowCache will continue to be able to read from it until it closes it. Change-Id: Ib87e294e0dbacf71b10db55be511e91963b4a84a Signed-off-by: Martin Fick --- .../eclipse/jgit/internal/storage/file/Pack.java | 295 +++++++++++---------- 1 file changed, 153 insertions(+), 142 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index be457644d9..3518342f97 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -416,185 +416,196 @@ public class Pack implements Iterable { final CRC32 crc2 = validate ? new CRC32() : null; final byte[] buf = out.getCopyBuffer(); + boolean isHeaderWritten = false; // Rip apart the header so we can discover the size. // - readFully(src.offset, buf, 0, 20, curs); - int c = buf[0] & 0xff; - final int typeCode = (c >> 4) & 7; - long inflatedLength = c & 15; - int shift = 4; - int headerCnt = 1; - while ((c & 0x80) != 0) { - c = buf[headerCnt++] & 0xff; - inflatedLength += ((long) (c & 0x7f)) << shift; - shift += 7; - } - - if (typeCode == Constants.OBJ_OFS_DELTA) { - do { + try { + readFully(src.offset, buf, 0, 20, curs); + + int c = buf[0] & 0xff; + final int typeCode = (c >> 4) & 7; + long inflatedLength = c & 15; + int shift = 4; + int headerCnt = 1; + while ((c & 0x80) != 0) { c = buf[headerCnt++] & 0xff; - } while ((c & 128) != 0); - if (validate) { - assert(crc1 != null && crc2 != null); - crc1.update(buf, 0, headerCnt); - crc2.update(buf, 0, headerCnt); + inflatedLength += ((long) (c & 0x7f)) << shift; + shift += 7; } - } else if (typeCode == Constants.OBJ_REF_DELTA) { - if (validate) { + + if (typeCode == Constants.OBJ_OFS_DELTA) { + do { + c = buf[headerCnt++] & 0xff; + } while ((c & 128) != 0); + if (validate) { + assert(crc1 != null && crc2 != null); + crc1.update(buf, 0, headerCnt); + crc2.update(buf, 0, headerCnt); + } + } else if (typeCode == Constants.OBJ_REF_DELTA) { + if (validate) { + assert(crc1 != null && crc2 != null); + crc1.update(buf, 0, headerCnt); + crc2.update(buf, 0, headerCnt); + } + + readFully(src.offset + headerCnt, buf, 0, 20, curs); + if (validate) { + assert(crc1 != null && crc2 != null); + crc1.update(buf, 0, 20); + crc2.update(buf, 0, 20); + } + headerCnt += 20; + } else if (validate) { assert(crc1 != null && crc2 != null); crc1.update(buf, 0, headerCnt); crc2.update(buf, 0, headerCnt); } - readFully(src.offset + headerCnt, buf, 0, 20, curs); - if (validate) { - assert(crc1 != null && crc2 != null); - crc1.update(buf, 0, 20); - crc2.update(buf, 0, 20); - } - headerCnt += 20; - } else if (validate) { - assert(crc1 != null && crc2 != null); - crc1.update(buf, 0, headerCnt); - crc2.update(buf, 0, headerCnt); - } + final long dataOffset = src.offset + headerCnt; + final long dataLength = src.length; + final long expectedCRC; + final ByteArrayWindow quickCopy; - final long dataOffset = src.offset + headerCnt; - final long dataLength = src.length; - final long expectedCRC; - final ByteArrayWindow quickCopy; - - // Verify the object isn't corrupt before sending. If it is, - // we report it missing instead. - // - try { - quickCopy = curs.quickCopy(this, dataOffset, dataLength); + // Verify the object isn't corrupt before sending. If it is, + // we report it missing instead. + // + try { + quickCopy = curs.quickCopy(this, dataOffset, dataLength); - if (validate && idx().hasCRC32Support()) { - assert(crc1 != null); - // Index has the CRC32 code cached, validate the object. - // - expectedCRC = idx().findCRC32(src); - if (quickCopy != null) { - quickCopy.crc32(crc1, dataOffset, (int) dataLength); - } else { - long pos = dataOffset; - long cnt = dataLength; - while (cnt > 0) { - final int n = (int) Math.min(cnt, buf.length); - readFully(pos, buf, 0, n, curs); - crc1.update(buf, 0, n); - pos += n; - cnt -= n; + if (validate && idx().hasCRC32Support()) { + assert(crc1 != null); + // Index has the CRC32 code cached, validate the object. + // + expectedCRC = idx().findCRC32(src); + if (quickCopy != null) { + quickCopy.crc32(crc1, dataOffset, (int) dataLength); + } else { + long pos = dataOffset; + long cnt = dataLength; + while (cnt > 0) { + final int n = (int) Math.min(cnt, buf.length); + readFully(pos, buf, 0, n, curs); + crc1.update(buf, 0, n); + pos += n; + cnt -= n; + } } + if (crc1.getValue() != expectedCRC) { + setCorrupt(src.offset); + throw new CorruptObjectException(MessageFormat.format( + JGitText.get().objectAtHasBadZlibStream, + Long.valueOf(src.offset), getPackFile())); + } + } else if (validate) { + // We don't have a CRC32 code in the index, so compute it + // now while inflating the raw data to get zlib to tell us + // whether or not the data is safe. + // + Inflater inf = curs.inflater(); + byte[] tmp = new byte[1024]; + if (quickCopy != null) { + quickCopy.check(inf, tmp, dataOffset, (int) dataLength); + } else { + assert(crc1 != null); + long pos = dataOffset; + long cnt = dataLength; + while (cnt > 0) { + final int n = (int) Math.min(cnt, buf.length); + readFully(pos, buf, 0, n, curs); + crc1.update(buf, 0, n); + inf.setInput(buf, 0, n); + while (inf.inflate(tmp, 0, tmp.length) > 0) + continue; + pos += n; + cnt -= n; + } + } + if (!inf.finished() || inf.getBytesRead() != dataLength) { + setCorrupt(src.offset); + throw new EOFException(MessageFormat.format( + JGitText.get().shortCompressedStreamAt, + Long.valueOf(src.offset))); + } + assert(crc1 != null); + expectedCRC = crc1.getValue(); + } else { + expectedCRC = -1; } - if (crc1.getValue() != expectedCRC) { - setCorrupt(src.offset); - throw new CorruptObjectException(MessageFormat.format( - JGitText.get().objectAtHasBadZlibStream, - Long.valueOf(src.offset), getPackFile())); - } - } else if (validate) { - // We don't have a CRC32 code in the index, so compute it - // now while inflating the raw data to get zlib to tell us - // whether or not the data is safe. + } catch (DataFormatException dataFormat) { + setCorrupt(src.offset); + + CorruptObjectException corruptObject = new CorruptObjectException( + MessageFormat.format( + JGitText.get().objectAtHasBadZlibStream, + Long.valueOf(src.offset), getPackFile()), + dataFormat); + + throw new StoredObjectRepresentationNotAvailableException( + corruptObject); + } + + if (quickCopy != null) { + // The entire object fits into a single byte array window slice, + // and we have it pinned. Write this out without copying. // - Inflater inf = curs.inflater(); - byte[] tmp = new byte[1024]; - if (quickCopy != null) { - quickCopy.check(inf, tmp, dataOffset, (int) dataLength); - } else { - assert(crc1 != null); + out.writeHeader(src, inflatedLength); + isHeaderWritten = true; + quickCopy.write(out, dataOffset, (int) dataLength); + + } else if (dataLength <= buf.length) { + // Tiny optimization: Lots of objects are very small deltas or + // deflated commits that are likely to fit in the copy buffer. + // + if (!validate) { long pos = dataOffset; long cnt = dataLength; while (cnt > 0) { final int n = (int) Math.min(cnt, buf.length); readFully(pos, buf, 0, n, curs); - crc1.update(buf, 0, n); - inf.setInput(buf, 0, n); - while (inf.inflate(tmp, 0, tmp.length) > 0) - continue; pos += n; cnt -= n; } } - if (!inf.finished() || inf.getBytesRead() != dataLength) { - setCorrupt(src.offset); - throw new EOFException(MessageFormat.format( - JGitText.get().shortCompressedStreamAt, - Long.valueOf(src.offset))); - } - assert(crc1 != null); - expectedCRC = crc1.getValue(); + out.writeHeader(src, inflatedLength); + isHeaderWritten = true; + out.write(buf, 0, (int) dataLength); } else { - expectedCRC = -1; - } - } catch (DataFormatException dataFormat) { - setCorrupt(src.offset); - - CorruptObjectException corruptObject = new CorruptObjectException( - MessageFormat.format( - JGitText.get().objectAtHasBadZlibStream, - Long.valueOf(src.offset), getPackFile()), - dataFormat); - - throw new StoredObjectRepresentationNotAvailableException( - corruptObject); - - } catch (IOException ioError) { - throw new StoredObjectRepresentationNotAvailableException(ioError); - } - - if (quickCopy != null) { - // The entire object fits into a single byte array window slice, - // and we have it pinned. Write this out without copying. - // - out.writeHeader(src, inflatedLength); - quickCopy.write(out, dataOffset, (int) dataLength); - - } else if (dataLength <= buf.length) { - // Tiny optimization: Lots of objects are very small deltas or - // deflated commits that are likely to fit in the copy buffer. - // - if (!validate) { + // Now we are committed to sending the object. As we spool it out, + // check its CRC32 code to make sure there wasn't corruption between + // the verification we did above, and us actually outputting it. + // long pos = dataOffset; long cnt = dataLength; while (cnt > 0) { final int n = (int) Math.min(cnt, buf.length); readFully(pos, buf, 0, n, curs); + if (validate) { + assert(crc2 != null); + crc2.update(buf, 0, n); + } + if (!isHeaderWritten) { + out.writeHeader(src, inflatedLength); + isHeaderWritten = true; + } + out.write(buf, 0, n); pos += n; cnt -= n; } - } - out.writeHeader(src, inflatedLength); - out.write(buf, 0, (int) dataLength); - } else { - // Now we are committed to sending the object. As we spool it out, - // check its CRC32 code to make sure there wasn't corruption between - // the verification we did above, and us actually outputting it. - // - out.writeHeader(src, inflatedLength); - long pos = dataOffset; - long cnt = dataLength; - while (cnt > 0) { - final int n = (int) Math.min(cnt, buf.length); - readFully(pos, buf, 0, n, curs); if (validate) { assert(crc2 != null); - crc2.update(buf, 0, n); + if (crc2.getValue() != expectedCRC) { + throw new CorruptObjectException(MessageFormat.format( + JGitText.get().objectAtHasBadZlibStream, + Long.valueOf(src.offset), getPackFile())); + } } - out.write(buf, 0, n); - pos += n; - cnt -= n; } - if (validate) { - assert(crc2 != null); - if (crc2.getValue() != expectedCRC) { - throw new CorruptObjectException(MessageFormat.format( - JGitText.get().objectAtHasBadZlibStream, - Long.valueOf(src.offset), getPackFile())); - } + } catch (IOException ioError) { + if (!isHeaderWritten) { + throw new StoredObjectRepresentationNotAvailableException(ioError); } + throw ioError; } } -- cgit v1.2.3 From 8f05f61c54d76504845d47ca4c27967a20430cce Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 11 Nov 2024 11:07:21 -0800 Subject: errorprone: Disable javadoc checks in tests Errorprone finds many problems in the tests javadocs. This is noisy in the logs, but fixing them also disturbs the project history and can complicate merges. Disable the javadoc checks in the tests packages. We can fix those javadocs if some other modification happen in the file (as we fix older coding style). Change-Id: Ic221b60afe77ed9c207adbefd9117d2e26107792 --- tools/BUILD | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/tools/BUILD b/tools/BUILD index 8c424b357b..844f0049e6 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -10,6 +10,7 @@ default_java_toolchain( java_runtime = "@rules_java//toolchains:remotejdk_17", package_configuration = [ ":error_prone", + ":error_prone_tests", ], source_version = "17", target_version = "17", @@ -22,6 +23,7 @@ default_java_toolchain( java_runtime = "@rules_java//toolchains:remotejdk_21", package_configuration = [ ":error_prone", + ":error_prone_tests", ], source_version = "21", target_version = "21", @@ -32,9 +34,7 @@ default_java_toolchain( # enabled. This warnings list is originally based on: # https://github.com/bazelbuild/BUILD_file_generator/blob/master/tools/bazel_defs/java.bzl # However, feel free to add any additional errors. Thus far they have all been pretty useful. -java_package_configuration( - name = "error_prone", - javacopts = [ +errorprone_checks = [ "-XepDisableWarningsInGeneratedCode", # The XepDisableWarningsInGeneratedCode disables only warnings, but # not errors. We should manually exclude all files generated by @@ -422,37 +422,57 @@ java_package_configuration( "-Xep:WrongOneof:ERROR", "-Xep:XorPower:ERROR", "-Xep:ZoneIdOfZ:ERROR", - ], +] + + +exclude_in_tests = ["-Xep:EmptyBlockTag:WARN", + "-Xep:MissingSummary:WARN"] + +java_package_configuration( + name = "error_prone", + javacopts = errorprone_checks, packages = ["error_prone_packages"], ) +java_package_configuration( + name = "error_prone_tests", + javacopts = [ check for check in errorprone_checks if check not in exclude_in_tests], + packages = ["error_prone_packages_test"], +) + package_group( name = "error_prone_packages", packages = [ - "//org.eclipse.jgit.ant.test/...", "//org.eclipse.jgit.ant/...", "//org.eclipse.jgit.archive/...", - "//org.eclipse.jgit.gpg.bc.test/...", "//org.eclipse.jgit.gpg.bc/...", "//org.eclipse.jgit.http.apache/...", "//org.eclipse.jgit.http.server/...", - "//org.eclipse.jgit.http.test/...", "//org.eclipse.jgit.junit.ssh/...", "//org.eclipse.jgit.junit/...", "//org.eclipse.jgit.junit/http/...", - "//org.eclipse.jgit.lfs.server.test/...", "//org.eclipse.jgit.lfs.server/...", - "//org.eclipse.jgit.lfs.test/...", "//org.eclipse.jgit.lfs/...", - "//org.eclipse.jgit.pgm.test/...", "//org.eclipse.jgit.pgm/...", "//org.eclipse.jgit.ssh.apache.agent/...", - "//org.eclipse.jgit.ssh.apache.test/...", "//org.eclipse.jgit.ssh.apache/...", - "//org.eclipse.jgit.ssh.jsch.test/...", "//org.eclipse.jgit.ssh.jsch/...", - "//org.eclipse.jgit.test/...", "//org.eclipse.jgit.ui/...", "//org.eclipse.jgit/...", ], ) + +package_group( + name = "error_prone_packages_test", + packages = [ + "//org.eclipse.jgit.ant.test/...", + "//org.eclipse.jgit.gpg.bc.test/...", + "//org.eclipse.jgit.http.test/...", + "//org.eclipse.jgit.lfs.server.test/...", + "//org.eclipse.jgit.lfs.test/...", + "//org.eclipse.jgit.pgm.test/...", + "//org.eclipse.jgit.ssh.apache.test/...", + "//org.eclipse.jgit.ssh.jsch.test/...", + "//org.eclipse.jgit.test/...", + ], +) -- cgit v1.2.3 From fbbd0c3e3e5a940deb18332b116ba869381c6f62 Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Mon, 11 Nov 2024 12:48:20 +0100 Subject: Don't fail when trying to prune pack which is already gone Update the TestRepository.prunePacked so that it doesn't fail if a pack to be pruned is already gone. It is especially handy when prunePacked function is called in `TestRepository.packAndPrune` function after repo moves on after the GC was performed. Change-Id: I01b4ddbaddec1fdc24cfbb967e0edfe0de6c4b7c --- .../src/org/eclipse/jgit/junit/TestRepository.java | 3 +- ...NumberOfPackFilesSinceBitmapStatisticsTest.java | 81 +--------------------- 2 files changed, 5 insertions(+), 79 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index 66cf739ef1..c6cdfafe84 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -1020,7 +1020,8 @@ public class TestRepository implements AutoCloseable { private static void prunePacked(ObjectDirectory odb) throws IOException { for (Pack p : odb.getPacks()) { for (MutableEntry e : p) - FileUtils.delete(odb.fileFor(e.toObjectId())); + FileUtils.delete(odb.fileFor(e.toObjectId()), + FileUtils.SKIP_MISSING); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java index 42b99ae512..cd1264ef55 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java @@ -12,25 +12,13 @@ package org.eclipse.jgit.internal.storage.file; import static org.junit.Assert.assertEquals; -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.nio.file.Files; -import java.util.HashSet; -import java.util.Set; import java.util.stream.StreamSupport; -import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; -import org.eclipse.jgit.internal.storage.pack.PackExt; -import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.junit.TestRepository; -import org.eclipse.jgit.lib.NullProgressMonitor; -import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; -import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.util.FileUtils; import org.junit.Test; public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { @@ -43,7 +31,7 @@ public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { @Test public void testShouldReportAllPackFilesWhenNoGcWasPerformed() throws Exception { - packAndPrune(); + tr.packAndPrune(); long result = gc.getStatistics().numberOfPackFilesSinceBitmap; assertEquals(repo.getObjectDatabase().getPacks().size(), result); @@ -68,7 +56,7 @@ public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { // progress & pack addCommit(parent); - packAndPrune(); + tr.packAndPrune(); assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); } @@ -88,18 +76,11 @@ public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { // progress & pack addCommit(parent); - packAndPrune(); + tr.packAndPrune(); assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); } - private void packAndPrune() throws Exception { - try (SkipNonExistingFilesTestRepository testRepo = new SkipNonExistingFilesTestRepository( - repo)) { - testRepo.packAndPrune(); - } - } - private RevCommit addCommit(RevCommit parent) throws Exception { PersonIdent ident = new PersonIdent("repo-metrics", "repo@metrics.com"); TestRepository.CommitBuilder builder = tr.commit() @@ -121,60 +102,4 @@ public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { .spliterator(), false) .count(); } - - /** - * The TestRepository has a {@link TestRepository#packAndPrune()} function - * but it fails in the last step after GC was performed as it doesn't - * SKIP_MISSING files. In order to circumvent it was copied and improved - * here. - */ - private static class SkipNonExistingFilesTestRepository - extends TestRepository { - private final FileRepository repo; - - private SkipNonExistingFilesTestRepository(FileRepository db) throws IOException { - super(db); - repo = db; - } - - @Override - public void packAndPrune() throws Exception { - ObjectDirectory odb = repo.getObjectDatabase(); - NullProgressMonitor m = NullProgressMonitor.INSTANCE; - - final PackFile pack, idx; - try (PackWriter pw = new PackWriter(repo)) { - Set all = new HashSet<>(); - for (Ref r : repo.getRefDatabase().getRefs()) - all.add(r.getObjectId()); - pw.preparePack(m, all, PackWriter.NONE); - - pack = new PackFile(odb.getPackDirectory(), pw.computeName(), - PackExt.PACK); - try (OutputStream out = new BufferedOutputStream( - new FileOutputStream(pack))) { - pw.writePack(m, m, out); - } - pack.setReadOnly(); - - idx = pack.create(PackExt.INDEX); - try (OutputStream out = new BufferedOutputStream( - new FileOutputStream(idx))) { - pw.writeIndex(out); - } - idx.setReadOnly(); - } - - odb.openPack(pack); - updateServerInfo(); - - // alternative packAndPrune implementation that skips missing files - // after GC. - for (Pack p : odb.getPacks()) { - for (MutableEntry e : p) - FileUtils.delete(odb.fileFor(e.toObjectId()), - FileUtils.SKIP_MISSING); - } - } - } } -- cgit v1.2.3 From f7a4dd03560d10d504f63b9e2caeb32a6bf2cc0b Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Mon, 11 Nov 2024 12:36:03 +0100 Subject: Rename numberOfPackFilesAfterBitmap to numberOfPackFilesSinceBitmap As sugested in I608011462f1. Change-Id: If66226dd7b08ae768413fa614df5dcb6b44dc118 --- ...NumberOfPackFilesAfterBitmapStatisticsTest.java | 173 --------------------- ...NumberOfPackFilesSinceBitmapStatisticsTest.java | 173 +++++++++++++++++++++ .../org/eclipse/jgit/internal/storage/file/GC.java | 8 +- 3 files changed, 177 insertions(+), 177 deletions(-) delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java deleted file mode 100644 index e5a391f2e3..0000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesAfterBitmapStatisticsTest.java +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (c) 2024 Jacek Centkowski and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package org.eclipse.jgit.internal.storage.file; - -import static org.junit.Assert.assertEquals; - -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.nio.file.Files; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.StreamSupport; - -import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; -import org.eclipse.jgit.internal.storage.pack.PackExt; -import org.eclipse.jgit.internal.storage.pack.PackWriter; -import org.eclipse.jgit.junit.TestRepository; -import org.eclipse.jgit.lib.NullProgressMonitor; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.PersonIdent; -import org.eclipse.jgit.lib.Ref; -import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.util.FileUtils; -import org.junit.Test; - -public class GcNumberOfPackFilesAfterBitmapStatisticsTest extends GcTestCase { - @Test - public void testShouldReportZeroObjectsForInitializedRepo() - throws IOException { - assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap); - } - - @Test - public void testShouldReportAllPackFilesWhenNoGcWasPerformed() - throws Exception { - packAndPrune(); - long result = gc.getStatistics().numberOfPackFilesAfterBitmap; - - assertEquals(repo.getObjectDatabase().getPacks().size(), result); - } - - @Test - public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception { - // given - addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - assertEquals(0L, gc.getStatistics().numberOfPackFilesAfterBitmap); - } - - @Test - public void testShouldReportNewObjectsAfterGcWhenRepositoryProgresses() - throws Exception { - // commit & gc - RevCommit parent = addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - - // progress & pack - addCommit(parent); - packAndPrune(); - - assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap); - } - - @Test - public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresses() - throws Exception { - // commit & gc - RevCommit parent = addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - - // progress & gc - parent = addCommit(parent); - gc.gc().get(); - assertEquals(2L, repositoryBitmapFiles()); - - // progress & pack - addCommit(parent); - packAndPrune(); - - assertEquals(1L, gc.getStatistics().numberOfPackFilesAfterBitmap); - } - - private void packAndPrune() throws Exception { - try (SkipNonExistingFilesTestRepository testRepo = new SkipNonExistingFilesTestRepository( - repo)) { - testRepo.packAndPrune(); - } - } - - private RevCommit addCommit(RevCommit parent) throws Exception { - return tr.branch("master").commit() - .author(new PersonIdent("repo-metrics", "repo@metrics.com")) - .parent(parent).create(); - } - - private long repositoryBitmapFiles() throws IOException { - return StreamSupport - .stream(Files - .newDirectoryStream(repo.getObjectDatabase() - .getPackDirectory().toPath(), "pack-*.bitmap") - .spliterator(), false) - .count(); - } - - /** - * The TestRepository has a {@link TestRepository#packAndPrune()} function - * but it fails in the last step after GC was performed as it doesn't - * SKIP_MISSING files. In order to circumvent it was copied and improved - * here. - */ - private static class SkipNonExistingFilesTestRepository - extends TestRepository { - private final FileRepository repo; - - private SkipNonExistingFilesTestRepository(FileRepository db) throws IOException { - super(db); - repo = db; - } - - @Override - public void packAndPrune() throws Exception { - ObjectDirectory odb = repo.getObjectDatabase(); - NullProgressMonitor m = NullProgressMonitor.INSTANCE; - - final PackFile pack, idx; - try (PackWriter pw = new PackWriter(repo)) { - Set all = new HashSet<>(); - for (Ref r : repo.getRefDatabase().getRefs()) - all.add(r.getObjectId()); - pw.preparePack(m, all, PackWriter.NONE); - - pack = new PackFile(odb.getPackDirectory(), pw.computeName(), - PackExt.PACK); - try (OutputStream out = new BufferedOutputStream( - new FileOutputStream(pack))) { - pw.writePack(m, m, out); - } - pack.setReadOnly(); - - idx = pack.create(PackExt.INDEX); - try (OutputStream out = new BufferedOutputStream( - new FileOutputStream(idx))) { - pw.writeIndex(out); - } - idx.setReadOnly(); - } - - odb.openPack(pack); - updateServerInfo(); - - // alternative packAndPrune implementation that skips missing files - // after GC. - for (Pack p : odb.getPacks()) { - for (MutableEntry e : p) - FileUtils.delete(odb.fileFor(e.toObjectId()), - FileUtils.SKIP_MISSING); - } - } - } -} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java new file mode 100644 index 0000000000..42cb3cd0c2 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2024 Jacek Centkowski and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import static org.junit.Assert.assertEquals; + +import java.io.BufferedOutputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.StreamSupport; + +import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.internal.storage.pack.PackWriter; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.util.FileUtils; +import org.junit.Test; + +public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { + @Test + public void testShouldReportZeroObjectsForInitializedRepo() + throws IOException { + assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportAllPackFilesWhenNoGcWasPerformed() + throws Exception { + packAndPrune(); + long result = gc.getStatistics().numberOfPackFilesSinceBitmap; + + assertEquals(repo.getObjectDatabase().getPacks().size(), result); + } + + @Test + public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception { + // given + addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportNewObjectsSinceGcWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & gc + parent = addCommit(parent); + gc.gc().get(); + assertEquals(2L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + private void packAndPrune() throws Exception { + try (SkipNonExistingFilesTestRepository testRepo = new SkipNonExistingFilesTestRepository( + repo)) { + testRepo.packAndPrune(); + } + } + + private RevCommit addCommit(RevCommit parent) throws Exception { + return tr.branch("master").commit() + .author(new PersonIdent("repo-metrics", "repo@metrics.com")) + .parent(parent).create(); + } + + private long repositoryBitmapFiles() throws IOException { + return StreamSupport + .stream(Files + .newDirectoryStream(repo.getObjectDatabase() + .getPackDirectory().toPath(), "pack-*.bitmap") + .spliterator(), false) + .count(); + } + + /** + * The TestRepository has a {@link TestRepository#packAndPrune()} function + * but it fails in the last step after GC was performed as it doesn't + * SKIP_MISSING files. In order to circumvent it was copied and improved + * here. + */ + private static class SkipNonExistingFilesTestRepository + extends TestRepository { + private final FileRepository repo; + + private SkipNonExistingFilesTestRepository(FileRepository db) throws IOException { + super(db); + repo = db; + } + + @Override + public void packAndPrune() throws Exception { + ObjectDirectory odb = repo.getObjectDatabase(); + NullProgressMonitor m = NullProgressMonitor.INSTANCE; + + final PackFile pack, idx; + try (PackWriter pw = new PackWriter(repo)) { + Set all = new HashSet<>(); + for (Ref r : repo.getRefDatabase().getRefs()) + all.add(r.getObjectId()); + pw.preparePack(m, all, PackWriter.NONE); + + pack = new PackFile(odb.getPackDirectory(), pw.computeName(), + PackExt.PACK); + try (OutputStream out = new BufferedOutputStream( + new FileOutputStream(pack))) { + pw.writePack(m, m, out); + } + pack.setReadOnly(); + + idx = pack.create(PackExt.INDEX); + try (OutputStream out = new BufferedOutputStream( + new FileOutputStream(idx))) { + pw.writeIndex(out); + } + idx.setReadOnly(); + } + + odb.openPack(pack); + updateServerInfo(); + + // alternative packAndPrune implementation that skips missing files + // after GC. + for (Pack p : odb.getPacks()) { + for (MutableEntry e : p) + FileUtils.delete(odb.fileFor(e.toObjectId()), + FileUtils.SKIP_MISSING); + } + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index ee6abc372c..9494057a60 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1512,7 +1512,7 @@ public class GC { * The number of pack files that were created after the last bitmap * generation. */ - public long numberOfPackFilesAfterBitmap; + public long numberOfPackFilesSinceBitmap; /** * The number of objects stored as loose objects. @@ -1549,8 +1549,8 @@ public class GC { final StringBuilder b = new StringBuilder(); b.append("numberOfPackedObjects=").append(numberOfPackedObjects); //$NON-NLS-1$ b.append(", numberOfPackFiles=").append(numberOfPackFiles); //$NON-NLS-1$ - b.append(", numberOfPackFilesAfterBitmap=") //$NON-NLS-1$ - .append(numberOfPackFilesAfterBitmap); + b.append(", numberOfPackFilesSinceBitmap=") //$NON-NLS-1$ + .append(numberOfPackFilesSinceBitmap); b.append(", numberOfLooseObjects=").append(numberOfLooseObjects); //$NON-NLS-1$ b.append(", numberOfLooseRefs=").append(numberOfLooseRefs); //$NON-NLS-1$ b.append(", numberOfPackedRefs=").append(numberOfPackedRefs); //$NON-NLS-1$ @@ -1578,7 +1578,7 @@ public class GC { if (p.getBitmapIndex() != null) { ret.numberOfBitmaps += p.getBitmapIndex().getBitmapCount(); } else { - ret.numberOfPackFilesAfterBitmap++; + ret.numberOfPackFilesSinceBitmap++; } } File objDir = repo.getObjectsDirectory(); -- cgit v1.2.3 From a22a48d27b13e42ed46f9a0633bd08a29ee431cd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 12 Nov 2024 15:49:41 +0100 Subject: JGit v7.1.0.202411121450-m3 Signed-off-by: Matthias Sohn Change-Id: I5850cdc569eb5d13763f81e9b8332fe70207a4fd --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index cc2cecb6ae..554b213088 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1921cf1f9d..fad8bc9568 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index da001763da..5916991601 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 4bac377fbf..62fb9ceea3 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 805d2fb94b..ac267af77f 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 0c07d5f5a1..5d31b16691 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index cb710c0daf..3661788325 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 3c01f2ad75..c36a4af93a 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e0fb94085d..f2dfd87705 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index dde8c148d9..0c9d7fa020 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.test - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index a86f5ab2c6..96e94d3903 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index c4442b9fbf..fb7d96acc8 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 1413c44dcb..b71062ab40 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 82690f8520..e4517c4cc3 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 1a541c5b02..09dee2b070 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d678a1e444..aea6834c84 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index cd70e113cd..100d094afa 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7b0f5d365d..028d5d9e4b 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 23eb132afd..860ec84edf 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 02fd70b8d7..b8b4f4c5c0 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f69febd1f3..0bc8c63539 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 58245d3404..97bf60085a 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9e7ea160ba..aa58340f42 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 1e8eec0ac0..db908fac95 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index ef53b03cba..c7f2a79db1 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fdc9f9694..e64d598c9e 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 9bbabc6007..72750673f9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 9ce8de90b9..98511148e5 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2e74ff506b..d01ecc4f01 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 744309749d..ed524ef8c5 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 1e41d0819f..7c426a4d0c 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index af83647318..2dfa250b10 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 5b6870d597..5334fbc7b2 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 968078a644..74da60be20 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 56178d05fd..9975089f68 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 796db2ca59..b97603ff91 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 297ee3d28d..792662b95b 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 506141dd58..271322ed3a 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 42547756dc..c0bde7a07a 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f24ea1bc60..69b26f7f45 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 066068378b..2e4e6a408b 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 134556d081..6424d773bc 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index e971a9a608..f79ddf109b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 1d16f52428..caa14f4d44 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index aabda306e9..f8e2a9548a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 686e561621..6af632a45d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 7a797e7762..262281140a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 7ab15719d1..639d6c6024 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index fc73ea87c1..1ed1b1b6ce 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 458b99e35e..1b4f73156a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2aa2979b65..e673d4068a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index a3cdc4af05..09e51a5d7a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 509f68834e..7a707acfe6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 09d8053267..25dbbf72bc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 711e5b9421..cd97d81c53 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index e774a47fcb..ca2ac4a843 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 7fafa3bbde..40b26afedf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index d550bbbe05..92298d59c8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index ce1d446d7f..ea349e793c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 88a8fd5635..18c5fdc1bb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 195e286499..2faf236150 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index aba1324d05..48412deb43 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 7054afcb27..1da4ecaa93 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 1b67e0ae5b..00bfe7cde2 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 26717ff61c..5249c3264b 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 69f703fe12..eefa12dc06 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 32736cfab8..a555d9b8d3 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 107d3dc814..8ee9ec6fb2 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 6d42144623..bd07b0f47d 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 6c99ff97e1..759654bd8b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index c8300aa8c0..e1e785bbb8 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 8e123867e4..4a46437ed3 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 826d33009b..1871c49f5a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index d39f45f342..4d1006fd90 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index da42323474..d7a0068a6b 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index aa32e25a4e..9606d4fa90 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e141c7e7f3..3517dd5852 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 4e004ea95e..708b361869 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 675754cda6..463f0de0a3 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 51252ee7b7..3343da9bf4 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index a992c24509..a8fc07e250 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index f925a282d6..945166fd6c 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 1c15155d37..0fa4aaef78 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 0819f8024f..3843d95f83 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d5fe05d98e..3db7f816f0 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 07188a0f16..1b335e09f3 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411121450-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index f78f3638bd..2255268cd9 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411121450-m3 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202411121450-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e012cbc049..b6b1990887 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index e7f24fe083..2907e93f45 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0-SNAPSHOT + 7.1.0.202411121450-m3 JGit - Parent ${jgit-url} -- cgit v1.2.3 From f2831956807964e9a97319ab22d8fb74231ecd5d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 13 Nov 2024 13:22:35 +0100 Subject: Prepare 7.1.0-SNAPSHOT builds Change-Id: Id5379361dd8673e91c998b56f2ee61e041da6113 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 554b213088..cc2cecb6ae 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index fad8bc9568..1921cf1f9d 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 5916991601..da001763da 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 62fb9ceea3..4bac377fbf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index ac267af77f..805d2fb94b 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 5d31b16691..0c07d5f5a1 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 3661788325..cb710c0daf 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index c36a4af93a..3c01f2ad75 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index f2dfd87705..e0fb94085d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 0c9d7fa020..dde8c148d9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 96e94d3903..a86f5ab2c6 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index fb7d96acc8..c4442b9fbf 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index b71062ab40..1413c44dcb 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index e4517c4cc3..82690f8520 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 09dee2b070..1a541c5b02 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index aea6834c84..d678a1e444 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 100d094afa..cd70e113cd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 028d5d9e4b..7b0f5d365d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 860ec84edf..23eb132afd 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index b8b4f4c5c0..02fd70b8d7 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 0bc8c63539..f69febd1f3 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 97bf60085a..58245d3404 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index aa58340f42..9e7ea160ba 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index db908fac95..1e8eec0ac0 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index c7f2a79db1..ef53b03cba 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index e64d598c9e..4fdc9f9694 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 72750673f9..9bbabc6007 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 98511148e5..9ce8de90b9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d01ecc4f01..2e74ff506b 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index ed524ef8c5..744309749d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 7c426a4d0c..1e41d0819f 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 2dfa250b10..af83647318 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 5334fbc7b2..5b6870d597 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 74da60be20..968078a644 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 9975089f68..56178d05fd 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index b97603ff91..796db2ca59 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 792662b95b..297ee3d28d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 271322ed3a..506141dd58 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index c0bde7a07a..42547756dc 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 69b26f7f45..f24ea1bc60 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 2e4e6a408b..066068378b 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 6424d773bc..134556d081 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index f79ddf109b..e971a9a608 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index caa14f4d44..1d16f52428 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index f8e2a9548a..aabda306e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 6af632a45d..686e561621 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 262281140a..7a797e7762 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 639d6c6024..7ab15719d1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 1ed1b1b6ce..fc73ea87c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 1b4f73156a..458b99e35e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index e673d4068a..2aa2979b65 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 09e51a5d7a..a3cdc4af05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 7a707acfe6..509f68834e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 25dbbf72bc..09d8053267 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index cd97d81c53..711e5b9421 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index ca2ac4a843..e774a47fcb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 40b26afedf..7fafa3bbde 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 92298d59c8..d550bbbe05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index ea349e793c..ce1d446d7f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 18c5fdc1bb..88a8fd5635 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 2faf236150..195e286499 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 48412deb43..aba1324d05 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 1da4ecaa93..7054afcb27 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 00bfe7cde2..1b67e0ae5b 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 5249c3264b..26717ff61c 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index eefa12dc06..69f703fe12 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index a555d9b8d3..32736cfab8 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 8ee9ec6fb2..107d3dc814 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index bd07b0f47d..6d42144623 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 759654bd8b..6c99ff97e1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index e1e785bbb8..c8300aa8c0 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 4a46437ed3..8e123867e4 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 1871c49f5a..826d33009b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 4d1006fd90..d39f45f342 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index d7a0068a6b..da42323474 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 9606d4fa90..aa32e25a4e 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 3517dd5852..e141c7e7f3 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 708b361869..4e004ea95e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 463f0de0a3..675754cda6 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 3343da9bf4..51252ee7b7 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index a8fc07e250..a992c24509 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 945166fd6c..f925a282d6 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 0fa4aaef78..1c15155d37 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 3843d95f83..0819f8024f 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 3db7f816f0..d5fe05d98e 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 1b335e09f3..07188a0f16 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.202411121450-m3 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 2255268cd9..f78f3638bd 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411121450-m3 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202411121450-m3";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index b6b1990887..e012cbc049 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 2907e93f45..e7f24fe083 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0.202411121450-m3 + 7.1.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 4815db563bd106605b55c0e30d637150b02aa6b3 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 12 Nov 2024 15:40:43 -0800 Subject: [errorprone] ssh: suppress warning for arrays in records Errorpone considers an error to have arrays (mutable) inside records (immutable) [1]. Suppress the warnings in these records, as they are overriding equals and hash to do the right thing. [1] https://errorprone.info/bugpattern/ArrayRecordComponent Change-Id: I01c724516b1b14d512d366a35708436463fccffc --- .../src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java | 1 + .../src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java index 92cf1faec9..cfbe7a78a7 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java @@ -82,6 +82,7 @@ final class AllowedSigners extends ModifiableFileWatcher { private static final Predicate PLAIN_KEYS = Predicate .not(CERTIFICATES); + @SuppressWarnings("ArrayRecordComponent") static record AllowedEntry(String[] identities, boolean isCA, String[] namespaces, Instant validAfter, Instant validBefore, String key) { diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java index 46518d8c84..6b19eb3295 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/OpenSshBinaryKrl.java @@ -90,6 +90,7 @@ class OpenSshBinaryKrl { * @param blob * the array to wrap */ + @SuppressWarnings("ArrayRecordComponent") private static record Blob(byte[] blob) { @Override -- cgit v1.2.3 From c64bc936938b1388065be1c89eb929278b505a87 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 13 Nov 2024 11:58:06 -0800 Subject: SystemReader: Give a default implementation to #getTimezoneAt() This abstract method forces subclasses (e.g. DelegateSystemReader in gerrit) to update their code, but there is no strong reason to make it abstract (subclasses can override it if needed). Make the method concrete using the current default implementation (which is the same in the mock). Change-Id: Id1df0d71cab1d86879adf48e782f0050d3abcfa9 --- .../src/org/eclipse/jgit/junit/MockSystemReader.java | 5 ----- org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java | 9 +++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index b0365aa7e1..b0a1827265 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -244,11 +244,6 @@ public class MockSystemReader extends SystemReader { return getTimeZone().getOffset(when) / (60 * 1000); } - @Override - public ZoneOffset getTimeZoneAt(Instant when) { - return getTimeZoneId().getRules().getOffset(when); - } - @Override public TimeZone getTimeZone() { return TimeZone.getTimeZone("GMT-03:30"); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 7150e471bc..18b0e152c9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -178,11 +178,6 @@ public abstract class SystemReader { public int getTimezone(long when) { return getTimeZone().getOffset(when) / (60 * 1000); } - - @Override - public ZoneOffset getTimeZoneAt(Instant when) { - return getTimeZoneId().getRules().getOffset(when); - } } /** @@ -569,7 +564,9 @@ public abstract class SystemReader { * @return the local time zone * @since 7.1 */ - public abstract ZoneOffset getTimeZoneAt(Instant when); + public ZoneOffset getTimeZoneAt(Instant when) { + return getTimeZoneId().getRules().getOffset(when); + } /** * Get system time zone, possibly mocked for testing -- cgit v1.2.3 From 6cf5d194f528428f94bda3e2a1a8468244008c81 Mon Sep 17 00:00:00 2001 From: XenoAmess Date: Tue, 24 Sep 2024 04:18:06 +0800 Subject: RawText: improve performance of isCrLfText and isBinary Inline the function isBinary(byte, byte), and reduce several duplicated checks in it, for better performance. Change-Id: Ida855ed4fd7456d8fb7ed68f3af2dbfa0e25897c --- .../eclipse/jgit/benchmarks/RawTextBenchmark.java | 454 +++++++++++++++++++++ .../src/org/eclipse/jgit/diff/RawText.java | 49 ++- 2 files changed, 483 insertions(+), 20 deletions(-) create mode 100644 org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/RawTextBenchmark.java diff --git a/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/RawTextBenchmark.java b/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/RawTextBenchmark.java new file mode 100644 index 0000000000..19297ebebb --- /dev/null +++ b/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/RawTextBenchmark.java @@ -0,0 +1,454 @@ +/* + * Copyright (C) 2022, Matthias Sohn and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.benchmarks; + +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Measurement; +import org.openjdk.jmh.annotations.Mode; +import org.openjdk.jmh.annotations.OutputTimeUnit; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.Setup; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.TearDown; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; +import org.openjdk.jmh.runner.Runner; +import org.openjdk.jmh.runner.RunnerException; +import org.openjdk.jmh.runner.options.Options; +import org.openjdk.jmh.runner.options.OptionsBuilder; + +import java.util.concurrent.TimeUnit; + +import static org.eclipse.jgit.diff.RawText.getBufferSize; +import static org.eclipse.jgit.diff.RawText.isBinary; +import static org.eclipse.jgit.diff.RawText.isCrLfText; + +@State(Scope.Thread) +public class RawTextBenchmark { + + @State(Scope.Benchmark) + public static class BenchmarkState { + + @Param({"1", "2", "3", "4", "5", "6"}) + int testIndex; + + @Param({"false", "true"}) + boolean complete; + + byte[] bytes; + + @Setup + public void setupBenchmark() { + switch (testIndex) { + case 1: { + byte[] tmpBytes = "a".repeat(102400).getBytes(); + bytes = tmpBytes; + break; + } + case 2: { + byte[] tmpBytes = "a".repeat(102400).getBytes(); + byte[] tmpBytes2 = new byte[tmpBytes.length + 1]; + System.arraycopy(tmpBytes, 0, tmpBytes2, 0, tmpBytes.length); + tmpBytes2[500] = '\0'; + tmpBytes2[tmpBytes.length] = '\0'; + bytes = tmpBytes2; + break; + } + case 3: { + byte[] tmpBytes = "a".repeat(102400).getBytes(); + byte[] tmpBytes2 = new byte[tmpBytes.length + 1]; + System.arraycopy(tmpBytes, 0, tmpBytes2, 0, tmpBytes.length); + tmpBytes2[500] = '\r'; + tmpBytes2[tmpBytes.length] = '\r'; + bytes = tmpBytes2; + break; + } + case 4: { + byte[] tmpBytes = "a".repeat(102400).getBytes(); + byte[] tmpBytes2 = new byte[tmpBytes.length + 1]; + System.arraycopy(tmpBytes, 0, tmpBytes2, 0, tmpBytes.length); + tmpBytes2[499] = '\r'; + tmpBytes2[500] = '\n'; + tmpBytes2[tmpBytes.length - 1] = '\r'; + tmpBytes2[tmpBytes.length] = '\n'; + bytes = tmpBytes2; + break; + } + case 5: { + byte[] tmpBytes = "a".repeat(102400).getBytes(); + tmpBytes[0] = '\0'; + bytes = tmpBytes; + break; + } + case 6: { + byte[] tmpBytes = "a".repeat(102400).getBytes(); + tmpBytes[0] = '\r'; + bytes = tmpBytes; + break; + } + default: + } + } + + @TearDown + public void teardown() { + } + } + + @Benchmark + @BenchmarkMode({Mode.AverageTime}) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + @Warmup(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(1) + public void testIsCrLfTextOld(Blackhole blackhole, BenchmarkState state) { + blackhole.consume( + isCrLfTextOld( + state.bytes, + state.bytes.length, + state.complete + ) + ); + } + + @Benchmark + @BenchmarkMode({Mode.AverageTime}) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + @Warmup(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(1) + public void testIsCrLfTextNewCandidate1(Blackhole blackhole, BenchmarkState state) { + blackhole.consume( + isCrLfTextNewCandidate1( + state.bytes, + state.bytes.length, + state.complete + ) + ); + } + + @Benchmark + @BenchmarkMode({Mode.AverageTime}) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + @Warmup(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(1) + public void testIsCrLfTextNewCandidate2(Blackhole blackhole, BenchmarkState state) { + blackhole.consume( + isCrLfTextNewCandidate2( + state.bytes, + state.bytes.length, + state.complete + ) + ); + } + + @Benchmark + @BenchmarkMode({Mode.AverageTime}) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + @Warmup(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(1) + public void testIsCrLfTextNewCandidate3(Blackhole blackhole, BenchmarkState state) { + blackhole.consume( + isCrLfTextNewCandidate3( + state.bytes, + state.bytes.length, + state.complete + ) + ); + } + + @Benchmark + @BenchmarkMode({Mode.AverageTime}) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + @Warmup(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(1) + public void testIsCrLfTextNew(Blackhole blackhole, BenchmarkState state) { + blackhole.consume( + isCrLfText( + state.bytes, + state.bytes.length, + state.complete + ) + ); + } + + @Benchmark + @BenchmarkMode({Mode.AverageTime}) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + @Warmup(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(1) + public void testIsBinaryOld(Blackhole blackhole, BenchmarkState state) { + blackhole.consume( + isBinaryOld( + state.bytes, + state.bytes.length, + state.complete + ) + ); + } + + + @Benchmark + @BenchmarkMode({Mode.AverageTime}) + @OutputTimeUnit(TimeUnit.NANOSECONDS) + @Warmup(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(1) + public void testIsBinaryNew(Blackhole blackhole, BenchmarkState state) { + blackhole.consume( + isBinary( + state.bytes, + state.bytes.length, + state.complete + ) + ); + } + + + /** + * Determine heuristically whether a byte array represents binary (as + * opposed to text) content. + * + * @param raw + * the raw file content. + * @param length + * number of bytes in {@code raw} to evaluate. This should be + * {@code raw.length} unless {@code raw} was over-allocated by + * the caller. + * @param complete + * whether {@code raw} contains the whole data + * @return true if raw is likely to be a binary file, false otherwise + * @since 6.0 + */ + public static boolean isBinaryOld(byte[] raw, int length, boolean complete) { + // Similar heuristic as C Git. Differences: + // - limited buffer size; may be only the beginning of a large blob + // - no counting of printable vs. non-printable bytes < 0x20 and 0x7F + int maxLength = getBufferSize(); + boolean isComplete = complete; + if (length > maxLength) { + // We restrict the length in all cases to getBufferSize() to get + // predictable behavior. Sometimes we load streams, and sometimes we + // have the full data in memory. With streams, we never look at more + // than the first getBufferSize() bytes. If we looked at more when + // we have the full data, different code paths in JGit might come to + // different conclusions. + length = maxLength; + isComplete = false; + } + byte last = 'x'; // Just something inconspicuous. + for (int ptr = 0; ptr < length; ptr++) { + byte curr = raw[ptr]; + if (isBinary(curr, last)) { + return true; + } + last = curr; + } + if (isComplete) { + // Buffer contains everything... + return last == '\r'; // ... so this must be a lone CR + } + return false; + } + + /** + * Determine heuristically whether a byte array represents text content + * using CR-LF as line separator. + * + * @param raw the raw file content. + * @param length number of bytes in {@code raw} to evaluate. + * @param complete whether {@code raw} contains the whole data + * @return {@code true} if raw is likely to be CR-LF delimited text, + * {@code false} otherwise + * @since 6.0 + */ + public static boolean isCrLfTextOld(byte[] raw, int length, boolean complete) { + boolean has_crlf = false; + byte last = 'x'; // Just something inconspicuous + for (int ptr = 0; ptr < length; ptr++) { + byte curr = raw[ptr]; + if (isBinary(curr, last)) { + return false; + } + if (curr == '\n' && last == '\r') { + has_crlf = true; + } + last = curr; + } + if (last == '\r') { + if (complete) { + // Lone CR: it's binary after all. + return false; + } + // Tough call. If the next byte, which we don't have, would be a + // '\n', it'd be a CR-LF text, otherwise it'd be binary. Just decide + // based on what we already scanned; it wasn't binary until now. + } + return has_crlf; + } + + /** + * Determine heuristically whether a byte array represents text content + * using CR-LF as line separator. + * + * @param raw + * the raw file content. + * @param length + * number of bytes in {@code raw} to evaluate. + * @return {@code true} if raw is likely to be CR-LF delimited text, + * {@code false} otherwise + * @param complete + * whether {@code raw} contains the whole data + * @since 6.0 + */ + public static boolean isCrLfTextNewCandidate1(byte[] raw, int length, boolean complete) { + boolean has_crlf = false; + + // first detect empty + if (length <= 0) { + return false; + } + + // next detect '\0' + for (int reversePtr = length - 1; reversePtr >= 0; --reversePtr) { + if (raw[reversePtr] == '\0') { + return false; + } + } + + // if '\r' be last, then if complete then return non-crlf + if (raw[length - 1] == '\r' && complete) { + return false; + } + + for (int ptr = 0; ptr < length - 1; ptr++) { + byte curr = raw[ptr]; + if (curr == '\r') { + byte next = raw[ptr + 1]; + if (next != '\n') { + return false; + } + // else + // we have crlf here + has_crlf = true; + // as next is '\n', it can never be '\r', just skip it from next check + ++ptr; + } + } + + return has_crlf; + } + + /** + * Determine heuristically whether a byte array represents text content + * using CR-LF as line separator. + * + * @param raw + * the raw file content. + * @param length + * number of bytes in {@code raw} to evaluate. + * @return {@code true} if raw is likely to be CR-LF delimited text, + * {@code false} otherwise + * @param complete + * whether {@code raw} contains the whole data + * @since 6.0 + */ + public static boolean isCrLfTextNewCandidate2(byte[] raw, int length, boolean complete) { + boolean has_crlf = false; + + // first detect empty + if (length <= 0) { + return false; + } + + // if '\r' be last, then if complete then return non-crlf + byte last = raw[length - 1]; + if (last == '\0' || last == '\r' && complete) { + return false; + } + + for (int ptr = 0; ptr < length - 1; ptr++) { + byte b = raw[ptr]; + switch (b) { + case '\0': + return false; + case '\r': { + ++ptr; + b = raw[ptr]; + if (b != '\n') { + return false; + } + // else + // we have crlf here + has_crlf = true; + // as next is '\n', it can never be '\r', just skip it from next check + break; + } + default: + // do nothing; + break; + } + } + + return has_crlf; + } + + /** + * Determine heuristically whether a byte array represents text content + * using CR-LF as line separator. + * + * @param raw + * the raw file content. + * @param length + * number of bytes in {@code raw} to evaluate. + * @return {@code true} if raw is likely to be CR-LF delimited text, + * {@code false} otherwise + * @param complete + * whether {@code raw} contains the whole data + * @since 6.0 + */ + public static boolean isCrLfTextNewCandidate3(byte[] raw, int length, boolean complete) { + boolean has_crlf = false; + + int ptr = -1; + byte current; + while (ptr < length - 2) { + current = raw[++ptr]; + if ('\0' == current || '\r' == current && (raw[++ptr] != '\n' || !(has_crlf = true))) { + return false; + } + } + + if (ptr == length - 2) { + // if '\r' be last, then if isComplete then return binary + current = raw[++ptr]; + if('\0' == current || '\r' == current && complete){ + return false; + } + } + + return has_crlf; + } + + + public static void main(String[] args) throws RunnerException { + Options opt = new OptionsBuilder() + .include(RawTextBenchmark.class.getSimpleName()) + .forks(1).jvmArgs("-ea").build(); + new Runner(opt).run(); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java index 76dc87e72b..5a4d2aa45a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java @@ -360,18 +360,22 @@ public class RawText extends Sequence { length = maxLength; isComplete = false; } - byte last = 'x'; // Just something inconspicuous. - for (int ptr = 0; ptr < length; ptr++) { - byte curr = raw[ptr]; - if (isBinary(curr, last)) { + + int ptr = -1; + byte current; + while (ptr < length - 2) { + current = raw[++ptr]; + if ('\0' == current || '\r' == current && raw[++ptr] != '\n') { return true; } - last = curr; } - if (isComplete) { - // Buffer contains everything... - return last == '\r'; // ... so this must be a lone CR + + if (ptr == length - 2) { + // if '\r' be last, then if isComplete then return binary + current = raw[++ptr]; + return '\0' == current || '\r' == current && isComplete; } + return false; } @@ -467,26 +471,30 @@ public class RawText extends Sequence { */ public static boolean isCrLfText(byte[] raw, int length, boolean complete) { boolean has_crlf = false; - byte last = 'x'; // Just something inconspicuous - for (int ptr = 0; ptr < length; ptr++) { - byte curr = raw[ptr]; - if (isBinary(curr, last)) { + + int ptr = -1; + byte current; + while (ptr < length - 2) { + current = raw[++ptr]; + if (current == '\0') { return false; } - if (curr == '\n' && last == '\r') { + if (current == '\r') { + if (raw[++ptr] != '\n') { + return false; + } has_crlf = true; } - last = curr; } - if (last == '\r') { - if (complete) { - // Lone CR: it's binary after all. + + if (ptr == length - 2) { + // if '\r' be last, then if isComplete then return binary + current = raw[++ptr]; + if('\0' == current || '\r' == current && complete){ return false; } - // Tough call. If the next byte, which we don't have, would be a - // '\n', it'd be a CR-LF text, otherwise it'd be binary. Just decide - // based on what we already scanned; it wasn't binary until now. } + return has_crlf; } @@ -578,4 +586,5 @@ public class RawText extends Sequence { return new RawText(data, RawParseUtils.lineMapOrBinary(data, 0, (int) sz)); } } + } -- cgit v1.2.3 From 236778e3101604b701b67e8e6c27be0e2bb8a1ff Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 12 Nov 2024 12:26:02 -0800 Subject: MockSystemReader: create the right time zone Using this timezone in a later commit, it complains: Exception java.time.DateTimeException: Zone offset minutes and seconds must be negative because hours is negative Change-Id: I5787b51f98109942ac33e0496c5e3761914b2a78 --- org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index b0a1827265..bf236ab17d 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -251,7 +251,7 @@ public class MockSystemReader extends SystemReader { @Override public ZoneId getTimeZoneId() { - return ZoneOffset.ofHoursMinutes(-3, 30); + return ZoneOffset.ofHoursMinutes(-3, -30); } @Override -- cgit v1.2.3 From 13a1ce7466eb620773930f1d485cb9b31c6bda2c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 13 Nov 2024 16:11:17 -0800 Subject: [errorprone] RawText: Add parenthesis for explicit op precedence errorprone reports: [OperatorPrecedence] Use grouping parenthesis to make the operator precedence explicit Take the chance to fix also https://errorprone.info/bugpattern/YodaCondition in the same lines. Change-Id: I6d8f00842ef2bb24cd00fc413121b8a4e20c186b --- org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java index 5a4d2aa45a..fdfe533618 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java @@ -365,7 +365,7 @@ public class RawText extends Sequence { byte current; while (ptr < length - 2) { current = raw[++ptr]; - if ('\0' == current || '\r' == current && raw[++ptr] != '\n') { + if (current == '\0' || (current == '\r' && raw[++ptr] != '\n')) { return true; } } @@ -373,7 +373,7 @@ public class RawText extends Sequence { if (ptr == length - 2) { // if '\r' be last, then if isComplete then return binary current = raw[++ptr]; - return '\0' == current || '\r' == current && isComplete; + return current == '\0' || (current == '\r' && isComplete); } return false; @@ -490,7 +490,7 @@ public class RawText extends Sequence { if (ptr == length - 2) { // if '\r' be last, then if isComplete then return binary current = raw[++ptr]; - if('\0' == current || '\r' == current && complete){ + if (current == '\0' || (current == '\r' && complete)) { return false; } } -- cgit v1.2.3 From c67393562be7e3db0e39cb2d3ff5f8192e2f2cd5 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 13 Nov 2024 16:25:42 -0800 Subject: SystemReader#now: make it a concrete method Abstract methods break subclasses (e.g. DelegateSystemReader in gerrit). Updating jgit and gerrit is simpler if we do not add them. I am not sure why some methods are abstract and others dont, but now() can be a concrete method. Make now() concrete. Implement it by default based on getCurrentTime(), so subclasses overriding that method get the same value. Change-Id: I697749f8cba698c5388ed13ebdc2b238d6259358 --- .../src/org/eclipse/jgit/junit/MockSystemReader.java | 6 ------ org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index bf236ab17d..38f0d0b2cb 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -18,7 +18,6 @@ import java.lang.reflect.Field; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.Duration; -import java.time.Instant; import java.time.ZoneId; import java.time.ZoneOffset; import java.util.HashMap; @@ -204,11 +203,6 @@ public class MockSystemReader extends SystemReader { return now; } - @Override - public Instant now() { - return Instant.ofEpochMilli(now); - } - @Override public MonotonicClock getClock() { return () -> { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 18b0e152c9..7cdf0ee1a2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -532,7 +532,11 @@ public abstract class SystemReader { * * @since 7.1 */ - public abstract Instant now(); + public Instant now() { + // Subclasses overriding getCurrentTime should keep working + // TODO(ifrade): Once we remove getCurrentTime, use Instant.now() + return Instant.ofEpochMilli(getCurrentTime()); + } /** * Get clock instance preferred by this system. -- cgit v1.2.3 From b7856f885bf02af20b07359823396a92ffa6e76e Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 12 Nov 2024 12:29:13 -0800 Subject: SystemReader: add method to get LocalDateTime Using #civilNow() because in the documentation, this calendar-based representation is called "civil time". Change-Id: Iaa363e66683cb548419666068a4ffef44a776e12 --- org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 7cdf0ee1a2..55cc878e02 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -26,6 +26,7 @@ import java.nio.file.Paths; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.time.Instant; +import java.time.LocalDateTime; import java.time.ZoneId; import java.time.ZoneOffset; import java.util.Locale; @@ -538,6 +539,17 @@ public abstract class SystemReader { return Instant.ofEpochMilli(getCurrentTime()); } + /** + * Get "now" as civil time, in the System timezone + * + * @return the current system time + * + * @since 7.1 + */ + public LocalDateTime civilNow() { + return LocalDateTime.ofInstant(now(), getTimeZoneId()); + } + /** * Get clock instance preferred by this system. * -- cgit v1.2.3 From ba905906c1a0b56232ef987db4c6c77d44f25f25 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 14 Nov 2024 22:12:02 +0100 Subject: Change default similarity score to 50(%) to match git's default Git uses a default similarity score of 50(%) for rename detection. Fix RenameDetector to use the same default score. See https://git-scm.com/docs/git-diff#Documentation/git-diff.txt--Mltngt Bug: jgit-110 Change-Id: I4b75910a02bca1afc108ad9e5609fda1e49a29da --- .../src/org/eclipse/jgit/diff/SimilarityRenameDetector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java index 5de7bac112..fb98df7c9e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/SimilarityRenameDetector.java @@ -80,7 +80,7 @@ class SimilarityRenameDetector { private long[] matrix; /** Score a pair must exceed to be considered a rename. */ - private int renameScore = 60; + private int renameScore = 50; /** * File size threshold (in bytes) for detecting renames. Files larger -- cgit v1.2.3 From 2454ea81a27e8ea8447b95714ebe724a1eb0c0fd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 14 Nov 2024 23:28:17 +0100 Subject: PullCommandTest: assert git status in some simple tests Bug: jgit-107 Change-Id: I54856849df7c6959ccc2b6f10de510950d3da401 --- .../tst/org/eclipse/jgit/api/PullCommandTest.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java index 12300b3390..6d5e45c98f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.util.Map; import java.util.concurrent.Callable; import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode; @@ -29,6 +30,7 @@ import org.eclipse.jgit.api.errors.NoHeadException; import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.IndexDiff.StageState; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.Repository; @@ -117,6 +119,7 @@ public class PullCommandTest extends RepositoryTestCase { + db.getWorkTree().getAbsolutePath(); assertEquals(message, mergeCommit.getShortMessage()); } + assertTrue(target.status().call().isClean()); } @Test @@ -153,6 +156,10 @@ public class PullCommandTest extends RepositoryTestCase { assertFileContentsEqual(targetFile, result); assertEquals(RepositoryState.MERGING, target.getRepository() .getRepositoryState()); + Status status = target.status().call(); + Map conflicting = status.getConflictingStageState(); + assertEquals(1, conflicting.size()); + assertEquals(StageState.BOTH_MODIFIED, conflicting.get("SomeFile.txt")); } @Test -- cgit v1.2.3 From eb8b337934ff76eba5c4d5a7c48f2af5cb850341 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 18 Nov 2024 22:26:13 +0100 Subject: Update Jetty to 12.0.15 Change-Id: I8414114bb6c38b62d912e55810b4bf68faf3083f --- WORKSPACE | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.17.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.18.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.19.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.20.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.21.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.22.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.23.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.24.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.25.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.26.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.27.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.28.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.29.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.30.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.31.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.32.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.33.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++++--------- .../org.eclipse.jgit.target/maven/dependencies.tpd | 16 ++++++++-------- pom.xml | 2 +- 21 files changed, 180 insertions(+), 180 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 1050a44cff..e1adb8a082 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -246,54 +246,54 @@ maven_jar( sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", ) -JETTY_VER = "12.0.14" +JETTY_VER = "12.0.15" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, - sha1 = "900856dd4429c9d65404d487b04bd6d4fb11c402", + sha1 = "a9362717fa1756f9f1f18e0ef2ce671e742b7afb", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "7541e45e2228663655d9a446ef727fd83f8dbb50", + sha1 = "e15efd84ed53277f8e893574edaed4734c161f44", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "d28162468454f3b59bc0e7bff9fbc5fc69b5e83e", + sha1 = "2bd3742c6831e42c6ebfa9c990386a8dca71dee8", ) maven_jar( name = "jetty-session", artifact = "org.eclipse.jetty:jetty-session:" + JETTY_VER, - sha1 = "06e4b224a0e9d4bf1441eee65916820f3a56ad1d", + sha1 = "2819021282ff2f7fbaa53feb2fe063130bd4613c", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "6598be473f9ca74b668056affc750bb1988e62ba", + sha1 = "a36fcfde8316b374102c5b43d7247ec501e906d8", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "1ae0bfaf9b900aa7041a71c62b6e674e76c6101f", + sha1 = "e1657f842a0e362171a8a41f35d85cdba1a47872", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "6aea45fc3a7078ee55f3921ec6b0dc660701df85", + sha1 = "9fbd3ac58607af034ad065b366798798bb5f7b5e", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "6f4beb9b482ea0d9db9db0564742aa2e4e0bf3c4", + sha1 = "d5c2f0ea177c5c178874101c186cc9729cf7ea92", ) BOUNCYCASTLE_VER = "1.79" 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 623e964217..bac6f7606b 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 66d68e06f2..6873008db3 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 16b9706b3e..818ce8ab49 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 9604132842..73f0987c5b 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 78149754b4..aa78e25910 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 b5fcaf31dc..a4d6fd3931 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 b57ac90a93..ebd425a7e0 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 dd7081e0ae..cf266ff2c0 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 e5cbf9b35a..d4e3b1c6b3 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 48ffc2f27f..49137654d0 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 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target index 5c7e1a4596..01767088d7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target index 735d1cf5c9..4ec2499f9e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target index 9357dee548..16e793161e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target index 295b9c3c46..767628b910 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target index b9b690ccca..5d0bc9253c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 2407a8708f..efae5a13d6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 78433361fe..1578e4c031 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index c913b9dcca..43678e7317 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-http - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-io - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-security - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-server - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-session - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util - 12.0.14 + 12.0.15 jar org.eclipse.jetty jetty-util-ajax - 12.0.14 + 12.0.15 jar 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 68b457c0f3..7b9a397bfb 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 @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.14" + version = "12.0.15" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.14" + version = "12.0.15" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.14" + version = "12.0.15" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.14" + version = "12.0.15" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.14" + version = "12.0.15" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.14" + version = "12.0.15" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.14" + version = "12.0.15" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.14" + version = "12.0.15" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index e7f24fe083..b55429b95f 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.27.1 6.0.0 6.1.0 - 12.0.14 + 12.0.15 0.21.2 4.5.14 4.4.16 -- cgit v1.2.3 From 2e5fb1fcca27565a37da542b74346f25bfd439aa Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Nov 2024 11:11:40 +0100 Subject: Configure JDT to not raise error on deprecated class linked in javadoc Change-Id: I4f8cdaa3147c03b455ed0656622c6b69b474577a --- org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs index c4dc76fe34..ef3d8ecaba 100644 --- a/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit/.settings/org.eclipse.jdt.core.prefs @@ -40,7 +40,7 @@ org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled -org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled +org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning -- cgit v1.2.3 From 307ef6b4b51f5f9266f6212015a9b5a1f1e75df4 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 11 Nov 2024 13:13:59 -0800 Subject: GitTimeParser: A date parser using the java.time API Replacement of GitDateParser that uses java.time classes instead of the obsolete Date. Updating GitDateParser would have been a mess of deprecation and methods with confusing names, so I opted for writing a parallel class with the new types. Some differences: * The new DateTimeFormatter is thread-safe, so we don't need the LocalThread cache * No code seems to use other locale than the default, we don't need to cache per locale either Change-Id: If24610a055a47702fb5b7be2fc35a7c722480ee3 --- .../jgit/util/GitTimeParserBadlyFormattedTest.java | 62 ++++++ .../org/eclipse/jgit/util/GitTimeParserTest.java | 247 +++++++++++++++++++++ .../src/org/eclipse/jgit/util/GitDateParser.java | 3 + .../src/org/eclipse/jgit/util/GitTimeParser.java | 202 +++++++++++++++++ 4 files changed, 514 insertions(+) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserBadlyFormattedTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserBadlyFormattedTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserBadlyFormattedTest.java new file mode 100644 index 0000000000..e5f162d11a --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserBadlyFormattedTest.java @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2012, Christian Halstrick and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.util; + +import static org.junit.Assert.assertThrows; + +import java.text.ParseException; + +import org.eclipse.jgit.junit.MockSystemReader; +import org.junit.After; +import org.junit.Before; +import org.junit.experimental.theories.DataPoints; +import org.junit.experimental.theories.Theories; +import org.junit.experimental.theories.Theory; +import org.junit.runner.RunWith; + +/** + * Tests which assert that unparseable Strings lead to ParseExceptions + */ +@RunWith(Theories.class) +public class GitTimeParserBadlyFormattedTest { + private String dateStr; + + @Before + public void setUp() { + MockSystemReader mockSystemReader = new MockSystemReader(); + SystemReader.setInstance(mockSystemReader); + } + + @After + public void tearDown() { + SystemReader.setInstance(null); + } + + public GitTimeParserBadlyFormattedTest(String dateStr) { + this.dateStr = dateStr; + } + + @DataPoints + public static String[] getDataPoints() { + return new String[] { "", "1970", "3000.3000.3000", "3 yesterday ago", + "now yesterday ago", "yesterdays", "3.day. 2.week.ago", + "day ago", "Gra Feb 21 15:35:00 2007 +0100", + "Sun Feb 21 15:35:00 2007 +0100", + "Wed Feb 21 15:35:00 Grand +0100" }; + } + + @Theory + public void badlyFormattedWithoutRef() { + assertThrows( + "The expected ParseException while parsing '" + dateStr + + "' did not occur.", + ParseException.class, () -> GitTimeParser.parse(dateStr)); + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserTest.java new file mode 100644 index 0000000000..0e5eb283a4 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserTest.java @@ -0,0 +1,247 @@ +/* + * Copyright (C) 2024, Christian Halstrick and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.util; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.text.ParseException; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.Period; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoField; +import java.time.temporal.TemporalAccessor; + +import org.eclipse.jgit.junit.MockSystemReader; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +public class GitTimeParserTest { + MockSystemReader mockSystemReader; + + @Before + public void setUp() { + mockSystemReader = new MockSystemReader(); + SystemReader.setInstance(mockSystemReader); + } + + @After + public void tearDown() { + SystemReader.setInstance(null); + } + + @Test + public void yesterday() throws ParseException { + LocalDateTime parse = GitTimeParser.parse("yesterday"); + + LocalDateTime now = SystemReader.getInstance().civilNow(); + assertEquals(Period.between(parse.toLocalDate(), now.toLocalDate()), + Period.ofDays(1)); + } + + @Test + public void never() throws ParseException { + LocalDateTime parse = GitTimeParser.parse("never"); + assertEquals(LocalDateTime.MAX, parse); + } + + @Test + public void now_pointInTime() throws ParseException { + LocalDateTime aTime = asLocalDateTime("2007-02-21 15:35:00 +0100"); + + LocalDateTime parsedNow = GitTimeParser.parse("now", aTime); + + assertEquals(aTime, parsedNow); + } + + @Test + public void now_systemTime() throws ParseException { + LocalDateTime firstNow = GitTimeParser.parse("now"); + assertEquals(SystemReader.getInstance().civilNow(), firstNow); + mockSystemReader.tick(10); + LocalDateTime secondNow = GitTimeParser.parse("now"); + assertTrue(secondNow.isAfter(firstNow)); + } + + @Test + public void weeksAgo() throws ParseException { + LocalDateTime aTime = asLocalDateTime("2007-02-21 15:35:00 +0100"); + + LocalDateTime parse = GitTimeParser.parse("2 weeks ago", aTime); + assertEquals(asLocalDateTime("2007-02-07 15:35:00 +0100"), parse); + } + + @Test + public void daysAndWeeksAgo() throws ParseException { + LocalDateTime aTime = asLocalDateTime("2007-02-21 15:35:00 +0100"); + + LocalDateTime twoWeeksAgoActual = GitTimeParser.parse("2 weeks ago", + aTime); + + LocalDateTime twoWeeksAgoExpected = asLocalDateTime( + "2007-02-07 15:35:00 +0100"); + assertEquals(twoWeeksAgoExpected, twoWeeksAgoActual); + + LocalDateTime combinedWhitespace = GitTimeParser + .parse("3 days 2 weeks ago", aTime); + LocalDateTime combinedWhitespaceExpected = asLocalDateTime( + "2007-02-04 15:35:00 +0100"); + assertEquals(combinedWhitespaceExpected, combinedWhitespace); + + LocalDateTime combinedDots = GitTimeParser.parse("3.day.2.week.ago", + aTime); + LocalDateTime combinedDotsExpected = asLocalDateTime( + "2007-02-04 15:35:00 +0100"); + assertEquals(combinedDotsExpected, combinedDots); + } + + @Test + public void hoursAgo() throws ParseException { + LocalDateTime aTime = asLocalDateTime("2007-02-21 17:35:00 +0100"); + + LocalDateTime twoHoursAgoActual = GitTimeParser.parse("2 hours ago", + aTime); + + LocalDateTime twoHoursAgoExpected = asLocalDateTime( + "2007-02-21 15:35:00 +0100"); + assertEquals(twoHoursAgoExpected, twoHoursAgoActual); + } + + @Test + public void hoursAgo_acrossDay() throws ParseException { + LocalDateTime aTime = asLocalDateTime("2007-02-21 00:35:00 +0100"); + + LocalDateTime twoHoursAgoActual = GitTimeParser.parse("2 hours ago", + aTime); + + LocalDateTime twoHoursAgoExpected = asLocalDateTime( + "2007-02-20 22:35:00 +0100"); + assertEquals(twoHoursAgoExpected, twoHoursAgoActual); + } + + @Test + public void minutesHoursAgoCombined() throws ParseException { + LocalDateTime aTime = asLocalDateTime("2007-02-04 15:35:00 +0100"); + + LocalDateTime combinedWhitespace = GitTimeParser + .parse("3 hours 2 minutes ago", aTime); + LocalDateTime combinedWhitespaceExpected = asLocalDateTime( + "2007-02-04 12:33:00 +0100"); + assertEquals(combinedWhitespaceExpected, combinedWhitespace); + + LocalDateTime combinedDots = GitTimeParser + .parse("3.hours.2.minutes.ago", aTime); + LocalDateTime combinedDotsExpected = asLocalDateTime( + "2007-02-04 12:33:00 +0100"); + assertEquals(combinedDotsExpected, combinedDots); + } + + @Test + public void minutesAgo() throws ParseException { + LocalDateTime aTime = asLocalDateTime("2007-02-21 17:35:10 +0100"); + + LocalDateTime twoMinutesAgo = GitTimeParser.parse("2 minutes ago", + aTime); + + LocalDateTime twoMinutesAgoExpected = asLocalDateTime( + "2007-02-21 17:33:10 +0100"); + assertEquals(twoMinutesAgoExpected, twoMinutesAgo); + } + + @Test + public void minutesAgo_acrossDay() throws ParseException { + LocalDateTime aTime = asLocalDateTime("2007-02-21 00:35:10 +0100"); + + LocalDateTime minutesAgoActual = GitTimeParser.parse("40 minutes ago", + aTime); + + LocalDateTime minutesAgoExpected = asLocalDateTime( + "2007-02-20 23:55:10 +0100"); + assertEquals(minutesAgoExpected, minutesAgoActual); + } + + @Test + public void iso() throws ParseException { + String dateStr = "2007-02-21 15:35:00 +0100"; + + LocalDateTime actual = GitTimeParser.parse(dateStr); + + LocalDateTime expected = asLocalDateTime(dateStr); + assertEquals(expected, actual); + } + + @Test + public void rfc() throws ParseException { + String dateStr = "Wed, 21 Feb 2007 15:35:00 +0100"; + + LocalDateTime actual = GitTimeParser.parse(dateStr); + + LocalDateTime expected = asLocalDateTime(dateStr, + "EEE, dd MMM yyyy HH:mm:ss Z"); + assertEquals(expected, actual); + } + + @Test + public void shortFmt() throws ParseException { + assertParsing("2007-02-21", "yyyy-MM-dd"); + } + + @Test + public void shortWithDots() throws ParseException { + assertParsing("2007.02.21", "yyyy.MM.dd"); + } + + @Test + public void shortWithSlash() throws ParseException { + assertParsing("02/21/2007", "MM/dd/yyyy"); + } + + @Test + public void shortWithDotsReverse() throws ParseException { + assertParsing("21.02.2007", "dd.MM.yyyy"); + } + + @Test + public void defaultFmt() throws ParseException { + assertParsing("Wed Feb 21 15:35:00 2007 +0100", + "EEE MMM dd HH:mm:ss yyyy Z"); + } + + @Test + public void local() throws ParseException { + assertParsing("Wed Feb 21 15:35:00 2007", "EEE MMM dd HH:mm:ss yyyy"); + } + + private static void assertParsing(String dateStr, String format) + throws ParseException { + LocalDateTime actual = GitTimeParser.parse(dateStr); + + LocalDateTime expected = asLocalDateTime(dateStr, format); + assertEquals(expected, actual); + } + + private static LocalDateTime asLocalDateTime(String dateStr) { + return asLocalDateTime(dateStr, "yyyy-MM-dd HH:mm:ss Z"); + } + + private static LocalDateTime asLocalDateTime(String dateStr, + String pattern) { + DateTimeFormatter fmt = DateTimeFormatter.ofPattern(pattern); + TemporalAccessor ta = fmt + .withZone(SystemReader.getInstance().getTimeZoneId()) + .withLocale(SystemReader.getInstance().getLocale()) + .parse(dateStr); + return ta.isSupported(ChronoField.HOUR_OF_DAY) ? LocalDateTime.from(ta) + : LocalDate.from(ta).atStartOfDay(); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java index 6a4b39652a..f080056546 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateParser.java @@ -28,7 +28,10 @@ import org.eclipse.jgit.internal.JGitText; * used. One example is the parsing of the config parameter gc.pruneexpire. The * parser can handle only subset of what native gits approxidate parser * understands. + * + * @deprecated Use {@link GitTimeParser} instead. */ +@Deprecated(since = "7.1") public class GitDateParser { /** * The Date representing never. Though this is a concrete value, most diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java new file mode 100644 index 0000000000..e238e3e92e --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java @@ -0,0 +1,202 @@ +/* + * Copyright (C) 2024 Christian Halstrick and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.util; + +import java.text.MessageFormat; +import java.text.ParseException; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.time.temporal.ChronoField; +import java.time.temporal.TemporalAccessor; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.jgit.internal.JGitText; + +/** + * Parses strings with time and date specifications into + * {@link java.time.Instant}. + * + * When git needs to parse strings specified by the user this parser can be + * used. One example is the parsing of the config parameter gc.pruneexpire. The + * parser can handle only subset of what native gits approxidate parser + * understands. + * + * @since 7.1 + */ +public class GitTimeParser { + + private static final Map formatCache = new HashMap<>(); + + // An enum of all those formats which this parser can parse with the help of + // a DateTimeFormatter. There are other formats (e.g. the relative formats + // like "yesterday" or "1 week ago") which this parser can parse but which + // are not listed here because they are parsed without the help of a + // DateTimeFormatter. + enum ParseableSimpleDateFormat { + ISO("yyyy-MM-dd HH:mm:ss Z"), // //$NON-NLS-1$ + RFC("EEE, dd MMM yyyy HH:mm:ss Z"), // //$NON-NLS-1$ + SHORT("yyyy-MM-dd"), // //$NON-NLS-1$ + SHORT_WITH_DOTS_REVERSE("dd.MM.yyyy"), // //$NON-NLS-1$ + SHORT_WITH_DOTS("yyyy.MM.dd"), // //$NON-NLS-1$ + SHORT_WITH_SLASH("MM/dd/yyyy"), // //$NON-NLS-1$ + DEFAULT("EEE MMM dd HH:mm:ss yyyy Z"), // //$NON-NLS-1$ + LOCAL("EEE MMM dd HH:mm:ss yyyy"); //$NON-NLS-1$ + + private final String formatStr; + + ParseableSimpleDateFormat(String formatStr) { + this.formatStr = formatStr; + } + } + + /** + * Parses a string into a {@link java.time.LocalDateTime} using the default + * locale. Since this parser also supports relative formats (e.g. + * "yesterday") the caller can specify the reference date. These types of + * strings can be parsed: + *
    + *
  • "never"
    • + *
  • "now"
    • + *
  • "yesterday"
    • + *
  • "(x) years|months|weeks|days|hours|minutes|seconds ago"
    + * Multiple specs can be combined like in "2 weeks 3 days ago". Instead of ' + * ' one can use '.' to separate the words
    • + *
  • "yyyy-MM-dd HH:mm:ss Z" (ISO)
    • + *
  • "EEE, dd MMM yyyy HH:mm:ss Z" (RFC)
    • + *
  • "yyyy-MM-dd"
    • + *
  • "yyyy.MM.dd"
    • + *
  • "MM/dd/yyyy",
    • + *
  • "dd.MM.yyyy"
    • + *
  • "EEE MMM dd HH:mm:ss yyyy Z" (DEFAULT)
    • + *
  • "EEE MMM dd HH:mm:ss yyyy" (LOCAL)
    • + *
+ * + * @param dateStr + * the string to be parsed + * @return the parsed {@link java.time.LocalDateTime} + * @throws java.text.ParseException + * if the given dateStr was not recognized + */ + public static LocalDateTime parse(String dateStr) throws ParseException { + return parse(dateStr, SystemReader.getInstance().civilNow()); + } + + // Only tests seem to use this method + static LocalDateTime parse(String dateStr, LocalDateTime now) + throws ParseException { + dateStr = dateStr.trim(); + LocalDateTime ret; + + if ("never".equalsIgnoreCase(dateStr)) //$NON-NLS-1$ + return LocalDateTime.MAX; + ret = parse_relative(dateStr, now); + if (ret != null) + return ret; + for (ParseableSimpleDateFormat f : ParseableSimpleDateFormat.values()) { + try { + return parse_simple(dateStr, f); + } catch (DateTimeParseException e) { + // simply proceed with the next parser + } + } + ParseableSimpleDateFormat[] values = ParseableSimpleDateFormat.values(); + StringBuilder allFormats = new StringBuilder("\"") //$NON-NLS-1$ + .append(values[0].formatStr); + for (int i = 1; i < values.length; i++) + allFormats.append("\", \"").append(values[i].formatStr); //$NON-NLS-1$ + allFormats.append("\""); //$NON-NLS-1$ + throw new ParseException( + MessageFormat.format(JGitText.get().cannotParseDate, dateStr, + allFormats.toString()), + 0); + } + + // tries to parse a string with the formats supported by DateTimeFormatter + private static LocalDateTime parse_simple(String dateStr, + ParseableSimpleDateFormat f) throws DateTimeParseException { + DateTimeFormatter dateFormat = formatCache.computeIfAbsent(f, + format -> DateTimeFormatter.ofPattern(f.formatStr) + .withLocale(SystemReader.getInstance().getLocale())); + TemporalAccessor parsed = dateFormat.parse(dateStr); + return parsed.isSupported(ChronoField.HOUR_OF_DAY) + ? LocalDateTime.from(parsed) + : LocalDate.from(parsed).atStartOfDay(); + } + + // tries to parse a string with a relative time specification + @SuppressWarnings("nls") + private static LocalDateTime parse_relative(String dateStr, + LocalDateTime now) { + // check for the static words "yesterday" or "now" + if ("now".equals(dateStr)) { + return now; + } + + if ("yesterday".equals(dateStr)) { + return now.minusDays(1); + } + + // parse constructs like "3 days ago", "5.week.2.day.ago" + String[] parts = dateStr.split("\\.| "); + int partsLength = parts.length; + // check we have an odd number of parts (at least 3) and that the last + // part is "ago" + if (partsLength < 3 || (partsLength & 1) == 0 + || !"ago".equals(parts[parts.length - 1])) + return null; + int number; + for (int i = 0; i < parts.length - 2; i += 2) { + try { + number = Integer.parseInt(parts[i]); + } catch (NumberFormatException e) { + return null; + } + if (parts[i + 1] == null) { + return null; + } + switch (parts[i + 1]) { + case "year": + case "years": + now = now.minusYears(number); + break; + case "month": + case "months": + now = now.minusMonths(number); + break; + case "week": + case "weeks": + now = now.minusWeeks(number); + break; + case "day": + case "days": + now = now.minusDays(number); + break; + case "hour": + case "hours": + now = now.minusHours(number); + break; + case "minute": + case "minutes": + now = now.minusMinutes(number); + break; + case "second": + case "seconds": + now = now.minusSeconds(number); + break; + default: + return null; + } + } + return now; + } +} -- cgit v1.2.3 From 92b35db291b5c661037b2724ac40488dbb44f52d Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 15 Nov 2024 10:26:21 -0800 Subject: PersonIdent: Use java.time instead of older Date and milliseconds From errorprone: Date has a bad API that leads to bugs; prefer java.time.Instant or LocalDate. Replace the long with milliseconds and int with minutes offset with an Instant and a ZoneOffset. Create new constructors and deprecate variants with Date, milliseconds and minute offsets. When comparing instances of PersonIdent truncate the timestamp precision to 1 second since git commit timestamps are persisted with 1 second precision [1]. [1] https://git-scm.com/docs/git-commit#Documentation/git-commit.txt-Gitinternalformat Change-Id: Id4ba1f108e1ba0bfcdd87ba37c67e2d3cc7d254f --- .../tst/org/eclipse/jgit/lib/PersonIdentTest.java | 6 +- .../src/org/eclipse/jgit/lib/PersonIdent.java | 141 +++++++++++++++------ 2 files changed, 103 insertions(+), 44 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PersonIdentTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PersonIdentTest.java index 97da1757e0..943a68b82c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PersonIdentTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/PersonIdentTest.java @@ -55,7 +55,8 @@ public class PersonIdentTest { p.getWhenAsInstant()); assertEquals("A U Thor 1142878501 -0500", p.toExternalString()); - assertEquals(ZoneId.of("GMT-05:00"), p.getZoneId()); + assertEquals(ZoneId.of("GMT-05:00").getRules().getOffset( + Instant.ofEpochMilli(1142878501000L)), p.getZoneOffset()); } @Test @@ -69,7 +70,8 @@ public class PersonIdentTest { p.getWhenAsInstant()); assertEquals("A U Thor 1142878501 +0530", p.toExternalString()); - assertEquals(ZoneId.of("GMT+05:30"), p.getZoneId()); + assertEquals(ZoneId.of("GMT+05:30").getRules().getOffset( + Instant.ofEpochMilli(1142878501000L)), p.getZoneOffset()); } @SuppressWarnings("unused") diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java index 3ba055aae8..a59dde7083 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java @@ -13,9 +13,11 @@ package org.eclipse.jgit.lib; import java.io.Serializable; -import java.text.SimpleDateFormat; import java.time.Instant; import java.time.ZoneId; +import java.time.ZoneOffset; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; import java.util.Date; import java.util.Locale; import java.util.TimeZone; @@ -48,6 +50,17 @@ public class PersonIdent implements Serializable { return TimeZone.getTimeZone(tzId.toString()); } + /** + * Translate a minutes offset into a ZoneId + * + * @param tzOffset as minutes east of UTC + * @return a ZoneId for this offset + * @since 7.1 + */ + public static ZoneId getZoneId(int tzOffset) { + return ZoneOffset.ofHoursMinutes(tzOffset / 60, tzOffset % 60); + } + /** * Format a timezone offset. * @@ -121,13 +134,17 @@ public class PersonIdent implements Serializable { } } + // Write offsets as [+-]HHMM + private static final DateTimeFormatter OFFSET_FORMATTER = DateTimeFormatter + .ofPattern("Z", Locale.US); //$NON-NLS-1$ + private final String name; private final String emailAddress; - private final long when; + private final Instant when; - private final int tzOffset; + private final ZoneId tzOffset; /** * Creates new PersonIdent from config info in repository, with current time. @@ -160,7 +177,7 @@ public class PersonIdent implements Serializable { * a {@link java.lang.String} object. */ public PersonIdent(String aName, String aEmailAddress) { - this(aName, aEmailAddress, SystemReader.getInstance().getCurrentTime()); + this(aName, aEmailAddress, SystemReader.getInstance().now()); } /** @@ -177,7 +194,7 @@ public class PersonIdent implements Serializable { */ public PersonIdent(String aName, String aEmailAddress, ProposedTimestamp when) { - this(aName, aEmailAddress, when.millis()); + this(aName, aEmailAddress, when.instant()); } /** @@ -189,8 +206,25 @@ public class PersonIdent implements Serializable { * local time * @param tz * time zone + * @deprecated Use {@link #PersonIdent(PersonIdent, Instant, ZoneId)} instead. */ + @Deprecated(since = "7.1") public PersonIdent(PersonIdent pi, Date when, TimeZone tz) { + this(pi.getName(), pi.getEmailAddress(), when.toInstant(), tz.toZoneId()); + } + + /** + * Copy a PersonIdent, but alter the clone's time stamp + * + * @param pi + * original {@link org.eclipse.jgit.lib.PersonIdent} + * @param when + * local time + * @param tz + * time zone offset + * @since 7.1 + */ + public PersonIdent(PersonIdent pi, Instant when, ZoneId tz) { this(pi.getName(), pi.getEmailAddress(), when, tz); } @@ -202,9 +236,11 @@ public class PersonIdent implements Serializable { * original {@link org.eclipse.jgit.lib.PersonIdent} * @param aWhen * local time + * @deprecated Use the variant with an Instant instead */ + @Deprecated(since = "7.1") public PersonIdent(PersonIdent pi, Date aWhen) { - this(pi.getName(), pi.getEmailAddress(), aWhen.getTime(), pi.tzOffset); + this(pi.getName(), pi.getEmailAddress(), aWhen.toInstant()); } /** @@ -218,7 +254,7 @@ public class PersonIdent implements Serializable { * @since 6.1 */ public PersonIdent(PersonIdent pi, Instant aWhen) { - this(pi.getName(), pi.getEmailAddress(), aWhen.toEpochMilli(), pi.tzOffset); + this(pi.getName(), pi.getEmailAddress(), aWhen, pi.tzOffset); } /** @@ -230,11 +266,12 @@ public class PersonIdent implements Serializable { * local time stamp * @param aTZ * time zone + * @deprecated Use the variant with Instant and ZoneId instead */ + @Deprecated(since = "7.1") public PersonIdent(final String aName, final String aEmailAddress, final Date aWhen, final TimeZone aTZ) { - this(aName, aEmailAddress, aWhen.getTime(), aTZ.getOffset(aWhen - .getTime()) / (60 * 1000)); + this(aName, aEmailAddress, aWhen.toInstant(), aTZ.toZoneId()); } /** @@ -252,10 +289,16 @@ public class PersonIdent implements Serializable { */ public PersonIdent(final String aName, String aEmailAddress, Instant aWhen, ZoneId zoneId) { - this(aName, aEmailAddress, aWhen.toEpochMilli(), - TimeZone.getTimeZone(zoneId) - .getOffset(aWhen - .toEpochMilli()) / (60 * 1000)); + if (aName == null) + throw new IllegalArgumentException( + JGitText.get().personIdentNameNonNull); + if (aEmailAddress == null) + throw new IllegalArgumentException( + JGitText.get().personIdentEmailNonNull); + name = aName; + emailAddress = aEmailAddress; + when = aWhen; + tzOffset = zoneId; } /** @@ -267,15 +310,18 @@ public class PersonIdent implements Serializable { * local time stamp * @param aTZ * time zone + * @deprecated Use the variant with Instant and ZoneId instead */ + @Deprecated(since = "7.1") public PersonIdent(PersonIdent pi, long aWhen, int aTZ) { - this(pi.getName(), pi.getEmailAddress(), aWhen, aTZ); + this(pi.getName(), pi.getEmailAddress(), Instant.ofEpochMilli(aWhen), + getZoneId(aTZ)); } private PersonIdent(final String aName, final String aEmailAddress, - long when) { + Instant when) { this(aName, aEmailAddress, when, SystemReader.getInstance() - .getTimezone(when)); + .getTimeZoneAt(when)); } private PersonIdent(UserConfig config) { @@ -298,19 +344,12 @@ public class PersonIdent implements Serializable { * local time stamp * @param aTZ * time zone + * @deprecated Use the variant with Instant and ZoneId instead */ + @Deprecated(since = "7.1") public PersonIdent(final String aName, final String aEmailAddress, final long aWhen, final int aTZ) { - if (aName == null) - throw new IllegalArgumentException( - JGitText.get().personIdentNameNonNull); - if (aEmailAddress == null) - throw new IllegalArgumentException( - JGitText.get().personIdentEmailNonNull); - name = aName; - emailAddress = aEmailAddress; - when = aWhen; - tzOffset = aTZ; + this(aName, aEmailAddress, Instant.ofEpochMilli(aWhen), getZoneId(aTZ)); } /** @@ -335,9 +374,12 @@ public class PersonIdent implements Serializable { * Get timestamp * * @return timestamp + * + * @deprecated Use getWhenAsInstant instead */ + @Deprecated(since = "7.1") public Date getWhen() { - return new Date(when); + return Date.from(when); } /** @@ -347,26 +389,39 @@ public class PersonIdent implements Serializable { * @since 6.1 */ public Instant getWhenAsInstant() { - return Instant.ofEpochMilli(when); + return when; } /** * Get this person's declared time zone * * @return this person's declared time zone; null if time zone is unknown. + * + * @deprecated Use getZoneId instead */ + @Deprecated(since = "7.1") public TimeZone getTimeZone() { - return getTimeZone(tzOffset); + return TimeZone.getTimeZone(tzOffset); } /** * Get the time zone id * * @return the time zone id - * @since 6.1 + * @since 7.1 */ public ZoneId getZoneId() { - return getTimeZone().toZoneId(); + return tzOffset; + } + + /** + * Return the offset in this timezone at the specific time + * + * @return the offset + * @since 7.1 + */ + public ZoneOffset getZoneOffset() { + return tzOffset.getRules().getOffset(when); } /** @@ -374,9 +429,11 @@ public class PersonIdent implements Serializable { * * @return this person's declared time zone as minutes east of UTC. If the * timezone is to the west of UTC it is negative. + * @deprecated Use {@link #getZoneOffset()} and read minutes from there */ + @Deprecated(since = "7.1") public int getTimeZoneOffset() { - return tzOffset; + return getZoneOffset().getTotalSeconds() / 60; } /** @@ -388,7 +445,7 @@ public class PersonIdent implements Serializable { public int hashCode() { int hc = getEmailAddress().hashCode(); hc *= 31; - hc += (int) (when / 1000L); + hc += when.hashCode(); return hc; } @@ -398,7 +455,9 @@ public class PersonIdent implements Serializable { final PersonIdent p = (PersonIdent) o; return getName().equals(p.getName()) && getEmailAddress().equals(p.getEmailAddress()) - && when / 1000L == p.when / 1000L; + // commmit timestamps are stored with 1 second precision + && when.truncatedTo(ChronoUnit.SECONDS) + .equals(p.when.truncatedTo(ChronoUnit.SECONDS)); } return false; } @@ -414,9 +473,9 @@ public class PersonIdent implements Serializable { r.append(" <"); //$NON-NLS-1$ appendSanitized(r, getEmailAddress()); r.append("> "); //$NON-NLS-1$ - r.append(when / 1000); + r.append(when.toEpochMilli() / 1000); r.append(' '); - appendTimezone(r, tzOffset); + r.append(OFFSET_FORMATTER.format(getZoneOffset())); return r.toString(); } @@ -424,18 +483,16 @@ public class PersonIdent implements Serializable { @SuppressWarnings("nls") public String toString() { final StringBuilder r = new StringBuilder(); - final SimpleDateFormat dtfmt; - dtfmt = new SimpleDateFormat("EEE MMM d HH:mm:ss yyyy Z", Locale.US); - dtfmt.setTimeZone(getTimeZone()); - + DateTimeFormatter dtfmt = DateTimeFormatter + .ofPattern("EEE MMM d HH:mm:ss yyyy Z", Locale.US) //$NON-NLS-1$ + .withZone(tzOffset); r.append("PersonIdent["); r.append(getName()); r.append(", "); r.append(getEmailAddress()); r.append(", "); - r.append(dtfmt.format(Long.valueOf(when))); + r.append(dtfmt.format(when)); r.append("]"); - return r.toString(); } } -- cgit v1.2.3 From d44ce061ab43bf23e6de0f956df7f1c2c5a11d46 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Nov 2024 13:05:25 +0100 Subject: Remove unused API problem filters Change-Id: I8f5d2f6f1c6244f1b49fee713f7a06c0e9ec549b --- org.eclipse.jgit/.settings/.api_filters | 53 --------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 org.eclipse.jgit/.settings/.api_filters diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters deleted file mode 100644 index aed6683062..0000000000 --- a/org.eclipse.jgit/.settings/.api_filters +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From 70c63a7e4e5f0373fd0abec0e5bf029747237b53 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Nov 2024 13:12:53 +0100 Subject: Suppress non-externalized string warnings Change-Id: Ib0737f7ec6b9872f6d4514d140e7d32a4a40809d --- .../jgit/internal/storage/dfs/DfsBlockCacheConfig.java | 14 ++++++-------- .../jgit/internal/storage/dfs/DfsBlockCacheStats.java | 2 +- .../jgit/internal/storage/dfs/PackExtBlockCacheTable.java | 4 ++-- .../src/org/eclipse/jgit/merge/RecursiveMerger.java | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java index d63c208bbb..17bf51876d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheConfig.java @@ -51,7 +51,7 @@ public class DfsBlockCacheConfig { /** Default number of max cache hits. */ public static final int DEFAULT_CACHE_HOT_MAX = 1; - static final String DEFAULT_NAME = ""; + static final String DEFAULT_NAME = ""; //$NON-NLS-1$ private String name; @@ -91,7 +91,7 @@ public class DfsBlockCacheConfig { * {@link PrintWriter} to write the cache's configuration to. */ public void print(PrintWriter writer) { - print(/* linePrefix= */ "", /* pad= */ " ", writer); + print(/* linePrefix= */ "", /* pad= */ " ", writer); //$NON-NLS-1$//$NON-NLS-2$ } /** @@ -105,14 +105,12 @@ public class DfsBlockCacheConfig { * @param writer * {@link PrintWriter} to write the cache's configuration to. */ + @SuppressWarnings("nls") private void print(String linePrefix, String pad, PrintWriter writer) { String currentPrefixLevel = linePrefix; if (!name.isEmpty() || !packExtCacheConfigurations.isEmpty()) { - String name = this.name; - if (name.isEmpty()) { - name = ""; - } - writer.println(linePrefix + "Name: " + name); + writer.println(linePrefix + "Name: " + + (name.isEmpty() ? DEFAULT_NAME : this.name)); currentPrefixLevel += pad; } writer.println(currentPrefixLevel + "BlockLimit: " + blockLimit); @@ -602,7 +600,7 @@ public class DfsBlockCacheConfig { void print(String linePrefix, String pad, PrintWriter writer) { packExtCacheConfiguration.print(linePrefix, pad, writer); - writer.println(linePrefix + pad + "PackExts: " + writer.println(linePrefix + pad + "PackExts: " //$NON-NLS-1$ + packExts.stream().sorted().collect(Collectors.toList())); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheStats.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheStats.java index 518db8c82d..436f57437e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheStats.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsBlockCacheStats.java @@ -46,7 +46,7 @@ class DfsBlockCacheStats implements BlockCacheStats { private final AtomicReference liveBytes; DfsBlockCacheStats() { - this(""); + this(""); //$NON-NLS-1$ } DfsBlockCacheStats(String name) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java index 28b021c68f..bb44f9397a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/PackExtBlockCacheTable.java @@ -125,10 +125,10 @@ class PackExtBlockCacheTable implements DfsBlockCacheTable { Set blockCacheTables = new HashSet<>(); blockCacheTables.add(defaultBlockCacheTable); blockCacheTables.addAll(packExtBlockCacheTables.values()); - String name = defaultBlockCacheTable.getName() + "," + String name = defaultBlockCacheTable.getName() + "," //$NON-NLS-1$ + packExtBlockCacheTables.values().stream() .map(DfsBlockCacheTable::getName).sorted() - .collect(Collectors.joining(",")); + .collect(Collectors.joining(",")); //$NON-NLS-1$ return new PackExtBlockCacheTable(name, defaultBlockCacheTable, List.copyOf(blockCacheTables), packExtBlockCacheTables); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java index 24614f7d18..ec1b599b77 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java @@ -244,11 +244,11 @@ public class RecursiveMerger extends ResolveMerger { private String failingPathsMessage() { int max = 25; String failedPaths = failingPaths.entrySet().stream().limit(max) - .map(entry -> entry.getKey() + ":" + entry.getValue()) - .collect(Collectors.joining("\n")); + .map(entry -> entry.getKey() + ":" + entry.getValue()) //$NON-NLS-1$ + .collect(Collectors.joining("\n")); //$NON-NLS-1$ if (failingPaths.size() > max) { - failedPaths = String.format("%s\n... (%s failing paths omitted)", + failedPaths = String.format("%s\n... (%s failing paths omitted)", //$NON-NLS-1$ failedPaths, failingPaths.size() - max); } return failedPaths; -- cgit v1.2.3 From 85c84f2fab0ac49a17a03f16f950ddbde5bcf836 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Nov 2024 13:17:08 +0100 Subject: UploadPackTest: fix unclosed resource warning Change-Id: I4efccd72bd567d42e739ee330e26c6b04d5c5c01 --- .../tst/org/eclipse/jgit/transport/UploadPackTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java index 017104c527..064d863bf6 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java @@ -2862,7 +2862,7 @@ public class UploadPackTest { RevTag heavyTag2 = remote.tag("middleTagRing", heavyTag1); remote.lightweightTag("refTagRing", heavyTag2); - UploadPack uploadPack = new UploadPack(remote.getRepository()); + try (UploadPack uploadPack = new UploadPack(remote.getRepository())) { ByteArrayOutputStream cli = new ByteArrayOutputStream(); PacketLineOut clientWant = new PacketLineOut(cli); @@ -2872,7 +2872,6 @@ public class UploadPackTest { clientWant.writeString("done\n"); try (ByteArrayOutputStream serverResponse = new ByteArrayOutputStream()) { - uploadPack.setPreUploadHook(new PreUploadHook() { @Override public void onBeginNegotiateRound(UploadPack up, @@ -2925,6 +2924,7 @@ public class UploadPackTest { assertTrue(objDb.has(heavyTag2.toObjectId())); } } +} @Test public void testSingleBranchShallowCloneTagChainWithReflessTag() throws Exception { @@ -2936,7 +2936,7 @@ public class UploadPackTest { RevTag tag3 = remote.tag("t3", tag2); remote.lightweightTag("t3", tag3); - UploadPack uploadPack = new UploadPack(remote.getRepository()); + try (UploadPack uploadPack = new UploadPack(remote.getRepository())) { ByteArrayOutputStream cli = new ByteArrayOutputStream(); PacketLineOut clientWant = new PacketLineOut(cli); @@ -2946,7 +2946,6 @@ public class UploadPackTest { clientWant.writeString("done\n"); try (ByteArrayOutputStream serverResponse = new ByteArrayOutputStream()) { - uploadPack.setPreUploadHook(new PreUploadHook() { @Override public void onBeginNegotiateRound(UploadPack up, @@ -2994,6 +2993,7 @@ public class UploadPackTest { assertTrue(objDb.has(one.toObjectId())); } } +} @Test public void testSafeToClearRefsInFetchV0() throws Exception { -- cgit v1.2.3 From 76efd28bc91caa914eb4c16656c2928f92400547 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Nov 2024 13:19:03 +0100 Subject: RecursiveMerger: fix boxing warning Change-Id: I6f6ae540b128ff6b965931e829da1368a8b88ddb --- org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java index ec1b599b77..fc5ab62898 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java @@ -249,7 +249,7 @@ public class RecursiveMerger extends ResolveMerger { if (failingPaths.size() > max) { failedPaths = String.format("%s\n... (%s failing paths omitted)", //$NON-NLS-1$ - failedPaths, failingPaths.size() - max); + failedPaths, Integer.valueOf(failingPaths.size() - max)); } return failedPaths; } -- cgit v1.2.3 From 46215a388d6243c890d2372aafffab9eec979c8d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Nov 2024 14:59:25 +0100 Subject: JGit v7.1.0.202411191359-rc1 Signed-off-by: Matthias Sohn Change-Id: I802c3dbcbb05470aad6255cc05402647e704b446 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index cc2cecb6ae..2b20735375 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1921cf1f9d..a0bb7d9b20 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index da001763da..4d17a2967a 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 4bac377fbf..6a4a7a8e1e 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 805d2fb94b..b9a82994be 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 0c07d5f5a1..64c639d7c3 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index cb710c0daf..9b7f0f64ef 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 3c01f2ad75..0d093f7b0e 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e0fb94085d..d715ebc495 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index dde8c148d9..43dadc67d1 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.test - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index a86f5ab2c6..aa3e7beab5 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index c4442b9fbf..cab75bcdcb 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 1413c44dcb..682301a377 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 82690f8520..fd3b1f43c7 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 1a541c5b02..0297b2a8a9 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d678a1e444..b3d4b5c878 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index cd70e113cd..318d35ef8e 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7b0f5d365d..9fe53df7df 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 23eb132afd..b3bb17f307 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 02fd70b8d7..6e88617aa8 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f69febd1f3..20b23279bf 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 58245d3404..d27fcf06ce 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9e7ea160ba..93d75b2c18 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 1e8eec0ac0..cac0f35ca1 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index ef53b03cba..216ba119ce 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fdc9f9694..f954d72543 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 9bbabc6007..218dbff8c3 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 9ce8de90b9..e259ad949d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2e74ff506b..c68dc81ba0 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 744309749d..3a93de7a03 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 1e41d0819f..23dcffefec 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index af83647318..65cf616091 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 5b6870d597..ca58bffab9 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 968078a644..7a69eecf67 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 56178d05fd..c31666be3b 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 796db2ca59..2c83394818 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 297ee3d28d..c220cfbfed 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 506141dd58..dec351111b 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 42547756dc..89ae074c9e 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f24ea1bc60..da882e19fb 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 066068378b..9178b8e20a 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 134556d081..a8fdbe0175 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index e971a9a608..a7967973a2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 1d16f52428..2d5fd932a8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index aabda306e9..82f01748ed 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 686e561621..6b9c2c32b4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 7a797e7762..fc34046a0a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 7ab15719d1..a9ad3dcb20 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index fc73ea87c1..9d54a670b6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 458b99e35e..34000de349 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2aa2979b65..d47ee0afca 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index a3cdc4af05..1a9fc665e4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 509f68834e..527450ede9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 09d8053267..3b9dcdb550 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 711e5b9421..929fac5740 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index e774a47fcb..1a8eb6042f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 7fafa3bbde..db683282cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index d550bbbe05..fc5ddc8f28 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index ce1d446d7f..869285bd42 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 88a8fd5635..80bb89d10f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 195e286499..fb80d89874 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index aba1324d05..6d6d9f7819 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 7054afcb27..30da5b4a76 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 1b67e0ae5b..7b0a56ed67 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 26717ff61c..bd59397c4a 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 69f703fe12..9b47b1d10b 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 32736cfab8..6665aa0cab 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 107d3dc814..0af8ba5bc3 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 6d42144623..a7a155f402 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 6c99ff97e1..9d40efaf7d 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index c8300aa8c0..61873f61b0 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 8e123867e4..fc514d4153 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 826d33009b..5d8757b169 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index d39f45f342..9488011435 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index da42323474..c721891881 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index aa32e25a4e..7a3806ef35 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e141c7e7f3..d74ad32fb8 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 4e004ea95e..64ae775c84 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 675754cda6..e43159ad2a 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 51252ee7b7..6a3c299c70 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index a992c24509..4550c97154 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index f925a282d6..4d90b14c5e 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 1c15155d37..580f65c1e9 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 0819f8024f..00867b45db 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d5fe05d98e..4656338aa7 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 07188a0f16..9490f7704d 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411191359-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index f78f3638bd..70b3f25e95 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411191359-rc1 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202411191359-rc1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e012cbc049..8bee1fbf45 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index b55429b95f..79b983349b 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0-SNAPSHOT + 7.1.0.202411191359-rc1 JGit - Parent ${jgit-url} -- cgit v1.2.3 From e68b24f43c36dd68c116620c8e792e0e41690d1f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 19 Nov 2024 15:46:50 +0100 Subject: Prepare 7.1.0-SNAPSHOT builds Change-Id: I69f57f933899b9926ab5124b24b90ae75f7a8d09 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 2b20735375..cc2cecb6ae 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index a0bb7d9b20..1921cf1f9d 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 4d17a2967a..da001763da 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 6a4a7a8e1e..4bac377fbf 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index b9a82994be..805d2fb94b 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 64c639d7c3..0c07d5f5a1 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 9b7f0f64ef..cb710c0daf 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 0d093f7b0e..3c01f2ad75 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index d715ebc495..e0fb94085d 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 43dadc67d1..dde8c148d9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index aa3e7beab5..a86f5ab2c6 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index cab75bcdcb..c4442b9fbf 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 682301a377..1413c44dcb 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index fd3b1f43c7..82690f8520 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 0297b2a8a9..1a541c5b02 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index b3d4b5c878..d678a1e444 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 318d35ef8e..cd70e113cd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 9fe53df7df..7b0f5d365d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index b3bb17f307..23eb132afd 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 6e88617aa8..02fd70b8d7 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 20b23279bf..f69febd1f3 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index d27fcf06ce..58245d3404 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 93d75b2c18..9e7ea160ba 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index cac0f35ca1..1e8eec0ac0 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 216ba119ce..ef53b03cba 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index f954d72543..4fdc9f9694 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 218dbff8c3..9bbabc6007 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index e259ad949d..9ce8de90b9 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index c68dc81ba0..2e74ff506b 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 3a93de7a03..744309749d 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 23dcffefec..1e41d0819f 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 65cf616091..af83647318 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index ca58bffab9..5b6870d597 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 7a69eecf67..968078a644 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index c31666be3b..56178d05fd 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 2c83394818..796db2ca59 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index c220cfbfed..297ee3d28d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index dec351111b..506141dd58 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 89ae074c9e..42547756dc 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index da882e19fb..f24ea1bc60 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 9178b8e20a..066068378b 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index a8fdbe0175..134556d081 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index a7967973a2..e971a9a608 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 2d5fd932a8..1d16f52428 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 82f01748ed..aabda306e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 6b9c2c32b4..686e561621 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index fc34046a0a..7a797e7762 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index a9ad3dcb20..7ab15719d1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 9d54a670b6..fc73ea87c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 34000de349..458b99e35e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index d47ee0afca..2aa2979b65 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 1a9fc665e4..a3cdc4af05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 527450ede9..509f68834e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 3b9dcdb550..09d8053267 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 929fac5740..711e5b9421 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 1a8eb6042f..e774a47fcb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index db683282cc..7fafa3bbde 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index fc5ddc8f28..d550bbbe05 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 869285bd42..ce1d446d7f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 80bb89d10f..88a8fd5635 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index fb80d89874..195e286499 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 6d6d9f7819..aba1324d05 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 30da5b4a76..7054afcb27 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 7b0a56ed67..1b67e0ae5b 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index bd59397c4a..26717ff61c 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 9b47b1d10b..69f703fe12 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 6665aa0cab..32736cfab8 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 0af8ba5bc3..107d3dc814 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index a7a155f402..6d42144623 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 9d40efaf7d..6c99ff97e1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 61873f61b0..c8300aa8c0 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index fc514d4153..8e123867e4 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 5d8757b169..826d33009b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 9488011435..d39f45f342 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index c721891881..da42323474 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 7a3806ef35..aa32e25a4e 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index d74ad32fb8..e141c7e7f3 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 64ae775c84..4e004ea95e 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index e43159ad2a..675754cda6 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 6a3c299c70..51252ee7b7 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 4550c97154..a992c24509 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 4d90b14c5e..f925a282d6 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 580f65c1e9..1c15155d37 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 00867b45db..0819f8024f 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 4656338aa7..d5fe05d98e 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 9490f7704d..07188a0f16 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.202411191359-rc1 +Bundle-Version: 7.1.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 70b3f25e95..f78f3638bd 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411191359-rc1 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202411191359-rc1";roots="." +Bundle-Version: 7.1.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 8bee1fbf45..e012cbc049 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 79b983349b..b55429b95f 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0.202411191359-rc1 + 7.1.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From df9cf94b3e4811b579d404e0e58d005cc18df998 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 15 Nov 2024 13:14:47 -0800 Subject: RawParseUtils test: Use java.time to create PersonIdents The constructor with long/int for time/tz is deprecated in favor of Instant/ZoneId. Update first the expectations in the tests to the new constructors, so we know we are creating the same PersonIdents than before. We update the code later, knowing there is no regression in e.g. format or precision. Change-Id: I05c759bdd4cf73b8afe79fae3c792f2f1300d1e6 --- .../util/RawParseUtils_ParsePersonIdentTest.java | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_ParsePersonIdentTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_ParsePersonIdentTest.java index 355bbbab16..e517889c83 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_ParsePersonIdentTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_ParsePersonIdentTest.java @@ -10,10 +10,13 @@ package org.eclipse.jgit.util; +import static java.time.Instant.EPOCH; +import static java.time.ZoneOffset.UTC; import static org.junit.Assert.assertEquals; -import java.util.Date; -import java.util.TimeZone; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZoneOffset; import org.eclipse.jgit.lib.PersonIdent; import org.junit.Test; @@ -22,8 +25,8 @@ public class RawParseUtils_ParsePersonIdentTest { @Test public void testParsePersonIdent_legalCases() { - final Date when = new Date(1234567890000L); - final TimeZone tz = TimeZone.getTimeZone("GMT-7"); + Instant when = Instant.ofEpochMilli(1234567890000L); + ZoneId tz = ZoneOffset.ofHours(-7); assertPersonIdent("Me 1234567890 -0700", new PersonIdent("Me", "me@example.com", when, tz)); @@ -50,8 +53,8 @@ public class RawParseUtils_ParsePersonIdentTest { @Test public void testParsePersonIdent_fuzzyCases() { - final Date when = new Date(1234567890000L); - final TimeZone tz = TimeZone.getTimeZone("GMT-7"); + Instant when = Instant.ofEpochMilli(1234567890000L); + ZoneId tz = ZoneOffset.ofHours(-7); assertPersonIdent( "A U Thor , C O. Miter 1234567890 -0700", @@ -64,8 +67,8 @@ public class RawParseUtils_ParsePersonIdentTest { @Test public void testParsePersonIdent_incompleteCases() { - final Date when = new Date(1234567890000L); - final TimeZone tz = TimeZone.getTimeZone("GMT-7"); + Instant when = Instant.ofEpochMilli(1234567890000L); + ZoneId tz = ZoneOffset.ofHours(-7); assertPersonIdent("Me <> 1234567890 -0700", new PersonIdent("Me", "", when, tz)); @@ -76,26 +79,26 @@ public class RawParseUtils_ParsePersonIdentTest { assertPersonIdent(" <> 1234567890 -0700", new PersonIdent("", "", when, tz)); - assertPersonIdent("<>", new PersonIdent("", "", 0, 0)); + assertPersonIdent("<>", new PersonIdent("", "", EPOCH, UTC)); - assertPersonIdent(" <>", new PersonIdent("", "", 0, 0)); + assertPersonIdent(" <>", new PersonIdent("", "", EPOCH, UTC)); assertPersonIdent("", new PersonIdent("", - "me@example.com", 0, 0)); + "me@example.com", EPOCH, UTC)); assertPersonIdent(" ", new PersonIdent("", - "me@example.com", 0, 0)); + "me@example.com", EPOCH, UTC)); - assertPersonIdent("Me <>", new PersonIdent("Me", "", 0, 0)); + assertPersonIdent("Me <>", new PersonIdent("Me", "", EPOCH, UTC)); assertPersonIdent("Me ", new PersonIdent("Me", - "me@example.com", 0, 0)); + "me@example.com", EPOCH, UTC)); assertPersonIdent("Me 1234567890", new PersonIdent( - "Me", "me@example.com", 0, 0)); + "Me", "me@example.com", EPOCH, UTC)); assertPersonIdent("Me 1234567890 ", new PersonIdent( - "Me", "me@example.com", 0, 0)); + "Me", "me@example.com", EPOCH, UTC)); } @Test -- cgit v1.2.3 From 11a6d91a25d1196cc28a208e33c72159aab408e2 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 15 Nov 2024 13:37:12 -0800 Subject: tests/BasicTest: Use java.time constructors for PersonIdent Stop using the deprecated constructor with long/int for time/tz and use instead Instant/ZoneId. The code is still using the old constructor, but this verifies that we are creating identical instances. We will update the code later. Change-Id: I3844bf1e790e53e69a894cd697bddb31b755c2e6 --- .../internal/storage/file/T0003_BasicTest.java | 71 ++++++++++++++-------- 1 file changed, 44 insertions(+), 27 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java index 49e8a7be66..e067beb317 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/T0003_BasicTest.java @@ -28,6 +28,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.time.Instant; +import java.time.ZoneOffset; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -374,8 +375,10 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { public void test009_CreateCommitOldFormat() throws IOException { final ObjectId treeId = insertTree(new TreeFormatter()); final CommitBuilder c = new CommitBuilder(); - c.setAuthor(new PersonIdent(author, 1154236443000L, -4 * 60)); - c.setCommitter(new PersonIdent(committer, 1154236443000L, -4 * 60)); + c.setAuthor(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); + c.setCommitter(new PersonIdent(committer, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); c.setMessage("A Commit\n"); c.setTreeId(treeId); assertEquals(treeId, c.getTreeId()); @@ -411,7 +414,8 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { final TagBuilder t = new TagBuilder(); t.setObjectId(emptyId, Constants.OBJ_BLOB); t.setTag("test020"); - t.setTagger(new PersonIdent(author, 1154236443000L, -4 * 60)); + t.setTagger(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); t.setMessage("test020 tagged\n"); ObjectId actid = insertTag(t); assertEquals("6759556b09fbb4fd8ae5e315134481cc25d46954", actid.name()); @@ -419,8 +423,9 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { RevTag mapTag = parseTag(actid); assertEquals(Constants.OBJ_BLOB, mapTag.getObject().getType()); assertEquals("test020 tagged\n", mapTag.getFullMessage()); - assertEquals(new PersonIdent(author, 1154236443000L, -4 * 60), mapTag - .getTaggerIdent()); + assertEquals(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4)), + mapTag.getTaggerIdent()); assertEquals("e69de29bb2d1d6434b8b29ae775ad8c2e48c5391", mapTag .getObject().getId().name()); } @@ -434,7 +439,8 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { final TagBuilder t = new TagBuilder(); t.setObjectId(almostEmptyTreeId, Constants.OBJ_TREE); t.setTag("test021"); - t.setTagger(new PersonIdent(author, 1154236443000L, -4 * 60)); + t.setTagger(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); t.setMessage("test021 tagged\n"); ObjectId actid = insertTag(t); assertEquals("b0517bc8dbe2096b419d42424cd7030733f4abe5", actid.name()); @@ -442,8 +448,9 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { RevTag mapTag = parseTag(actid); assertEquals(Constants.OBJ_TREE, mapTag.getObject().getType()); assertEquals("test021 tagged\n", mapTag.getFullMessage()); - assertEquals(new PersonIdent(author, 1154236443000L, -4 * 60), mapTag - .getTaggerIdent()); + assertEquals(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4)), + mapTag.getTaggerIdent()); assertEquals("417c01c8795a35b8e835113a85a5c0c1c77f67fb", mapTag .getObject().getId().name()); } @@ -455,17 +462,18 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { almostEmptyTree.append("empty", FileMode.REGULAR_FILE, emptyId); final ObjectId almostEmptyTreeId = insertTree(almostEmptyTree); final CommitBuilder almostEmptyCommit = new CommitBuilder(); - almostEmptyCommit.setAuthor(new PersonIdent(author, 1154236443000L, - -2 * 60)); // not exactly the same - almostEmptyCommit.setCommitter(new PersonIdent(author, 1154236443000L, - -2 * 60)); + almostEmptyCommit.setAuthor(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-2))); + almostEmptyCommit.setCommitter(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-2))); almostEmptyCommit.setMessage("test022\n"); almostEmptyCommit.setTreeId(almostEmptyTreeId); ObjectId almostEmptyCommitId = insertCommit(almostEmptyCommit); final TagBuilder t = new TagBuilder(); t.setObjectId(almostEmptyCommitId, Constants.OBJ_COMMIT); t.setTag("test022"); - t.setTagger(new PersonIdent(author, 1154236443000L, -4 * 60)); + t.setTagger(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); t.setMessage("test022 tagged\n"); ObjectId actid = insertTag(t); assertEquals("0ce2ebdb36076ef0b38adbe077a07d43b43e3807", actid.name()); @@ -473,8 +481,9 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { RevTag mapTag = parseTag(actid); assertEquals(Constants.OBJ_COMMIT, mapTag.getObject().getType()); assertEquals("test022 tagged\n", mapTag.getFullMessage()); - assertEquals(new PersonIdent(author, 1154236443000L, -4 * 60), mapTag - .getTaggerIdent()); + assertEquals(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4)), + mapTag.getTaggerIdent()); assertEquals("b5d3b45a96b340441f5abb9080411705c51cc86c", mapTag .getObject().getId().name()); } @@ -488,9 +497,9 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { CommitBuilder commit = new CommitBuilder(); commit.setTreeId(almostEmptyTreeId); commit.setAuthor(new PersonIdent("Joe H\u00e4cker", "joe@example.com", - 4294967295000L, 60)); + Instant.ofEpochMilli(4294967295000L), ZoneOffset.ofHours(1))); commit.setCommitter(new PersonIdent("Joe Hacker", "joe2@example.com", - 4294967295000L, 60)); + Instant.ofEpochMilli(4294967295000L), ZoneOffset.ofHours(1))); commit.setEncoding(UTF_8); commit.setMessage("\u00dcbergeeks"); ObjectId cid = insertCommit(commit); @@ -509,9 +518,9 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { CommitBuilder commit = new CommitBuilder(); commit.setTreeId(almostEmptyTreeId); commit.setAuthor(new PersonIdent("Joe H\u00e4cker", "joe@example.com", - 4294967295000L, 60)); + Instant.ofEpochMilli(4294967295000L), ZoneOffset.ofHours(1))); commit.setCommitter(new PersonIdent("Joe Hacker", "joe2@example.com", - 4294967295000L, 60)); + Instant.ofEpochMilli(4294967295000L), ZoneOffset.ofHours(1))); commit.setEncoding(ISO_8859_1); commit.setMessage("\u00dcbergeeks"); ObjectId cid = insertCommit(commit); @@ -544,8 +553,10 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { .fromString("00b1f73724f493096d1ffa0b0f1f1482dbb8c936"), treeId); final CommitBuilder c1 = new CommitBuilder(); - c1.setAuthor(new PersonIdent(author, 1154236443000L, -4 * 60)); - c1.setCommitter(new PersonIdent(committer, 1154236443000L, -4 * 60)); + c1.setAuthor(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); + c1.setCommitter(new PersonIdent(committer, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); c1.setMessage("A Commit\n"); c1.setTreeId(treeId); assertEquals(treeId, c1.getTreeId()); @@ -555,8 +566,10 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { assertEquals(cmtid1, actid1); final CommitBuilder c2 = new CommitBuilder(); - c2.setAuthor(new PersonIdent(author, 1154236443000L, -4 * 60)); - c2.setCommitter(new PersonIdent(committer, 1154236443000L, -4 * 60)); + c2.setAuthor(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); + c2.setCommitter(new PersonIdent(committer, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); c2.setMessage("A Commit 2\n"); c2.setTreeId(treeId); assertEquals(treeId, c2.getTreeId()); @@ -577,8 +590,10 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { assertEquals(actid1, rm2.getParent(0)); final CommitBuilder c3 = new CommitBuilder(); - c3.setAuthor(new PersonIdent(author, 1154236443000L, -4 * 60)); - c3.setCommitter(new PersonIdent(committer, 1154236443000L, -4 * 60)); + c3.setAuthor(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); + c3.setCommitter(new PersonIdent(committer, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); c3.setMessage("A Commit 3\n"); c3.setTreeId(treeId); assertEquals(treeId, c3.getTreeId()); @@ -600,8 +615,10 @@ public class T0003_BasicTest extends SampleDataRepositoryTestCase { assertEquals(actid2, rm3.getParent(1)); final CommitBuilder c4 = new CommitBuilder(); - c4.setAuthor(new PersonIdent(author, 1154236443000L, -4 * 60)); - c4.setCommitter(new PersonIdent(committer, 1154236443000L, -4 * 60)); + c4.setAuthor(new PersonIdent(author, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); + c4.setCommitter(new PersonIdent(committer, + Instant.ofEpochMilli(1154236443000L), ZoneOffset.ofHours(-4))); c4.setMessage("A Commit 4\n"); c4.setTreeId(treeId); assertEquals(treeId, c3.getTreeId()); -- cgit v1.2.3 From 592a75800543f83486211b2191707f21695eb955 Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Mon, 11 Nov 2024 12:48:20 +0100 Subject: Don't fail when trying to prune pack which is already gone Update the TestRepository.prunePacked so that it doesn't fail if a pack to be pruned is already gone. It is especially handy when the prunePacked function is called in `TestRepository.packAndPrune` function after the repo moves on after GC was performed. Change-Id: I01b4ddbaddec1fdc24cfbb967e0edfe0de6c4b7c --- .../src/org/eclipse/jgit/junit/TestRepository.java | 3 +- ...NumberOfPackFilesSinceBitmapStatisticsTest.java | 82 +--------------------- 2 files changed, 5 insertions(+), 80 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index 66cf739ef1..c6cdfafe84 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -1020,7 +1020,8 @@ public class TestRepository implements AutoCloseable { private static void prunePacked(ObjectDirectory odb) throws IOException { for (Pack p : odb.getPacks()) { for (MutableEntry e : p) - FileUtils.delete(odb.fileFor(e.toObjectId())); + FileUtils.delete(odb.fileFor(e.toObjectId()), + FileUtils.SKIP_MISSING); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java index 42cb3cd0c2..fa13bb57c8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java @@ -12,25 +12,12 @@ package org.eclipse.jgit.internal.storage.file; import static org.junit.Assert.assertEquals; -import java.io.BufferedOutputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.OutputStream; import java.nio.file.Files; -import java.util.HashSet; -import java.util.Set; import java.util.stream.StreamSupport; -import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; -import org.eclipse.jgit.internal.storage.pack.PackExt; -import org.eclipse.jgit.internal.storage.pack.PackWriter; -import org.eclipse.jgit.junit.TestRepository; -import org.eclipse.jgit.lib.NullProgressMonitor; -import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; -import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.revwalk.RevCommit; -import org.eclipse.jgit.util.FileUtils; import org.junit.Test; public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { @@ -43,7 +30,7 @@ public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { @Test public void testShouldReportAllPackFilesWhenNoGcWasPerformed() throws Exception { - packAndPrune(); + tr.packAndPrune(); long result = gc.getStatistics().numberOfPackFilesSinceBitmap; assertEquals(repo.getObjectDatabase().getPacks().size(), result); @@ -68,7 +55,7 @@ public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { // progress & pack addCommit(parent); - packAndPrune(); + tr.packAndPrune(); assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); } @@ -88,18 +75,11 @@ public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { // progress & pack addCommit(parent); - packAndPrune(); + tr.packAndPrune(); assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); } - private void packAndPrune() throws Exception { - try (SkipNonExistingFilesTestRepository testRepo = new SkipNonExistingFilesTestRepository( - repo)) { - testRepo.packAndPrune(); - } - } - private RevCommit addCommit(RevCommit parent) throws Exception { return tr.branch("master").commit() .author(new PersonIdent("repo-metrics", "repo@metrics.com")) @@ -114,60 +94,4 @@ public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { .spliterator(), false) .count(); } - - /** - * The TestRepository has a {@link TestRepository#packAndPrune()} function - * but it fails in the last step after GC was performed as it doesn't - * SKIP_MISSING files. In order to circumvent it was copied and improved - * here. - */ - private static class SkipNonExistingFilesTestRepository - extends TestRepository { - private final FileRepository repo; - - private SkipNonExistingFilesTestRepository(FileRepository db) throws IOException { - super(db); - repo = db; - } - - @Override - public void packAndPrune() throws Exception { - ObjectDirectory odb = repo.getObjectDatabase(); - NullProgressMonitor m = NullProgressMonitor.INSTANCE; - - final PackFile pack, idx; - try (PackWriter pw = new PackWriter(repo)) { - Set all = new HashSet<>(); - for (Ref r : repo.getRefDatabase().getRefs()) - all.add(r.getObjectId()); - pw.preparePack(m, all, PackWriter.NONE); - - pack = new PackFile(odb.getPackDirectory(), pw.computeName(), - PackExt.PACK); - try (OutputStream out = new BufferedOutputStream( - new FileOutputStream(pack))) { - pw.writePack(m, m, out); - } - pack.setReadOnly(); - - idx = pack.create(PackExt.INDEX); - try (OutputStream out = new BufferedOutputStream( - new FileOutputStream(idx))) { - pw.writeIndex(out); - } - idx.setReadOnly(); - } - - odb.openPack(pack); - updateServerInfo(); - - // alternative packAndPrune implementation that skips missing files - // after GC. - for (Pack p : odb.getPacks()) { - for (MutableEntry e : p) - FileUtils.delete(odb.fileFor(e.toObjectId()), - FileUtils.SKIP_MISSING); - } - } - } } -- cgit v1.2.3 From 4b3c5194acd8a9b18bf269888cab2ea29c376508 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Tue, 19 Nov 2024 09:37:33 -0800 Subject: Support built-in diff drivers for hunk header function names The regexes defined for each built-in driver will be used to determine the function name for a hunk header. Each driver can specify a list of regexes to negate and match. They can also define pattern compilation flags if needed. These drivers only apply to text files with unified patch type. Following built-in drivers have been added: - cpp - dts - java - python - rust Support for more languages can be added as needed to match the cgit implementation. Change-Id: Ice5430bfed7e4aaf9f00e52e44402479984953c5 --- .../org/eclipse/jgit/test/resources/greeting.c | 43 +++++ .../jgit/test/resources/greeting.javasource | 37 +++++ .../org/eclipse/jgit/test/resources/greeting.py | 26 ++++ .../org/eclipse/jgit/test/resources/greeting.rs | 27 ++++ .../org/eclipse/jgit/test/resources/sample.dtsi | 25 +++ .../jgit/diff/DiffFormatterBuiltInDriverTest.java | 173 +++++++++++++++++++++ org.eclipse.jgit/.settings/.api_filters | 28 ++++ .../src/org/eclipse/jgit/diff/DiffDriver.java | 116 ++++++++++++++ .../src/org/eclipse/jgit/diff/DiffFormatter.java | 140 +++++++++++++++-- .../eclipse/jgit/diff/PatchIdDiffFormatter.java | 4 +- 10 files changed, 606 insertions(+), 13 deletions(-) create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.c create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.javasource create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.py create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.rs create mode 100644 org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/sample.dtsi create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterBuiltInDriverTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.c b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.c new file mode 100644 index 0000000000..3661160921 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.c @@ -0,0 +1,43 @@ +#include +#include +#include + +void getGreeting(char *result, const char *name) { + sprintf(result, "Hello, %s!", name); +} + +void getFarewell(char *result, const char *name) { + sprintf(result, "Goodbye, %s. Have a great day!", name); +} + +void toLower(char *str) { + for (int i = 0; str[i]; i++) { + str[i] = tolower(str[i]); + } +} + +void getPersonalizedGreeting(char *result, const char *name, const char *timeOfDay) { + char timeOfDayLower[50]; + strcpy(timeOfDayLower, timeOfDay); + toLower(timeOfDayLower); + if (strcmp(timeOfDayLower, "morning") == 0) { + sprintf(result, "Good morning, %s", name); + } else if (strcmp(timeOfDayLower, "afternoon") == 0) { + sprintf(result, "Good afternoon, %s", name); + } else if (strcmp(timeOfDayLower, "evening") == 0) { + sprintf(result, "Good evening, %s", name); + } else { + sprintf(result, "Good day, %s", name); + } +} + +int main() { + char result[100]; + getGreeting(result, "foo"); + printf("%s\\n", result); + getFarewell(result, "bar"); + printf("%s\\n", result); + getPersonalizedGreeting(result, "baz", "morning"); + printf("%s\\n", result); + return 0; +} diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.javasource b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.javasource new file mode 100644 index 0000000000..9659685c63 --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.javasource @@ -0,0 +1,37 @@ +public class Greeting { + public String getGreeting(String name) { + String msg = "Hello, " + name + "!"; + return msg; + } + + public String getFarewell(String name) { + String msg = "Goodbye, " + name + ". Have a great day!"; + return msg; + } + + public String getPersonalizedGreeting(String name, String timeOfDay) { + String msg; + switch (timeOfDay.toLowerCase()) { + case "morning": + msg = "Good morning, " + name; + break; + case "afternoon": + msg = "Good afternoon, " + name; + break; + case "evening": + msg = "Good evening, " + name; + break; + default: + msg = "Good day, " + name; + break; + } + return msg; + } + + public static void main(String[] args) { + Greeting greeting = new Greeting(); + System.out.println(greeting.getGreeting("foo")); + System.out.println(greeting.getFarewell("bar")); + System.out.println(greeting.getPersonalizedGreeting("baz", "morning")); + } +} diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.py b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.py new file mode 100644 index 0000000000..9eda6cd8fe --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.py @@ -0,0 +1,26 @@ +class Greeting: + def get_greeting(self, name): + greeting_message = f"Hello, {name}!" + return greeting_message + + def get_farewell(self, name): + farewell_message = f"Goodbye, {name}. Have a great day!" + return farewell_message + + def get_personalized_greeting(self, name, time_of_day): + time_of_day = time_of_day.lower() + if time_of_day == "morning": + personalized_message = f"Good morning, {name}" + elif time_of_day == "afternoon": + personalized_message = f"Good afternoon, {name}" + elif time_of_day == "evening": + personalized_message = f"Good evening, {name}" + else: + personalized_message = f"Good day, {name}" + return personalized_message + +if __name__ == "__main__": + greeting = Greeting() + print(greeting.get_greeting("foo")) + print(greeting.get_farewell("bar")) + print(greeting.get_personalized_greeting("baz", "morning")) diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.rs b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.rs new file mode 100644 index 0000000000..a3aa5cbe7c --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/greeting.rs @@ -0,0 +1,27 @@ +struct Greeting; + +impl Greeting { + fn get_greeting(&self, name: &str) -> String { + format!("Hello, {}!", name) + } + + fn get_farewell(&self, name: &str) -> String { + format!("Goodbye, {}. Have a great day!", name) + } + + fn get_personalized_greeting(&self, name: &str, time_of_day: &str) -> String { + match time_of_day.to_lowercase().as_str() { + "morning" => format!("Good morning, {}", name), + "afternoon" => format!("Good afternoon, {}", name), + "evening" => format!("Good evening, {}", name), + _ => format!("Good day, {}", name), + } + } +} + +fn main() { + let greeting = Greeting; + println!("{}", greeting.get_greeting("foo")); + println!("{}", greeting.get_farewell("bar")); + println!("{}", greeting.get_personalized_greeting("baz", "morning")); +} diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/sample.dtsi b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/sample.dtsi new file mode 100644 index 0000000000..6aa4ecdd4c --- /dev/null +++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/test/resources/sample.dtsi @@ -0,0 +1,25 @@ +/dts-v1/; + +/ { + model = "Example Board"; + compatible = "example,board"; + cpus { + cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a9"; + reg = <0>; + }; + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x20000000>; + }; + + uart0: uart@101f1000 { + compatible = "ns16550a"; + reg = <0x101f1000 0x1000>; + interrupts = <5>; + clock-frequency = <24000000>; + }; +}; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterBuiltInDriverTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterBuiltInDriverTest.java new file mode 100644 index 0000000000..1352871983 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/DiffFormatterBuiltInDriverTest.java @@ -0,0 +1,173 @@ +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.diff; + +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.stream.Collectors; +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.junit.JGitTestUtil; +import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.treewalk.CanonicalTreeParser; +import org.junit.Test; + +public class DiffFormatterBuiltInDriverTest extends RepositoryTestCase { + @Test + public void testCppDriver() throws Exception { + String fileName = "greeting.c"; + String body = Files.readString( + Path.of(JGitTestUtil.getTestResourceFile(fileName) + .getAbsolutePath())); + RevCommit c1; + RevCommit c2; + try (Git git = new Git(db)) { + createCommit(git, ".gitattributes", "*.c diff=cpp"); + c1 = createCommit(git, fileName, body); + c2 = createCommit(git, fileName, + body.replace("Good day", "Greetings") + .replace("baz", "qux")); + } + try (ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter diffFormatter = new DiffFormatter(os)) { + String actual = getHunkHeaders(c1, c2, os, diffFormatter); + String expected = + "@@ -27,7 +27,7 @@ void getPersonalizedGreeting(char *result, const char *name, const char *timeOfD\n" + + "@@ -37,7 +37,7 @@ int main() {"; + assertEquals(expected, actual); + } + } + + @Test + public void testDtsDriver() throws Exception { + String fileName = "sample.dtsi"; + String body = Files.readString( + Path.of(JGitTestUtil.getTestResourceFile(fileName) + .getAbsolutePath())); + RevCommit c1; + RevCommit c2; + try (Git git = new Git(db)) { + createCommit(git, ".gitattributes", "*.dtsi diff=dts"); + c1 = createCommit(git, fileName, body); + c2 = createCommit(git, fileName, + body.replace("clock-frequency = <24000000>", + "clock-frequency = <48000000>")); + } + try (ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter diffFormatter = new DiffFormatter(os)) { + String actual = getHunkHeaders(c1, c2, os, diffFormatter); + String expected = "@@ -20,6 +20,6 @@ uart0: uart@101f1000 {"; + assertEquals(expected, actual); + } + } + + @Test + public void testJavaDriver() throws Exception { + String resourceName = "greeting.javasource"; + String body = Files.readString( + Path.of(JGitTestUtil.getTestResourceFile(resourceName) + .getAbsolutePath())); + RevCommit c1; + RevCommit c2; + try (Git git = new Git(db)) { + createCommit(git, ".gitattributes", "*.java diff=java"); + String fileName = "Greeting.java"; + c1 = createCommit(git, fileName, body); + c2 = createCommit(git, fileName, + body.replace("Good day", "Greetings") + .replace("baz", "qux")); + } + try (ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter diffFormatter = new DiffFormatter(os)) { + String actual = getHunkHeaders(c1, c2, os, diffFormatter); + String expected = + "@@ -22,7 +22,7 @@ public String getPersonalizedGreeting(String name, String timeOfDay) {\n" + + "@@ -32,6 +32,6 @@ public static void main(String[] args) {"; + assertEquals(expected, actual); + } + } + + @Test + public void testPythonDriver() throws Exception { + String fileName = "greeting.py"; + String body = Files.readString( + Path.of(JGitTestUtil.getTestResourceFile(fileName) + .getAbsolutePath())); + RevCommit c1; + RevCommit c2; + try (Git git = new Git(db)) { + createCommit(git, ".gitattributes", "*.py diff=python"); + c1 = createCommit(git, fileName, body); + c2 = createCommit(git, fileName, + body.replace("Good day", "Greetings")); + } + try (ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter diffFormatter = new DiffFormatter(os)) { + String actual = getHunkHeaders(c1, c2, os, diffFormatter); + String expected = "@@ -16,7 +16,7 @@ def get_personalized_greeting(self, name, time_of_day):"; + assertEquals(expected, actual); + } + } + + @Test + public void testRustDriver() throws Exception { + String fileName = "greeting.rs"; + String body = Files.readString( + Path.of(JGitTestUtil.getTestResourceFile(fileName) + .getAbsolutePath())); + RevCommit c1; + RevCommit c2; + try (Git git = new Git(db)) { + createCommit(git, ".gitattributes", "*.rs diff=rust"); + c1 = createCommit(git, fileName, body); + c2 = createCommit(git, fileName, + body.replace("Good day", "Greetings") + .replace("baz", "qux")); + } + try (ByteArrayOutputStream os = new ByteArrayOutputStream(); + DiffFormatter diffFormatter = new DiffFormatter(os)) { + String actual = getHunkHeaders(c1, c2, os, diffFormatter); + String expected = + "@@ -14,7 +14,7 @@ fn get_personalized_greeting(&self, name: &str, time_of_day: &str) -> String {\n" + + "@@ -23,5 +23,5 @@ fn main() {"; + assertEquals(expected, actual); + } + } + + private String getHunkHeaders(RevCommit c1, RevCommit c2, + ByteArrayOutputStream os, DiffFormatter diffFormatter) + throws IOException { + diffFormatter.setRepository(db); + diffFormatter.format(new CanonicalTreeParser(null, db.newObjectReader(), + c1.getTree()), + new CanonicalTreeParser(null, db.newObjectReader(), + c2.getTree())); + diffFormatter.flush(); + return Arrays.stream(os.toString(StandardCharsets.UTF_8).split("\n")) + .filter(line -> line.startsWith("@@")) + .collect(Collectors.joining("\n")); + } + + private RevCommit createCommit(Git git, String fileName, String body) + throws IOException, GitAPIException { + writeTrashFile(fileName, body); + git.add().addFilepattern(".").call(); + return git.commit().setMessage("message").call(); + } +} diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 2c22f0231c..d3ae4cf376 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -1,5 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java new file mode 100644 index 0000000000..9ae1aaa298 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java @@ -0,0 +1,116 @@ +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.diff; + +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + +/** + * Built-in drivers for various languages, sorted by name. These drivers will be + * used to determine function names for a hunk. + *

+ * When writing or updating patterns, assume the contents are syntactically + * correct. Patterns can be simple and need not cover all syntactical corner + * cases, as long as they are sufficiently permissive. + * + * @since 6.10.1 + */ +@SuppressWarnings({"ImmutableEnumChecker", "nls"}) +public enum DiffDriver { + /** + * Built-in diff driver for c++ + */ + cpp(List.of( + /* Jump targets or access declarations */ + "^[ \\t]*[A-Za-z_][A-Za-z_0-9]*:\\s*($|/[/*])"), List.of( + /* functions/methods, variables, and compounds at top level */ + "^((::\\s*)?[A-Za-z_].*)$")), + /** + * Built-in diff driver for device + * tree files + */ + dts(List.of(";", "="), List.of( + /* lines beginning with a word optionally preceded by '&' or the root */ + "^[ \\t]*((/[ \\t]*\\{|&?[a-zA-Z_]).*)")), + /** + * Built-in diff driver for java + */ + java(List.of( + "^[ \\t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)"), + List.of( + /* Class, enum, interface, and record declarations */ + "^[ \\t]*(([a-z-]+[ \\t]+)*(class|enum|interface|record)[ \\t]+.*)$", + /* Method definitions; note that constructor signatures are not */ + /* matched because they are indistinguishable from method calls. */ + "^[ \\t]*(([A-Za-z_<>&\\]\\[][?&<>.,A-Za-z_0-9]*[ \\t]+)+[A-Za-z_]" + + "[A-Za-z_0-9]*[ \\t]*\\([^;]*)$")), + /** + * Built-in diff driver for python + */ + python(List.of("^[ \\t]*((class|(async[ \\t]+)?def)[ \\t].*)$")), + /** + * Built-in diff driver for java + */ + rust(List.of("^[\\t ]*((pub(\\([^\\)]+\\))?[\\t ]+)?" + + "((async|const|unsafe|extern([\\t ]+\"[^\"]+\"))[\\t ]+)?" + + "(struct|enum|union|mod|trait|fn|impl|macro_rules!)[< \\t]+[^;]*)$")); + + private final List negatePatterns; + + private final List matchPatterns; + + DiffDriver(List negate, List match, int flags) { + if (negate != null) { + this.negatePatterns = negate.stream() + .map(r -> Pattern.compile(r, flags)) + .collect(Collectors.toList()); + } else { + this.negatePatterns = null; + } + this.matchPatterns = match.stream().map(r -> Pattern.compile(r, flags)) + .collect(Collectors.toList()); + } + + DiffDriver(List match) { + this(null, match, 0); + } + + DiffDriver(List negate, List match) { + this(negate, match, 0); + } + + /** + * Returns the list of patterns used to exclude certain lines from being + * considered as function names. + * + * @return the list of negate patterns + */ + public List getNegatePatterns() { + return negatePatterns; + } + + /** + * Returns the list of patterns used to match lines for potential function + * names. + * + * @return the list of match patterns + */ + public List getMatchPatterns() { + return matchPatterns; + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index 2f472b5c0a..fa446e18cd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -30,7 +30,9 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.regex.Pattern; import org.eclipse.jgit.api.errors.CanceledException; +import org.eclipse.jgit.attributes.Attribute; import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm; import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.dircache.DirCacheIterator; @@ -703,7 +705,7 @@ public class DiffFormatter implements AutoCloseable { */ public void format(DiffEntry ent) throws IOException { FormatResult res = createFormatResult(ent); - format(res.header, res.a, res.b); + format(res.header, res.a, res.b, getDiffDriver(ent)); } private static byte[] writeGitLinkText(AbbreviatedObjectId id) { @@ -749,11 +751,14 @@ public class DiffFormatter implements AutoCloseable { * text source for the post-image version of the content. This * must match the content of * {@link org.eclipse.jgit.patch.FileHeader#getNewId()}. + * @param diffDriver + * the diff driver used to obtain function names in hunk headers * @throws java.io.IOException - * writing to the supplied stream failed. + * writing to the supplied stream failed. + * @since 6.10.1 */ - public void format(FileHeader head, RawText a, RawText b) - throws IOException { + public void format(FileHeader head, RawText a, RawText b, + DiffDriver diffDriver) throws IOException { // Reuse the existing FileHeader as-is by blindly copying its // header lines, but avoiding its hunks. Instead we recreate // the hunks from the text instances we have been supplied. @@ -763,8 +768,49 @@ public class DiffFormatter implements AutoCloseable { if (!head.getHunks().isEmpty()) end = head.getHunks().get(0).getStartOffset(); out.write(head.getBuffer(), start, end - start); - if (head.getPatchType() == PatchType.UNIFIED) - format(head.toEditList(), a, b); + if (head.getPatchType() == PatchType.UNIFIED) { + format(head.toEditList(), a, b, diffDriver); + } + } + + /** + * Format a patch script, reusing a previously parsed FileHeader. + *

+ * This formatter is primarily useful for editing an existing patch script + * to increase or reduce the number of lines of context within the script. + * All header lines are reused as-is from the supplied FileHeader. + * + * @param head + * existing file header containing the header lines to copy. + * @param a + * text source for the pre-image version of the content. This must match + * the content of {@link org.eclipse.jgit.patch.FileHeader#getOldId()}. + * @param b + * text source for the post-image version of the content. This must match + * the content of {@link org.eclipse.jgit.patch.FileHeader#getNewId()}. + * @throws java.io.IOException + * writing to the supplied stream failed. + */ + public void format(FileHeader head, RawText a, RawText b) + throws IOException { + format(head, a, b, null); + } + + /** + * Formats a list of edits in unified diff format + * + * @param edits + * some differences which have been calculated between A and B + * @param a + * the text A which was compared + * @param b + * the text B which was compared + * @throws java.io.IOException + * if an IO error occurred + */ + public void format(EditList edits, RawText a, RawText b) + throws IOException { + format(edits, a, b, null); } /** @@ -776,11 +822,14 @@ public class DiffFormatter implements AutoCloseable { * the text A which was compared * @param b * the text B which was compared + * @param diffDriver + * the diff driver used to obtain function names in hunk headers * @throws java.io.IOException * if an IO error occurred + * @since 6.10.1 */ - public void format(EditList edits, RawText a, RawText b) - throws IOException { + public void format(EditList edits, RawText a, RawText b, + DiffDriver diffDriver) throws IOException { for (int curIdx = 0; curIdx < edits.size();) { Edit curEdit = edits.get(curIdx); final int endIdx = findCombinedEnd(edits, curIdx); @@ -791,7 +840,8 @@ public class DiffFormatter implements AutoCloseable { final int aEnd = (int) Math.min(a.size(), (long) endEdit.getEndA() + context); final int bEnd = (int) Math.min(b.size(), (long) endEdit.getEndB() + context); - writeHunkHeader(aCur, aEnd, bCur, bEnd); + writeHunkHeader(aCur, aEnd, bCur, bEnd, + getFuncName(a, aCur - 1, diffDriver)); while (aCur < aEnd || bCur < bEnd) { if (aCur < curEdit.getBeginA() || endIdx + 1 < curIdx) { @@ -881,8 +931,30 @@ public class DiffFormatter implements AutoCloseable { * @throws java.io.IOException * if an IO error occurred */ - protected void writeHunkHeader(int aStartLine, int aEndLine, - int bStartLine, int bEndLine) throws IOException { + protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, + int bEndLine) throws IOException { + writeHunkHeader(aStartLine, aEndLine, bStartLine, bEndLine, null); + } + + /** + * Output a hunk header + * + * @param aStartLine + * within first source + * @param aEndLine + * within first source + * @param bStartLine + * within second source + * @param bEndLine + * within second source + * @param funcName + * function name of this hunk + * @throws java.io.IOException + * if an IO error occurred + * @since 6.10.1 + */ + protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, + int bEndLine, String funcName) throws IOException { out.write('@'); out.write('@'); writeRange('-', aStartLine + 1, aEndLine - aStartLine); @@ -890,6 +962,10 @@ public class DiffFormatter implements AutoCloseable { out.write(' '); out.write('@'); out.write('@'); + if (funcName != null) { + out.write(' '); + out.write(funcName.getBytes()); + } out.write('\n'); } @@ -1247,4 +1323,46 @@ public class DiffFormatter implements AutoCloseable { private static boolean end(Edit edit, int a, int b) { return edit.getEndA() <= a && edit.getEndB() <= b; } + + private String getFuncName(RawText text, int startAt, + DiffDriver diffDriver) { + if (diffDriver != null) { + while (startAt > 0) { + String line = text.getString(startAt); + startAt--; + if (matchesAny(diffDriver.getNegatePatterns(), line)) { + continue; + } + if (matchesAny(diffDriver.getMatchPatterns(), line)) { + String funcName = line.replaceAll("^[ \\t]+", ""); + return funcName.substring(0, + Math.min(funcName.length(), 80)).trim(); + } + } + } + return null; + } + + private boolean matchesAny(List patterns, String text) { + if (patterns != null) { + for (Pattern p : patterns) { + if (p.matcher(text).find()) { + return true; + } + } + } + return false; + } + + private DiffDriver getDiffDriver(DiffEntry entry) { + Attribute diffAttr = entry.getDiffAttribute(); + if (diffAttr != null) { + try { + return DiffDriver.valueOf(diffAttr.getValue()); + } catch (IllegalArgumentException e) { + return null; + } + } + return null; + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatchIdDiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatchIdDiffFormatter.java index 4343642f9a..b401bbe73d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatchIdDiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/PatchIdDiffFormatter.java @@ -44,8 +44,8 @@ public class PatchIdDiffFormatter extends DiffFormatter { } @Override - protected void writeHunkHeader(int aStartLine, int aEndLine, - int bStartLine, int bEndLine) throws IOException { + protected void writeHunkHeader(int aStartLine, int aEndLine, int bStartLine, + int bEndLine, String funcName) throws IOException { // The hunk header is not taken into account for patch id calculation } -- cgit v1.2.3 From 469928898db10d4b19bd34658d3b2f93f12952b3 Mon Sep 17 00:00:00 2001 From: Jacek Centkowski Date: Thu, 31 Oct 2024 18:30:02 +0100 Subject: Add numberOfObjectsSinceBitmap to RepoStatistics Introduce a numberOfObjectsSinceBitmap that contains the number of objects stored in pack files and as loose objects created since the latest bitmap generation. Note that the existing GcNumberOfPackFilesAfterBitmapStatisticsTest.java was renamed to GcSinceBitmapStatisticsTest.java and extended to cover also this statistic. Change-Id: I8ae1db142ddfcd42a5a1d6da01bc67f695562e0e --- ...NumberOfPackFilesSinceBitmapStatisticsTest.java | 97 ------------ .../storage/file/GcSinceBitmapStatisticsTest.java | 167 +++++++++++++++++++++ .../org/eclipse/jgit/internal/storage/file/GC.java | 18 ++- 3 files changed, 184 insertions(+), 98 deletions(-) delete mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcSinceBitmapStatisticsTest.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java deleted file mode 100644 index fa13bb57c8..0000000000 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcNumberOfPackFilesSinceBitmapStatisticsTest.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright (c) 2024 Jacek Centkowski and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Distribution License v. 1.0 which is available at - * https://www.eclipse.org/org/documents/edl-v10.php. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -package org.eclipse.jgit.internal.storage.file; - -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.nio.file.Files; -import java.util.stream.StreamSupport; - -import org.eclipse.jgit.lib.PersonIdent; -import org.eclipse.jgit.revwalk.RevCommit; -import org.junit.Test; - -public class GcNumberOfPackFilesSinceBitmapStatisticsTest extends GcTestCase { - @Test - public void testShouldReportZeroObjectsForInitializedRepo() - throws IOException { - assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); - } - - @Test - public void testShouldReportAllPackFilesWhenNoGcWasPerformed() - throws Exception { - tr.packAndPrune(); - long result = gc.getStatistics().numberOfPackFilesSinceBitmap; - - assertEquals(repo.getObjectDatabase().getPacks().size(), result); - } - - @Test - public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception { - // given - addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); - } - - @Test - public void testShouldReportNewObjectsSinceGcWhenRepositoryProgresses() - throws Exception { - // commit & gc - RevCommit parent = addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - - // progress & pack - addCommit(parent); - tr.packAndPrune(); - - assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); - } - - @Test - public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresses() - throws Exception { - // commit & gc - RevCommit parent = addCommit(null); - gc.gc().get(); - assertEquals(1L, repositoryBitmapFiles()); - - // progress & gc - parent = addCommit(parent); - gc.gc().get(); - assertEquals(2L, repositoryBitmapFiles()); - - // progress & pack - addCommit(parent); - tr.packAndPrune(); - - assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); - } - - private RevCommit addCommit(RevCommit parent) throws Exception { - return tr.branch("master").commit() - .author(new PersonIdent("repo-metrics", "repo@metrics.com")) - .parent(parent).create(); - } - - private long repositoryBitmapFiles() throws IOException { - return StreamSupport - .stream(Files - .newDirectoryStream(repo.getObjectDatabase() - .getPackDirectory().toPath(), "pack-*.bitmap") - .spliterator(), false) - .count(); - } -} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcSinceBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcSinceBitmapStatisticsTest.java new file mode 100644 index 0000000000..3cd766c4e9 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcSinceBitmapStatisticsTest.java @@ -0,0 +1,167 @@ +/* + * Copyright (c) 2024 Jacek Centkowski and others. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.internal.storage.file; + +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.nio.file.Files; +import java.util.Collection; +import java.util.stream.StreamSupport; + +import org.eclipse.jgit.internal.storage.file.GC.RepoStatistics; +import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Test; + +public class GcSinceBitmapStatisticsTest extends GcTestCase { + @Test + public void testShouldReportZeroPacksAndObjectsForInitializedRepo() + throws IOException { + RepoStatistics s = gc.getStatistics(); + assertEquals(0L, s.numberOfPackFilesSinceBitmap); + assertEquals(0L, s.numberOfObjectsSinceBitmap); + } + + @Test + public void testShouldReportAllPackFilesWhenNoGcWasPerformed() + throws Exception { + tr.packAndPrune(); + long result = gc.getStatistics().numberOfPackFilesSinceBitmap; + + assertEquals(repo.getObjectDatabase().getPacks().size(), result); + } + + @Test + public void testShouldReportAllObjectsWhenNoGcWasPerformed() + throws Exception { + tr.packAndPrune(); + + assertEquals( + getNumberOfObjectsInPacks(repo.getObjectDatabase().getPacks()), + gc.getStatistics().numberOfObjectsSinceBitmap); + } + + @Test + public void testShouldReportNoPacksDirectlyAfterGc() throws Exception { + // given + addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportNoObjectsDirectlyAfterGc() throws Exception { + // given + addCommit(null); + assertEquals(2L, gc.getStatistics().numberOfObjectsSinceBitmap); + + gc.gc().get(); + assertEquals(0L, gc.getStatistics().numberOfObjectsSinceBitmap); + } + + @Test + public void testShouldReportNewPacksSinceGcWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + tr.packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportNewObjectsSinceGcWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(0L, gc.getStatistics().numberOfObjectsSinceBitmap); + + // progress & pack + addCommit(parent); + assertEquals(1L, gc.getStatistics().numberOfObjectsSinceBitmap); + + tr.packAndPrune(); + assertEquals(3L, gc.getStatistics().numberOfObjectsSinceBitmap); + } + + @Test + public void testShouldReportNewPacksFromTheLatestBitmapWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + + // progress & gc + parent = addCommit(parent); + gc.gc().get(); + assertEquals(2L, repositoryBitmapFiles()); + + // progress & pack + addCommit(parent); + tr.packAndPrune(); + + assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); + } + + @Test + public void testShouldReportNewObjectsFromTheLatestBitmapWhenRepositoryProgresses() + throws Exception { + // commit & gc + RevCommit parent = addCommit(null); + gc.gc().get(); + + // progress & gc + parent = addCommit(parent); + gc.gc().get(); + assertEquals(0L, gc.getStatistics().numberOfObjectsSinceBitmap); + + // progress & pack + addCommit(parent); + assertEquals(1L, gc.getStatistics().numberOfObjectsSinceBitmap); + + tr.packAndPrune(); + assertEquals(4L, gc.getStatistics().numberOfObjectsSinceBitmap); + } + + private RevCommit addCommit(RevCommit parent) throws Exception { + return tr.branch("master").commit() + .author(new PersonIdent("repo-metrics", "repo@metrics.com")) + .parent(parent).create(); + } + + private long repositoryBitmapFiles() throws IOException { + return StreamSupport + .stream(Files + .newDirectoryStream(repo.getObjectDatabase() + .getPackDirectory().toPath(), "pack-*.bitmap") + .spliterator(), false) + .count(); + } + + private long getNumberOfObjectsInPacks(Collection packs) { + return packs.stream().mapToLong(pack -> { + try { + return pack.getObjectCount(); + } catch (IOException e) { + throw new RuntimeException(e); + } + }).sum(); + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 9494057a60..b33afed131 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1514,6 +1514,12 @@ public class GC { */ public long numberOfPackFilesSinceBitmap; + /** + * The number of objects stored in pack files and as loose object + * created after the last bitmap generation. + */ + public long numberOfObjectsSinceBitmap; + /** * The number of objects stored as loose objects. */ @@ -1551,6 +1557,8 @@ public class GC { b.append(", numberOfPackFiles=").append(numberOfPackFiles); //$NON-NLS-1$ b.append(", numberOfPackFilesSinceBitmap=") //$NON-NLS-1$ .append(numberOfPackFilesSinceBitmap); + b.append(", numberOfObjectsSinceBitmap=") //$NON-NLS-1$ + .append(numberOfObjectsSinceBitmap); b.append(", numberOfLooseObjects=").append(numberOfLooseObjects); //$NON-NLS-1$ b.append(", numberOfLooseRefs=").append(numberOfLooseRefs); //$NON-NLS-1$ b.append(", numberOfPackedRefs=").append(numberOfPackedRefs); //$NON-NLS-1$ @@ -1571,14 +1579,19 @@ public class GC { public RepoStatistics getStatistics() throws IOException { RepoStatistics ret = new RepoStatistics(); Collection packs = repo.getObjectDatabase().getPacks(); + long latestBitmapTime = Long.MIN_VALUE; for (Pack p : packs) { - ret.numberOfPackedObjects += p.getIndex().getObjectCount(); + long packedObjects = p.getIndex().getObjectCount(); + ret.numberOfPackedObjects += packedObjects; ret.numberOfPackFiles++; ret.sizeOfPackedObjects += p.getPackFile().length(); if (p.getBitmapIndex() != null) { ret.numberOfBitmaps += p.getBitmapIndex().getBitmapCount(); + latestBitmapTime = p.getFileSnapshot().lastModifiedInstant() + .toEpochMilli(); } else { ret.numberOfPackFilesSinceBitmap++; + ret.numberOfObjectsSinceBitmap += packedObjects; } } File objDir = repo.getObjectsDirectory(); @@ -1595,6 +1608,9 @@ public class GC { continue; ret.numberOfLooseObjects++; ret.sizeOfLooseObjects += f.length(); + if (f.lastModified() > latestBitmapTime) { + ret.numberOfObjectsSinceBitmap ++; + } } } } -- cgit v1.2.3 From f072d2ec7b1fe21d403c93f8c3dac7fc9e9e526a Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 20 Nov 2024 11:18:46 -0800 Subject: PersonIdent: Revert @since of #getZoneId In [1], the @since tag of #getZoneId was updated to 7.1 by mistake. The implementation of the method is different but the API hasn't changed. Revert the tag to 6.1, when the method was introduced. [1] https://gerrithub.io/c/eclipse-jgit/jgit/+/1204142/9/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java Change-Id: If71d763ac28d4ec02bfebb1e65f56227f44e027d --- org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java index a59dde7083..600fec42ca 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java @@ -408,7 +408,7 @@ public class PersonIdent implements Serializable { * Get the time zone id * * @return the time zone id - * @since 7.1 + * @since 6.1 */ public ZoneId getZoneId() { return tzOffset; @@ -496,4 +496,3 @@ public class PersonIdent implements Serializable { return r.toString(); } } - -- cgit v1.2.3 From ee8a4149135284e2319cb5c64de8387a3334bcdd Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 20 Nov 2024 13:09:24 -0800 Subject: PersonIdent: Preserve the timezone when copying with new time The PersonIdent(PersonIdent,Date) constructor must create a copy with the same author/email/timezone but different time. When we changed the implementation to the new Instant/ZoneId version, we forgot to pass the timezone. This made fail some tests downstream. Pass the timezone when constructing the copy. Change-Id: Iaa979e6dbaa3c55d4c4d2040068ab8b03163cd4e --- org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java index 600fec42ca..5d3db9e6ee 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java @@ -240,7 +240,8 @@ public class PersonIdent implements Serializable { */ @Deprecated(since = "7.1") public PersonIdent(PersonIdent pi, Date aWhen) { - this(pi.getName(), pi.getEmailAddress(), aWhen.toInstant()); + this(pi.getName(), pi.getEmailAddress(), aWhen.toInstant(), + pi.tzOffset); } /** -- cgit v1.2.3 From 4618d19629f2097f7a5c706c109284d6466596be Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 20 Nov 2024 14:06:46 -0800 Subject: GitTimeParser: Fix multiple errorprone and style comments This code came from GitDateParser and inherited these issues. It is a good time to fix them: * Use always {} in if and fors (eclipse guide) * Use the more efficient EnumMap for the formatters * variable.equals(CONSTANT) instead of CONSTANT.equals(var) https://errorprone.info/bugpattern/YodaCondition * private constructor to prevent instantiations of a utility classes https://errorprone.info/bugpattern/PrivateConstructorForUtilityClass * methods named in camelCase * Use string.split(..., int) https://errorprone.info/bugpattern/StringSplitter * Initialize variable in first use Change-Id: I0ae70ad9befc66fa9c057af135f2b0b2dab3869a --- .../jgit/util/GitTimeParserBadlyFormattedTest.java | 2 +- .../src/org/eclipse/jgit/util/GitTimeParser.java | 41 ++++++++++++++-------- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserBadlyFormattedTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserBadlyFormattedTest.java index e5f162d11a..a59d7bc7bb 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserBadlyFormattedTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/GitTimeParserBadlyFormattedTest.java @@ -45,7 +45,7 @@ public class GitTimeParserBadlyFormattedTest { @DataPoints public static String[] getDataPoints() { - return new String[] { "", "1970", "3000.3000.3000", "3 yesterday ago", + return new String[] { "", ".", "...", "1970", "3000.3000.3000", "3 yesterday ago", "now yesterday ago", "yesterdays", "3.day. 2.week.ago", "day ago", "Gra Feb 21 15:35:00 2007 +0100", "Sun Feb 21 15:35:00 2007 +0100", diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java index e238e3e92e..7d00fcd5ed 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java @@ -17,9 +17,10 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.time.temporal.ChronoField; import java.time.temporal.TemporalAccessor; -import java.util.HashMap; +import java.util.EnumMap; import java.util.Map; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.internal.JGitText; /** @@ -35,7 +36,8 @@ import org.eclipse.jgit.internal.JGitText; */ public class GitTimeParser { - private static final Map formatCache = new HashMap<>(); + private static final Map formatCache = new EnumMap<>( + ParseableSimpleDateFormat.class); // An enum of all those formats which this parser can parse with the help of // a DateTimeFormatter. There are other formats (e.g. the relative formats @@ -59,6 +61,10 @@ public class GitTimeParser { } } + private GitTimeParser() { + // This class is not supposed to be instantiated + } + /** * Parses a string into a {@link java.time.LocalDateTime} using the default * locale. Since this parser also supports relative formats (e.g. @@ -95,16 +101,17 @@ public class GitTimeParser { static LocalDateTime parse(String dateStr, LocalDateTime now) throws ParseException { dateStr = dateStr.trim(); - LocalDateTime ret; - if ("never".equalsIgnoreCase(dateStr)) //$NON-NLS-1$ + if (dateStr.equalsIgnoreCase("never")) { //$NON-NLS-1$ return LocalDateTime.MAX; - ret = parse_relative(dateStr, now); - if (ret != null) + } + LocalDateTime ret = parseRelative(dateStr, now); + if (ret != null) { return ret; + } for (ParseableSimpleDateFormat f : ParseableSimpleDateFormat.values()) { try { - return parse_simple(dateStr, f); + return parseSimple(dateStr, f); } catch (DateTimeParseException e) { // simply proceed with the next parser } @@ -112,8 +119,9 @@ public class GitTimeParser { ParseableSimpleDateFormat[] values = ParseableSimpleDateFormat.values(); StringBuilder allFormats = new StringBuilder("\"") //$NON-NLS-1$ .append(values[0].formatStr); - for (int i = 1; i < values.length; i++) + for (int i = 1; i < values.length; i++) { allFormats.append("\", \"").append(values[i].formatStr); //$NON-NLS-1$ + } allFormats.append("\""); //$NON-NLS-1$ throw new ParseException( MessageFormat.format(JGitText.get().cannotParseDate, dateStr, @@ -122,10 +130,11 @@ public class GitTimeParser { } // tries to parse a string with the formats supported by DateTimeFormatter - private static LocalDateTime parse_simple(String dateStr, + private static LocalDateTime parseSimple(String dateStr, ParseableSimpleDateFormat f) throws DateTimeParseException { DateTimeFormatter dateFormat = formatCache.computeIfAbsent(f, - format -> DateTimeFormatter.ofPattern(f.formatStr) + format -> DateTimeFormatter + .ofPattern(f.formatStr) .withLocale(SystemReader.getInstance().getLocale())); TemporalAccessor parsed = dateFormat.parse(dateStr); return parsed.isSupported(ChronoField.HOUR_OF_DAY) @@ -135,25 +144,27 @@ public class GitTimeParser { // tries to parse a string with a relative time specification @SuppressWarnings("nls") - private static LocalDateTime parse_relative(String dateStr, + @Nullable + private static LocalDateTime parseRelative(String dateStr, LocalDateTime now) { // check for the static words "yesterday" or "now" - if ("now".equals(dateStr)) { + if (dateStr.equals("now")) { return now; } - if ("yesterday".equals(dateStr)) { + if (dateStr.equals("yesterday")) { return now.minusDays(1); } // parse constructs like "3 days ago", "5.week.2.day.ago" - String[] parts = dateStr.split("\\.| "); + String[] parts = dateStr.split("\\.| ", -1); int partsLength = parts.length; // check we have an odd number of parts (at least 3) and that the last // part is "ago" if (partsLength < 3 || (partsLength & 1) == 0 - || !"ago".equals(parts[parts.length - 1])) + || !parts[parts.length - 1].equals("ago")) { return null; + } int number; for (int i = 0; i < parts.length - 2; i += 2) { try { -- cgit v1.2.3 From 48f36f969542930722a9041b24bbb3c00dc919a1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 20 Nov 2024 23:42:39 +0100 Subject: DiffDriver: fix formatting of javadoc Change-Id: I01da1862719b6623727deae10a706f30ee6cabbf --- .../src/org/eclipse/jgit/diff/DiffDriver.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java index 9ae1aaa298..9873980ff1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java @@ -28,8 +28,8 @@ import java.util.stream.Collectors; @SuppressWarnings({"ImmutableEnumChecker", "nls"}) public enum DiffDriver { /** - * Built-in diff driver for c++ + * Built-in diff driver for c++ */ cpp(List.of( /* Jump targets or access declarations */ @@ -37,16 +37,16 @@ public enum DiffDriver { /* functions/methods, variables, and compounds at top level */ "^((::\\s*)?[A-Za-z_].*)$")), /** - * Built-in diff driver for device + * Built-in diff driver for device * tree files */ dts(List.of(";", "="), List.of( /* lines beginning with a word optionally preceded by '&' or the root */ "^[ \\t]*((/[ \\t]*\\{|&?[a-zA-Z_]).*)")), /** - * Built-in diff driver for java + * Built-in diff driver for java */ java(List.of( "^[ \\t]*(catch|do|for|if|instanceof|new|return|switch|throw|while)"), @@ -58,13 +58,13 @@ public enum DiffDriver { "^[ \\t]*(([A-Za-z_<>&\\]\\[][?&<>.,A-Za-z_0-9]*[ \\t]+)+[A-Za-z_]" + "[A-Za-z_0-9]*[ \\t]*\\([^;]*)$")), /** - * Built-in diff driver for python + * Built-in diff driver for + * python */ python(List.of("^[ \\t]*((class|(async[ \\t]+)?def)[ \\t].*)$")), /** - * Built-in diff driver for java + * Built-in diff driver for + * java */ rust(List.of("^[\\t ]*((pub(\\([^\\)]+\\))?[\\t ]+)?" + "((async|const|unsafe|extern([\\t ]+\"[^\"]+\"))[\\t ]+)?" -- cgit v1.2.3 From c824610abba794a1f8f13d6ff2ec1c09590ce697 Mon Sep 17 00:00:00 2001 From: Kaushik Lingarkar Date: Wed, 20 Nov 2024 15:22:11 -0800 Subject: DiffDriver: fix doc for rust built-in Change-Id: Ic430686dc41ecbd8d8d19068416bc18ba2d94f3f --- org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java index 9873980ff1..b74444400e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffDriver.java @@ -64,7 +64,7 @@ public enum DiffDriver { python(List.of("^[ \\t]*((class|(async[ \\t]+)?def)[ \\t].*)$")), /** * Built-in diff driver for - * java + * rust */ rust(List.of("^[\\t ]*((pub(\\([^\\)]+\\))?[\\t ]+)?" + "((async|const|unsafe|extern([\\t ]+\"[^\"]+\"))[\\t ]+)?" -- cgit v1.2.3 From 5b1513a28d337e7e3453e557ee9dde292678eb81 Mon Sep 17 00:00:00 2001 From: pszlazak Date: Sun, 17 Nov 2024 23:11:02 +0100 Subject: Align request policies with CGit CGit defines the SHA request policies using a bitmask that represents which policy is implied by another policy. For example, in CGit the ALLOW_TIP_SHA1 is 0x01 and ALLOW_REACHABLE_SHA1 is 0x02, which are associated to two different bit in a 3-bit value. The ALLOW_ANY_SHA1 value is 0x07 which denotes a different policy that implies the previous two ones, because is represented with a 3-bit bitmask having all ones. Associate the JGit RequestPolicy enum to the same CGit bitmask values and use the same logic for the purpose of advertising the server capabilities. The JGit code becomes easier to read and associate with its counterpart in CGit, especially during the capabilities advertising phase. Also add a new utility method RequestPolicy.implies() which is more readable than a direct bitmask and operator. Bug: jgit-68 Change-Id: I932150dca1211ba9c8c34a523f13e84d7390063b (cherry picked from commit 1519c147948eb1108bdf45f2aeed84746dacff9c) --- .../src/org/eclipse/jgit/transport/UploadPack.java | 38 ++++++++++++++-------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 1dcfe5691f..e9ea9b25a6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -118,13 +118,13 @@ public class UploadPack implements Closeable { /** Policy the server uses to validate client requests */ public enum RequestPolicy { /** Client may only ask for objects the server advertised a reference for. */ - ADVERTISED, + ADVERTISED(0x08), /** * Client may ask for any commit reachable from a reference advertised by * the server. */ - REACHABLE_COMMIT, + REACHABLE_COMMIT(0x02), /** * Client may ask for objects that are the tip of any reference, even if not @@ -134,18 +134,34 @@ public class UploadPack implements Closeable { * * @since 3.1 */ - TIP, + TIP(0x01), /** * Client may ask for any commit reachable from any reference, even if that - * reference wasn't advertised. + * reference wasn't advertised, implies REACHABLE_COMMIT and TIP. * * @since 3.1 */ - REACHABLE_COMMIT_TIP, + REACHABLE_COMMIT_TIP(0x03), - /** Client may ask for any SHA-1 in the repository. */ - ANY; + /** Client may ask for any SHA-1 in the repository, implies REACHABLE_COMMIT_TIP. */ + ANY(0x07); + + private final int bitmask; + + RequestPolicy(int bitmask) { + this.bitmask = bitmask; + } + + /** + * Check if the current policy implies another, based on its bitmask. + * + * @param implied the implied policy based on its bitmask. + * @return true if the policy is implied. + */ + public boolean implies(RequestPolicy implied) { + return (bitmask & implied.bitmask) != 0; + } } /** @@ -1629,13 +1645,9 @@ public class UploadPack implements Closeable { if (!biDirectionalPipe) adv.advertiseCapability(OPTION_NO_DONE); RequestPolicy policy = getRequestPolicy(); - if (policy == RequestPolicy.TIP - || policy == RequestPolicy.REACHABLE_COMMIT_TIP - || policy == null) + if (policy == null || policy.implies(RequestPolicy.TIP)) adv.advertiseCapability(OPTION_ALLOW_TIP_SHA1_IN_WANT); - if (policy == RequestPolicy.REACHABLE_COMMIT - || policy == RequestPolicy.REACHABLE_COMMIT_TIP - || policy == null) + if (policy == null || policy.implies(RequestPolicy.REACHABLE_COMMIT)) adv.advertiseCapability(OPTION_ALLOW_REACHABLE_SHA1_IN_WANT); adv.advertiseCapability(OPTION_AGENT, UserAgent.get()); if (transferConfig.isAllowFilter()) { -- cgit v1.2.3 From 079dbe8ed9e47e44986ce43513f3aad8fa64832a Mon Sep 17 00:00:00 2001 From: pszlazak Date: Sun, 17 Nov 2024 23:24:09 +0100 Subject: Test advertised capabilities with protocol V0 and allow*Sha1InWant The advertised capabilities with protocol V0 were untested leading to potential regressions when advertising what SHA1 should or should not be on the list of capabilities. Verify that allow-tip-sha1-in-want and allow-reachable-sha1-in-want are properly advertised with the allow*Sha1InWant is set in jgit.config. Change-Id: Id48af2bc19280f2dcb26aa8e8765cde8f2ce7a06 (cherry picked from commit 5583f6a10eafc8c2627e0fb4833cb8ffe422f69a) --- .../org/eclipse/jgit/transport/UploadPackTest.java | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java index def73acadd..017104c527 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -563,6 +564,47 @@ public class UploadPackTest { assertThat(lines, hasItems("ls-refs", "fetch", "server-option")); } + @Test + public void testV0CapabilitiesAllowAnySha1InWant() throws Exception { + checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack", + "allowanysha1inwant", "allow-reachable-sha1-in-want", + "allow-tip-sha1-in-want"); + } + + @Test + public void testV0CapabilitiesAllowReachableSha1InWant() throws Exception { + checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack", + "allowreachablesha1inwant", "allow-reachable-sha1-in-want"); + } + + @Test + public void testV0CapabilitiesAllowTipSha1InWant() throws Exception { + checkAvertisedCapabilityProtocolV0IfAllowed("uploadpack", + "allowtipsha1inwant", "allow-tip-sha1-in-want"); + } + + private void checkAvertisedCapabilityProtocolV0IfAllowed( + String configSection, String configName, String... capabilities) + throws Exception { + server.getConfig().setBoolean(configSection, null, configName, true); + ByteArrayInputStream recvStream = uploadPackSetup( + TransferConfig.ProtocolVersion.V0.version(), null, + PacketLineIn.end()); + PacketLineIn pckIn = new PacketLineIn(recvStream); + + String line; + while (!PacketLineIn.isEnd((line = pckIn.readString()))) { + if (line.contains("capabilities")) { + List linesCapabilities = Arrays.asList(line.substring( + line.indexOf(" ", line.indexOf("capabilities")) + 1) + .split(" ")); + assertThat(linesCapabilities, hasItems(capabilities)); + return; + } + } + fail("Server side protocol did not contain any capabilities'"); + } + @Test public void testV2CapabilitiesAllowFilter() throws Exception { checkAdvertisedIfAllowed("uploadpack", "allowfilter", "filter"); -- cgit v1.2.3 From 6fa28d7677f8242d73dc32294fa7db6e86c23b25 Mon Sep 17 00:00:00 2001 From: Yash Chaturvedi Date: Thu, 14 Nov 2024 20:03:08 +0530 Subject: Add pack-refs command to the CLI This command can be used to optimize storage of references. For a RefDirectory database, it packs non-symbolic, loose refs into packed-refs. By default, only the references under '$GIT_DIR/refs/tags' are packed. The '--all' option can be used to pack all the references under '$GIT_DIR/refs'. For Reftable, all refs are compacted into a single table. Change-Id: I92e786403f8638d35ae3037844a7ad89e8959e02 --- .../tst/org/eclipse/jgit/pgm/PackRefsTest.java | 81 ++++++++++++++++++++ .../services/org.eclipse.jgit.pgm.TextBuiltin | 1 + .../eclipse/jgit/pgm/internal/CLIText.properties | 2 + .../src/org/eclipse/jgit/pgm/PackRefs.java | 34 +++++++++ .../jgit/internal/storage/file/GcPackRefsTest.java | 31 +++++--- .../org/eclipse/jgit/internal/JGitText.properties | 2 + org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java | 10 +++ .../src/org/eclipse/jgit/api/PackRefsCommand.java | 87 ++++++++++++++++++++++ .../src/org/eclipse/jgit/internal/JGitText.java | 2 + .../storage/file/FileReftableDatabase.java | 19 +++++ .../jgit/internal/storage/file/FileRepository.java | 3 +- .../org/eclipse/jgit/internal/storage/file/GC.java | 51 +++---------- .../jgit/internal/storage/file/RefDirectory.java | 29 ++++++++ .../src/org/eclipse/jgit/lib/RefDatabase.java | 19 +++++ 14 files changed, 317 insertions(+), 54 deletions(-) create mode 100644 org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/PackRefsTest.java create mode 100644 org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/PackRefs.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/api/PackRefsCommand.java diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/PackRefsTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/PackRefsTest.java new file mode 100644 index 0000000000..b4d4ea9e56 --- /dev/null +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/PackRefsTest.java @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.pgm; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.File; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.lib.CLIRepositoryTestCase; +import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.Ref; +import org.junit.Before; +import org.junit.Test; + +public class PackRefsTest extends CLIRepositoryTestCase { + private Git git; + + @Override + @Before + public void setUp() throws Exception { + super.setUp(); + git = new Git(db); + git.commit().setMessage("initial commit").call(); + } + + @Test + public void tagPacked() throws Exception { + git.tag().setName("test").call(); + git.packRefs().call(); + assertEquals(Ref.Storage.PACKED, + git.getRepository().exactRef("refs/tags/test").getStorage()); + } + + @Test + public void nonTagRefNotPackedWithoutAll() throws Exception { + git.branchCreate().setName("test").call(); + git.packRefs().call(); + assertEquals(Ref.Storage.LOOSE, + git.getRepository().exactRef("refs/heads/test").getStorage()); + } + + @Test + public void nonTagRefPackedWithAll() throws Exception { + git.branchCreate().setName("test").call(); + git.packRefs().setAll(true).call(); + assertEquals(Ref.Storage.PACKED, + git.getRepository().exactRef("refs/heads/test").getStorage()); + } + + @Test + public void refTableCompacted() throws Exception { + ((FileRepository) git.getRepository()).convertRefStorage( + ConfigConstants.CONFIG_REF_STORAGE_REFTABLE, false, false); + + git.commit().setMessage("test commit").call(); + File tableDir = new File(db.getDirectory(), Constants.REFTABLE); + File[] reftables = tableDir.listFiles(); + assertNotNull(reftables); + assertTrue(reftables.length > 2); + + git.packRefs().call(); + + reftables = tableDir.listFiles(); + assertNotNull(reftables); + assertEquals(2, reftables.length); + } +} diff --git a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin index 08d37278de..41b0091b77 100644 --- a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin +++ b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin @@ -26,6 +26,7 @@ org.eclipse.jgit.pgm.LsTree org.eclipse.jgit.pgm.Merge org.eclipse.jgit.pgm.MergeBase org.eclipse.jgit.pgm.MergeTool +org.eclipse.jgit.pgm.PackRefs org.eclipse.jgit.pgm.Push org.eclipse.jgit.pgm.ReceivePack org.eclipse.jgit.pgm.Reflog diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index 50ee809b98..d24b639a31 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -257,6 +257,7 @@ updating=Updating {0}..{1} usage_Abbrev=Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use digits, or as many digits as needed to form a unique object name. An of 0 will suppress long format, only showing the closest tag. usage_addRenormalize=Apply the "clean" process freshly to tracked files to forcibly add them again to the index. This implies -u. usage_Aggressive=This option will cause gc to more aggressively optimize the repository at the expense of taking much more time +usage_All=Pack all refs, except hidden refs, broken refs, and symbolic refs. usage_AlwaysFallback=Show uniquely abbreviated commit object as fallback usage_bareClone=Make a bare Git repository. That is, instead of creating [DIRECTORY] and placing the administrative files in [DIRECTORY]/.git, make the [DIRECTORY] itself the $GIT_DIR. usage_extraArgument=Pass an extra argument to a merge driver. Currently supported are "-X ours" and "-X theirs". @@ -300,6 +301,7 @@ usage_Match=Only consider tags matching the given glob(7) pattern or patterns, e usage_MergeBase=Find as good common ancestors as possible for a merge usage_MergesTwoDevelopmentHistories=Merges two development histories usage_PackKeptObjects=Include objects in packs locked by a ".keep" file when repacking +usage_PackRefs=Pack heads and tags for efficient repository access usage_PreserveOldPacks=Preserve old pack files by moving them into the preserved subdirectory instead of deleting them after repacking usage_PrunePreserved=Remove the preserved subdirectory containing previously preserved old pack files before repacking, and before preserving more old pack files usage_ReadDirCache= Read the DirCache 100 times diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/PackRefs.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/PackRefs.java new file mode 100644 index 0000000000..ee05f5ca0b --- /dev/null +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/PackRefs.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.pgm; + +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.lib.TextProgressMonitor; +import org.kohsuke.args4j.Option; + +@Command(common = true, usage = "usage_PackRefs") +class PackRefs extends TextBuiltin { + @Option(name = "--all", usage = "usage_All") + private boolean all; + + @Override + protected void run() { + Git git = Git.wrap(db); + try { + git.packRefs().setProgressMonitor(new TextProgressMonitor(errw)) + .setAll(all).call(); + } catch (GitAPIException e) { + throw die(e.getMessage(), e); + } + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java index c57295518d..f84be21e82 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPackRefsTest.java @@ -19,7 +19,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import java.io.File; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.concurrent.BrokenBarrierException; @@ -31,6 +30,8 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.PackRefsCommand; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.junit.TestRepository.BranchBuilder; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; @@ -49,7 +50,7 @@ public class GcPackRefsTest extends GcTestCase { RevBlob a = tr.blob("a"); tr.lightweightTag("t", a); - gc.packRefs(); + packRefs(false); assertSame(repo.exactRef("refs/tags/t").getStorage(), Storage.PACKED); } @@ -60,7 +61,7 @@ public class GcPackRefsTest extends GcTestCase { String name = repo.findRef(ref).getName(); Path dir = repo.getCommonDirectory().toPath().resolve(name).getParent(); assertNotNull(dir); - gc.packRefs(); + packRefs(true); assertFalse(Files.exists(dir)); } @@ -75,9 +76,9 @@ public class GcPackRefsTest extends GcTestCase { Callable packRefs = () -> { syncPoint.await(); try { - gc.packRefs(); + packRefs(false); return 0; - } catch (IOException e) { + } catch (GitAPIException e) { return 1; } }; @@ -102,7 +103,7 @@ public class GcPackRefsTest extends GcTestCase { "refs/tags/t1")); try { refLock.lock(); - gc.packRefs(); + packRefs(false); } finally { refLock.unlock(); } @@ -145,7 +146,7 @@ public class GcPackRefsTest extends GcTestCase { Future result2 = pool.submit(() -> { refUpdateLockedRef.await(); - gc.packRefs(); + packRefs(false); packRefsDone.await(); return null; }); @@ -173,19 +174,20 @@ public class GcPackRefsTest extends GcTestCase { assertEquals(repo.exactRef("HEAD").getTarget().getName(), "refs/heads/master"); assertNull(repo.exactRef("HEAD").getTarget().getObjectId()); - gc.packRefs(); + PackRefsCommand packRefsCommand = git.packRefs().setAll(true); + packRefsCommand.call(); assertSame(repo.exactRef("HEAD").getStorage(), Storage.LOOSE); assertEquals(repo.exactRef("HEAD").getTarget().getName(), "refs/heads/master"); assertNull(repo.exactRef("HEAD").getTarget().getObjectId()); git.checkout().setName("refs/heads/side").call(); - gc.packRefs(); + packRefsCommand.call(); assertSame(repo.exactRef("HEAD").getStorage(), Storage.LOOSE); // check for detached HEAD git.checkout().setName(first.getName()).call(); - gc.packRefs(); + packRefsCommand.call(); assertSame(repo.exactRef("HEAD").getStorage(), Storage.LOOSE); } @@ -208,7 +210,7 @@ public class GcPackRefsTest extends GcTestCase { assertEquals(repo.exactRef("HEAD").getTarget().getName(), "refs/heads/master"); assertNull(repo.exactRef("HEAD").getTarget().getObjectId()); - gc.packRefs(); + packRefs(true); assertSame(repo.exactRef("HEAD").getStorage(), Storage.LOOSE); assertEquals(repo.exactRef("HEAD").getTarget().getName(), "refs/heads/master"); @@ -216,9 +218,14 @@ public class GcPackRefsTest extends GcTestCase { // check for non-detached HEAD repo.updateRef(Constants.HEAD).link("refs/heads/side"); - gc.packRefs(); + packRefs(true); assertSame(repo.exactRef("HEAD").getStorage(), Storage.LOOSE); assertEquals(repo.exactRef("HEAD").getTarget().getObjectId(), second.getId()); } + + private void packRefs(boolean all) throws GitAPIException { + new PackRefsCommand(repo).setAll(all).call(); + } + } diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 024ca77f21..acfe812a20 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -597,6 +597,8 @@ packInaccessible=Failed to access pack file {0}, caught {1} consecutive errors w packingCancelledDuringObjectsWriting=Packing cancelled during objects writing packObjectCountMismatch=Pack object count mismatch: pack {0} index {1}: {2} packRefs=Pack refs +packRefsFailed=Packing refs failed +packRefsSuccessful=Packed refs successfully packSizeNotSetYet=Pack size not yet set since it has not yet been received packTooLargeForIndexVersion1=Pack too large for index version 1 packWasDeleted=Pack file {0} was deleted, removing it from pack list diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java index 3dc53ec248..5bc035a46a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/Git.java @@ -713,6 +713,16 @@ public class Git implements AutoCloseable { return new GarbageCollectCommand(repo); } + /** + * Return a command object to execute a {@code PackRefs} command + * + * @return a {@link org.eclipse.jgit.api.PackRefsCommand} + * @since 7.1 + */ + public PackRefsCommand packRefs() { + return new PackRefsCommand(repo); + } + /** * Return a command object to find human-readable names of revisions. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PackRefsCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PackRefsCommand.java new file mode 100644 index 0000000000..29a69c5ac4 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PackRefsCommand.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.api; + +import java.io.IOException; + +import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.api.errors.JGitInternalException; +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.lib.Repository; + +/** + * Optimize storage of references. + * + * @since 7.1 + */ +public class PackRefsCommand extends GitCommand { + private ProgressMonitor monitor; + + private boolean all; + + /** + * Creates a new {@link PackRefsCommand} instance with default values. + * + * @param repo + * the repository this command will be used on + */ + public PackRefsCommand(Repository repo) { + super(repo); + this.monitor = NullProgressMonitor.INSTANCE; + } + + /** + * Set progress monitor + * + * @param monitor + * a progress monitor + * @return this instance + */ + public PackRefsCommand setProgressMonitor(ProgressMonitor monitor) { + this.monitor = monitor; + return this; + } + + /** + * Specify whether to pack all the references. + * + * @param all + * if true all the loose refs will be packed + * @return this instance + */ + public PackRefsCommand setAll(boolean all) { + this.all = all; + return this; + } + + /** + * Whether to pack all the references + * + * @return whether to pack all the references + */ + public boolean isAll() { + return all; + } + + @Override + public String call() throws GitAPIException { + checkCallable(); + try { + repo.getRefDatabase().packRefs(monitor, this); + return JGitText.get().packRefsSuccessful; + } catch (IOException e) { + throw new JGitInternalException(JGitText.get().packRefsFailed, e); + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 0980219e25..2d9d2c527c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -627,6 +627,8 @@ public class JGitText extends TranslationBundle { /***/ public String packingCancelledDuringObjectsWriting; /***/ public String packObjectCountMismatch; /***/ public String packRefs; + /***/ public String packRefsFailed; + /***/ public String packRefsSuccessful; /***/ public String packSizeNotSetYet; /***/ public String packTooLargeForIndexVersion1; /***/ public String packWasDeleted; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java index 80240e5062..25b7583b95 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java @@ -28,8 +28,10 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.PackRefsCommand; import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.events.RefsChangedEvent; +import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.reftable.MergedReftable; import org.eclipse.jgit.internal.storage.reftable.ReftableBatchRefUpdate; import org.eclipse.jgit.internal.storage.reftable.ReftableDatabase; @@ -39,6 +41,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef; import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.RefRename; @@ -107,6 +110,22 @@ public class FileReftableDatabase extends RefDatabase { return reftableDatabase.hasFastTipsWithSha1(); } + /** + * {@inheritDoc} + * + * For Reftable, all the data is compacted into a single table. + */ + @Override + public void packRefs(ProgressMonitor pm, PackRefsCommand packRefs) + throws IOException { + pm.beginTask(JGitText.get().packRefs, 1); + try { + compactFully(); + } finally { + pm.endTask(); + } + } + /** * Runs a full compaction for GC purposes. * @throws IOException on I/O errors diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index 230dc6f45a..84c85659ff 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -33,6 +33,7 @@ import java.util.Set; import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.attributes.AttributesNode; import org.eclipse.jgit.attributes.AttributesNodeProvider; @@ -599,7 +600,7 @@ public class FileRepository extends Repository { gc.setBackground(shouldAutoDetach()); try { gc.gc(); - } catch (ParseException | IOException e) { + } catch (ParseException | IOException | GitAPIException e) { throw new JGitInternalException(JGitText.get().gcFailed, e); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index c9da4d8d67..7f3369364b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -63,6 +63,8 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.api.PackRefsCommand; +import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.dircache.DirCacheIterator; import org.eclipse.jgit.errors.CancelledException; import org.eclipse.jgit.errors.CorruptObjectException; @@ -233,9 +235,11 @@ public class GC { * @throws java.text.ParseException * If the configuration parameter "gc.pruneexpire" couldn't be * parsed + * @throws GitAPIException + * If packing refs failed */ public CompletableFuture> gc() - throws IOException, ParseException { + throws IOException, ParseException, GitAPIException { if (!background) { return CompletableFuture.completedFuture(doGc()); } @@ -254,7 +258,7 @@ public class GC { gcLog.commit(); } return newPacks; - } catch (IOException | ParseException e) { + } catch (IOException | ParseException | GitAPIException e) { try { gcLog.write(e.getMessage()); StringWriter sw = new StringWriter(); @@ -277,7 +281,8 @@ public class GC { return (executor != null) ? executor : WorkQueue.getExecutor(); } - private Collection doGc() throws IOException, ParseException { + private Collection doGc() + throws IOException, ParseException, GitAPIException { if (automatic && !needGc()) { return Collections.emptyList(); } @@ -286,7 +291,8 @@ public class GC { return Collections.emptyList(); } pm.start(6 /* tasks */); - packRefs(); + new PackRefsCommand(repo).setProgressMonitor(pm).setAll(true) + .call(); // TODO: implement reflog_expire(pm, repo); Collection newPacks = repack(); prune(Collections.emptySet()); @@ -779,43 +785,6 @@ public class GC { && Objects.equals(r1.getObjectId(), r2.getObjectId()); } - /** - * Pack ref storage. For a RefDirectory database, this packs all - * non-symbolic, loose refs into packed-refs. For Reftable, all of the data - * is compacted into a single table. - * - * @throws java.io.IOException - * if an IO error occurred - */ - public void packRefs() throws IOException { - RefDatabase refDb = repo.getRefDatabase(); - if (refDb instanceof FileReftableDatabase) { - // TODO: abstract this more cleanly. - pm.beginTask(JGitText.get().packRefs, 1); - try { - ((FileReftableDatabase) refDb).compactFully(); - } finally { - pm.endTask(); - } - return; - } - - Collection refs = refDb.getRefsByPrefix(Constants.R_REFS); - List refsToBePacked = new ArrayList<>(refs.size()); - pm.beginTask(JGitText.get().packRefs, refs.size()); - try { - for (Ref ref : refs) { - checkCancelled(); - if (!ref.isSymbolic() && ref.getStorage().isLoose()) - refsToBePacked.add(ref.getName()); - pm.update(1); - } - ((RefDirectory) repo.getRefDatabase()).pack(refsToBePacked); - } finally { - pm.endTask(); - } - } - /** * Packs all objects which reachable from any of the heads into one pack * file. Additionally all objects which are not reachable from any head but diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 604868133e..6aa1157e37 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -57,6 +57,7 @@ import java.util.stream.Stream; import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.api.PackRefsCommand; import org.eclipse.jgit.errors.InvalidObjectIdException; import org.eclipse.jgit.errors.LockFailedException; import org.eclipse.jgit.errors.MissingObjectException; @@ -69,6 +70,7 @@ import org.eclipse.jgit.lib.CoreConfig.TrustLooseRefStat; import org.eclipse.jgit.lib.CoreConfig.TrustPackedRefsStat; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef; +import org.eclipse.jgit.lib.ProgressMonitor; import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefComparator; import org.eclipse.jgit.lib.RefDatabase; @@ -287,6 +289,33 @@ public class RefDirectory extends RefDatabase { clearReferences(); } + /** + * {@inheritDoc} + * + * For a RefDirectory database, by default this packs non-symbolic, loose + * tag refs into packed-refs. If {@code all} flag is set, this packs all the + * non-symbolic, loose refs. + */ + @Override + public void packRefs(ProgressMonitor pm, PackRefsCommand packRefs) + throws IOException { + String prefix = packRefs.isAll() ? R_REFS : R_TAGS; + Collection refs = getRefsByPrefix(prefix); + List refsToBePacked = new ArrayList<>(refs.size()); + pm.beginTask(JGitText.get().packRefs, refs.size()); + try { + for (Ref ref : refs) { + if (!ref.isSymbolic() && ref.getStorage().isLoose()) { + refsToBePacked.add(ref.getName()); + } + pm.update(1); + } + pack(refsToBePacked); + } finally { + pm.endTask(); + } + } + @Override public boolean isNameConflicting(String name) throws IOException { // Cannot be nested within an existing reference. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index 114246beb2..09cb5a83dd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -26,6 +26,7 @@ import java.util.stream.Stream; import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; +import org.eclipse.jgit.api.PackRefsCommand; /** * Abstraction of name to {@link org.eclipse.jgit.lib.ObjectId} mapping. @@ -593,4 +594,22 @@ public abstract class RefDatabase { } return null; } + + /** + * Optimize pack ref storage. + * + * @param pm + * a progress monitor + * + * @param packRefs + * {@link PackRefsCommand} to control ref packing behavior + * + * @throws java.io.IOException + * if an IO error occurred + * @since 7.1 + */ + public void packRefs(ProgressMonitor pm, PackRefsCommand packRefs) + throws IOException { + // nothing + } } -- cgit v1.2.3 From f026c19a054a5247ddcdf747479be87b7e01152e Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Fri, 22 Nov 2024 17:08:57 -0800 Subject: PackDirectory: Filter out tmp GC pack files git repack passes a ".tmp-XXXX-" prefix to git pack-objects when repacking. git pack-objects then adds a "pack-XXXXX.pack" to this to create the name of new packfiles it writes to. PackDirectory was previously very lenient and would allow these files to be added to its list of known packfiles. Fix PackDirectory to filter these out since they are not meant to be consumed yet, and doing so can cause user facing errors. Change-Id: I072e57d9522e02049db17d3f4977df7eda14bba7 Signed-off-by: Martin Fick --- .../src/org/eclipse/jgit/internal/storage/file/PackDirectory.java | 2 +- .../src/org/eclipse/jgit/internal/storage/file/PackFile.java | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index 8221cff442..51a8148838 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -545,7 +545,7 @@ class PackDirectory { for (String name : nameList) { try { PackFile pack = new PackFile(directory, name); - if (pack.getPackExt() != null) { + if (pack.getPackExt() != null && !pack.isTmpGCFile()) { Map packByExt = packFilesByExtById .get(pack.getId()); if (packByExt == null) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java index 19979d0ed5..c9b05ad025 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackFile.java @@ -27,6 +27,7 @@ public class PackFile extends File { private static final long serialVersionUID = 1L; private static final String PREFIX = "pack-"; //$NON-NLS-1$ + private static final String TMP_GC_PREFIX = ".tmp-"; //$NON-NLS-1$ private final String base; // PREFIX + id i.e. // pack-0123456789012345678901234567890123456789 @@ -125,6 +126,13 @@ public class PackFile extends File { return packExt; } + /** + * @return whether the file is a temporary GC file + */ + public boolean isTmpGCFile() { + return id.startsWith(TMP_GC_PREFIX); + } + /** * Create a new similar PackFile with the given extension instead. * -- cgit v1.2.3 From 4d1d88575bbdf7b5750dde0622a975d02e4d4fad Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 26 Nov 2024 14:47:29 +0100 Subject: JGit v7.1.0.202411261347-r Signed-off-by: Matthias Sohn Change-Id: I70f154dd1dc8571c5e2057d09d08d4a4d1b7ee37 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index cc2cecb6ae..592db4fbbb 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 1921cf1f9d..88dfccc49d 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index da001763da..2db9e09cf2 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 4bac377fbf..0e9c492db0 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 805d2fb94b..a1de457d9c 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 0c07d5f5a1..0084c59145 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index cb710c0daf..5825c96719 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 3c01f2ad75..466baac517 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e0fb94085d..8fd53e34d6 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index dde8c148d9..338fab7283 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.test - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index a86f5ab2c6..3221aef800 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index c4442b9fbf..f9b20d79d0 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 1413c44dcb..3a2c1fa6e7 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 82690f8520..97bb56ef8d 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 1a541c5b02..fdd5c5da0c 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index d678a1e444..81e14fe35d 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index cd70e113cd..e07cd053e5 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 7b0f5d365d..0e26f1be5b 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 23eb132afd..e43e1fe6b6 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.1.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 02fd70b8d7..a676c848c8 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f69febd1f3..cb5afb1e01 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 58245d3404..e08a41deb7 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 9e7ea160ba..ebfd6526b9 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 1e8eec0ac0..ca4e1b7495 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index ef53b03cba..b3558a3670 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 4fdc9f9694..afcebf451f 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 9bbabc6007..81271f581c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 9ce8de90b9..847acbaa89 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 2e74ff506b..e67ec0ea2c 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 744309749d..137d59ebcb 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 1e41d0819f..3e7680269b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index af83647318..6692074c35 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 5b6870d597..517bc9c61a 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 968078a644..1d5dfbe985 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 56178d05fd..2baa8b11d1 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 796db2ca59..4c68f17ff1 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 297ee3d28d..656694cb23 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 506141dd58..ae33054b3d 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 42547756dc..a7745a066b 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index f24ea1bc60..ee09e1214e 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.1.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 066068378b..8eb30412f4 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 134556d081..d980276bc6 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index e971a9a608..52e452631b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 1d16f52428..b99d166142 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index aabda306e9..0ff428dff2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 686e561621..c8c47ac3e0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 7a797e7762..260c3438aa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 7ab15719d1..33ca6054f2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index fc73ea87c1..49662e54d6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 458b99e35e..db8062dc23 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 2aa2979b65..8b577ddd87 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index a3cdc4af05..017d7ba851 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 509f68834e..4eb713851b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 09d8053267..fdb60dbb32 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 711e5b9421..791fda6dc6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index e774a47fcb..760a8b2e69 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 7fafa3bbde..c115287abb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index d550bbbe05..21e0a7ad20 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index ce1d446d7f..d1d76396a4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 88a8fd5635..4b4f1d869b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 195e286499..e390d40cae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index aba1324d05..c090de1f87 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 7054afcb27..606603e3ae 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 1b67e0ae5b..fc22ea9f3d 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 26717ff61c..a49f8f5ebd 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 69f703fe12..bd859def5d 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 32736cfab8..0b4823f92c 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 107d3dc814..e41e264af1 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 6d42144623..c1bfcb7354 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 6c99ff97e1..3214945438 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index c8300aa8c0..cdf1d9acdc 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 8e123867e4..2d442d4a45 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 826d33009b..23e2e40b0e 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index d39f45f342..3915dbf0b8 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index da42323474..159ed38c08 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index aa32e25a4e..7883fd49c1 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e141c7e7f3..abe1cb93d3 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 4e004ea95e..0e6f74bfbb 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 675754cda6..b65c16d7cc 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 51252ee7b7..02fd21c808 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index a992c24509..f4c1280c25 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index f925a282d6..249a07001c 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 1c15155d37..715031988e 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.1.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 0819f8024f..ef1959fa51 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d5fe05d98e..130d77cb9c 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 07188a0f16..76a3cc475b 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.qualifier +Bundle-Version: 7.1.0.202411261347-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index f78f3638bd..33d7b10bcd 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.qualifier";roots="." +Bundle-Version: 7.1.0.202411261347-r +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202411261347-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index e012cbc049..a8b0bc578b 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index b55429b95f..eff57b4c44 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0-SNAPSHOT + 7.1.0.202411261347-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From 6f8a48134cae23ac380f6704a46ceebac64d7f12 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 26 Nov 2024 16:13:38 +0100 Subject: Prepare 7.1.1-SNAPSHOT builds Change-Id: Ifc710a83cda50f1275cbbd5a828f92d95607f298 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++---- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 36 +++---- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 ++++----- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 86 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 28 ++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 40 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 118 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 112 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 540 insertions(+), 540 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 592db4fbbb..4ac514afb1 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.ant.tasks;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 88dfccc49d..4e4b39fd7c 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 2db9e09cf2..75a096720a 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)" + org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.1.0", - org.eclipse.jgit.ant.tasks;version="7.1.0"; +Export-Package: org.eclipse.jgit.ant;version="7.1.1", + org.eclipse.jgit.ant.tasks;version="7.1.1"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 0e9c492db0..3a123395f1 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index a1de457d9c..157a67b7db 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 0084c59145..067d32754c 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,18 +13,18 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.1.0"; +Export-Package: org.eclipse.jgit.archive;version="7.1.1"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.1.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.1.1";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 5825c96719..e7e2799ea1 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 466baac517..cf024995d8 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 8fd53e34d6..0e267f9ed4 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 338fab7283..5cbf6a7c3e 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 3221aef800..a9e4bf69f7 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.sha1;version="[7.1.0,7.2.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.sha1;version="[7.1.1,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index f9b20d79d0..5a7cef510c 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 3a2c1fa6e7..345461de70 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.1,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", @@ -26,5 +26,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.1.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.1.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.1.1";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 97bb56ef8d..9c94e598bc 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index fdd5c5da0c..0090c2b7a9 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 81e14fe35d..c7f914d62a 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.1.0"; + org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.1.1"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index e07cd053e5..87c798111a 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 0e26f1be5b..a1c03fdf99 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index e43e1fe6b6..f826797d56 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="7.1.0", - org.eclipse.jgit.http.server.glue;version="7.1.0"; +Export-Package: org.eclipse.jgit.http.server;version="7.1.1", + org.eclipse.jgit.http.server.glue;version="7.1.1"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.1.0"; + org.eclipse.jgit.http.server.resolver;version="7.1.1"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, @@ -19,14 +19,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)" + org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index a676c848c8..cc9c765744 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index cb5afb1e01..f6d701c739 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index e08a41deb7..89f06d6cfa 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -29,26 +29,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.http.server;version="[7.1.0,7.2.0)", - org.eclipse.jgit.http.server.glue;version="[7.1.0,7.2.0)", - org.eclipse.jgit.http.server.resolver;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.http.server;version="[7.1.1,7.2.0)", + org.eclipse.jgit.http.server.glue;version="[7.1.1,7.2.0)", + org.eclipse.jgit.http.server.resolver;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index ebfd6526b9..6e9601e231 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index ca4e1b7495..7f1a850bbb 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,17 +22,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.http.server;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.http.server;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.1.0"; +Export-Package: org.eclipse.jgit.junit.http;version="7.1.1"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index b3558a3670..dc32c8de78 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index afcebf451f..e7688c1068 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 81271f581c..7a99b49421 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.14.0,2.15.0)", org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)", org.apache.sshd.sftp;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)", - org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.1.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.1.1" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 847acbaa89..a295cf26c0 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index e67ec0ea2c..5fc3c6a438 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 137d59ebcb..e8d00d60eb 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.util;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="7.1.0", - org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.time;version="[7.1.0,7.2.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="7.1.1", + org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.time;version="[7.1.1,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.1.0"; +Export-Package: org.eclipse.jgit.junit;version="7.1.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.1.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.1.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.1.1";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 3e7680269b..b5f9641f04 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 6692074c35..d9ef7da365 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 517bc9c61a..af2ad199c7 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,24 +26,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.server;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.test;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.server;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.test;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 1d5dfbe985..3f0a708b57 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 2baa8b11d1..1cdf62b450 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="7.1.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.1.1"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.1.0"; + org.eclipse.jgit.lfs.server.fs;version="7.1.1"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.1.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.1.0"; + org.eclipse.jgit.lfs.server.internal;version="7.1.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.1.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 4c68f17ff1..6d10d29f60 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 656694cb23..839cd67f51 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index ae33054b3d..d2e3b7399e 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", +Import-Package: org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="7.1.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.1.1";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index a7745a066b..96bb01c168 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index ee09e1214e..7a172cdc6e 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="7.1.0", - org.eclipse.jgit.lfs.errors;version="7.1.0", - org.eclipse.jgit.lfs.internal;version="7.1.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="7.1.0" +Export-Package: org.eclipse.jgit.lfs;version="7.1.1", + org.eclipse.jgit.lfs.errors;version="7.1.1", + org.eclipse.jgit.lfs.internal;version="7.1.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="7.1.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.hooks;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)" + org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.hooks;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 8eb30412f4..5fb872d57a 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index d980276bc6..438ad28069 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 52e452631b..815c18987b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index b99d166142..e89ddb85b6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 0ff428dff2..da380e33b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 260c3438aa..73a9a4bfcd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 49662e54d6..5ff30c4db3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8b577ddd87..860c0e40b4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 4eb713851b..2e5c2795d3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 791fda6dc6..97f0600f99 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 760a8b2e69..5243b18152 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 21e0a7ad20..8cc19ae75e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 4b4f1d869b..573c19188d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index c090de1f87..ec4d80a195 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 606603e3ae..c6addb57ad 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", - org.eclipse.jgit.pgm;version="[7.1.0,7.2.0)", - org.eclipse.jgit.pgm.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.pgm.opt;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", +Import-Package: org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", + org.eclipse.jgit.pgm;version="[7.1.1,7.2.0)", + org.eclipse.jgit.pgm.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.pgm.opt;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index fc22ea9f3d..e04c42b629 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index a49f8f5ebd..ac4a20a3ef 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,49 +14,49 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.archive;version="[7.1.0,7.2.0)", - org.eclipse.jgit.awtui;version="[7.1.0,7.2.0)", - org.eclipse.jgit.blame;version="[7.1.0,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.gitrepo;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.io;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.server;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.notes;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk.filter;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.archive;version="[7.1.1,7.2.0)", + org.eclipse.jgit.awtui;version="[7.1.1,7.2.0)", + org.eclipse.jgit.blame;version="[7.1.1,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.gitrepo;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.io;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.server;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.notes;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk.filter;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.sshd;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="7.1.0"; +Export-Package: org.eclipse.jgit.console;version="7.1.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.1.0"; + org.eclipse.jgit.pgm;version="7.1.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="7.1.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.1.0"; + org.eclipse.jgit.pgm.debug;version="7.1.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.1.0"; + org.eclipse.jgit.pgm.internal;version="7.1.1"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.1.0"; + org.eclipse.jgit.pgm.opt;version="7.1.1"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index bd859def5d..38f4bcbffd 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 0b4823f92c..a9d5712577 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index e41e264af1..ac73327b24 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.0,7.2.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.1,7.2.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.1.0";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.1.1";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index c1bfcb7354..67c7459b46 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 3214945438..b2972b25d5 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index cdf1d9acdc..3699248127 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -23,19 +23,19 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", org.apache.sshd.core;version="[2.14.0,2.15.0)", org.apache.sshd.server;version="[2.14.0,2.15.0)", org.apache.sshd.server.forward;version="[2.14.0,2.15.0)", - org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.sshd;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit.ssh;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.sshd;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.rules;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2d442d4a45..9a50c8b306 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 23e2e40b0e..1fb5492ef9 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.1.0";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.1.1";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -24,19 +24,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.0";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.1.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.1.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.1.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.1.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.1.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.1.0"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.1.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.1.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.1.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.1.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.1.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.1.1"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.1.0", + org.eclipse.jgit.transport.sshd.agent;version="7.1.1", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.14.0,2.15.0)", @@ -91,14 +91,14 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)", - org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.fnmatch;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 3915dbf0b8..80618201f7 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 159ed38c08..e1224dfb8d 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 7883fd49c1..feef17a1f5 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit.ssh;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit.ssh;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index abe1cb93d3..0873a316e7 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 0e6f74bfbb..05ad1a4cef 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.0,7.2.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.1,7.2.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.0" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.1" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index b65c16d7cc..883b7e4dd8 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 02fd21c808..eacd219ceb 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index f4c1280c25..d33d3e1af1 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,64 +21,64 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io;version="[2.15.0,3.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api;version="[7.1.0,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.archive;version="[7.1.0,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.0,7.2.0)", - org.eclipse.jgit.awtui;version="[7.1.0,7.2.0)", - org.eclipse.jgit.blame;version="[7.1.0,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.0,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.0,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.events;version="[7.1.0,7.2.0)", - org.eclipse.jgit.fnmatch;version="[7.1.0,7.2.0)", - org.eclipse.jgit.gitrepo;version="[7.1.0,7.2.0)", - org.eclipse.jgit.hooks;version="[7.1.0,7.2.0)", - org.eclipse.jgit.ignore;version="[7.1.0,7.2.0)", - org.eclipse.jgit.ignore.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.diff;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.fsck;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.1.0", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.io;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.transport.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.1.0,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.0,7.2.0)", - org.eclipse.jgit.junit.time;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.logging;version="[7.1.0,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.notes;version="[7.1.0,7.2.0)", - org.eclipse.jgit.patch;version="[7.1.0,7.2.0)", - org.eclipse.jgit.pgm;version="[7.1.0,7.2.0)", - org.eclipse.jgit.pgm.internal;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk.filter;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.0,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.0,7.2.0)", - org.eclipse.jgit.submodule;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util.sha1;version="[7.1.0,7.2.0)", + org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.archive;version="[7.1.1,7.2.0)", + org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", + org.eclipse.jgit.awtui;version="[7.1.1,7.2.0)", + org.eclipse.jgit.blame;version="[7.1.1,7.2.0)", + org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", + org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.events;version="[7.1.1,7.2.0)", + org.eclipse.jgit.fnmatch;version="[7.1.1,7.2.0)", + org.eclipse.jgit.gitrepo;version="[7.1.1,7.2.0)", + org.eclipse.jgit.hooks;version="[7.1.1,7.2.0)", + org.eclipse.jgit.ignore;version="[7.1.1,7.2.0)", + org.eclipse.jgit.ignore.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.diff;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.fsck;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.1.1", + org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.io;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.transport.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.1.1,7.2.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", + org.eclipse.jgit.junit.time;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.logging;version="[7.1.1,7.2.0)", + org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.notes;version="[7.1.1,7.2.0)", + org.eclipse.jgit.patch;version="[7.1.1,7.2.0)", + org.eclipse.jgit.pgm;version="[7.1.1,7.2.0)", + org.eclipse.jgit.pgm.internal;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk.filter;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", + org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", + org.eclipse.jgit.submodule;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util.sha1;version="[7.1.1,7.2.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 249a07001c..c3b80efa4d 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 715031988e..68fd8e302e 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.awtui;version="7.1.0" -Import-Package: org.eclipse.jgit.errors;version="[7.1.0,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.0,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.0,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.0,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.0,7.2.0)", - org.eclipse.jgit.util;version="[7.1.0,7.2.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.1.1" +Import-Package: org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", + org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", + org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", + org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", + org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", + org.eclipse.jgit.util;version="[7.1.1,7.2.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index ef1959fa51..33c83b488d 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 130d77cb9c..02bc6fe16c 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 76a3cc475b..3c864fdc41 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.0.202411261347-r +Bundle-Version: 7.1.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.1.0", - org.eclipse.jgit.api;version="7.1.0"; +Export-Package: org.eclipse.jgit.annotations;version="7.1.1", + org.eclipse.jgit.api;version="7.1.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,18 +25,18 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.1.0"; + org.eclipse.jgit.api.errors;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.1.0"; + org.eclipse.jgit.attributes;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.1.0"; + org.eclipse.jgit.blame;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="7.1.0"; + org.eclipse.jgit.diff;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -44,53 +44,53 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.1.0"; + org.eclipse.jgit.dircache;version="7.1.1"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="7.1.0"; + org.eclipse.jgit.errors;version="7.1.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="7.1.0"; + org.eclipse.jgit.events;version="7.1.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.1.0", - org.eclipse.jgit.gitrepo;version="7.1.0"; + org.eclipse.jgit.fnmatch;version="7.1.1", + org.eclipse.jgit.gitrepo;version="7.1.1"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.1.0";x-internal:=true, - org.eclipse.jgit.hooks;version="7.1.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="7.1.0", - org.eclipse.jgit.ignore.internal;version="7.1.0"; + org.eclipse.jgit.gitrepo.internal;version="7.1.1";x-internal:=true, + org.eclipse.jgit.hooks;version="7.1.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="7.1.1", + org.eclipse.jgit.ignore.internal;version="7.1.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.1.0"; + org.eclipse.jgit.internal;version="7.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.1.0"; + org.eclipse.jgit.internal.diff;version="7.1.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.1.0"; + org.eclipse.jgit.internal.diffmergetool;version="7.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.1.0"; + org.eclipse.jgit.internal.fsck;version="7.1.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.1.0"; + org.eclipse.jgit.internal.revwalk;version="7.1.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.1.0"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.1.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.1.0"; + org.eclipse.jgit.internal.storage.dfs;version="7.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="7.1.0"; + org.eclipse.jgit.internal.storage.file;version="7.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -99,36 +99,36 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.0", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="7.1.0"; + org.eclipse.jgit.internal.storage.io;version="7.1.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.1.0"; + org.eclipse.jgit.internal.storage.memory;version="7.1.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.1.0"; + org.eclipse.jgit.internal.storage.pack;version="7.1.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.1.0"; + org.eclipse.jgit.internal.storage.reftable;version="7.1.1"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="7.1.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.1.0"; + org.eclipse.jgit.internal.submodule;version="7.1.1";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.1.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.1.0"; + org.eclipse.jgit.internal.transport.http;version="7.1.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.1.0"; + org.eclipse.jgit.internal.transport.parser;version="7.1.1"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.1.0"; + org.eclipse.jgit.internal.transport.ssh;version="7.1.1"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.1.0"; + org.eclipse.jgit.internal.util;version="7.1.1"; x-friends:=" org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.1.0"; + org.eclipse.jgit.lib;version="7.1.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -142,12 +142,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.1.0"; + org.eclipse.jgit.lib.internal;version="7.1.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.1.0", - org.eclipse.jgit.merge;version="7.1.0"; + org.eclipse.jgit.logging;version="7.1.1", + org.eclipse.jgit.merge;version="7.1.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -156,40 +156,40 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.1.0", - org.eclipse.jgit.notes;version="7.1.0"; + org.eclipse.jgit.nls;version="7.1.1", + org.eclipse.jgit.notes;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.1.0"; + org.eclipse.jgit.patch;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.1.0"; + org.eclipse.jgit.revplot;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="7.1.0"; + org.eclipse.jgit.revwalk;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="7.1.0"; + org.eclipse.jgit.revwalk.filter;version="7.1.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.1.0"; + org.eclipse.jgit.storage.file;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.1.0"; + org.eclipse.jgit.storage.pack;version="7.1.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.1.0"; + org.eclipse.jgit.submodule;version="7.1.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.1.0"; + org.eclipse.jgit.transport;version="7.1.1"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -202,21 +202,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.1.0"; + org.eclipse.jgit.transport.http;version="7.1.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.1.0"; + org.eclipse.jgit.transport.resolver;version="7.1.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.1.0"; + org.eclipse.jgit.treewalk;version="7.1.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="7.1.0"; + org.eclipse.jgit.treewalk.filter;version="7.1.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.1.0"; + org.eclipse.jgit.util;version="7.1.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -229,12 +229,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.1.0"; + org.eclipse.jgit.util.io;version="7.1.1"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.1.0", - org.eclipse.jgit.util.time;version="7.1.0" + org.eclipse.jgit.util.sha1;version="7.1.1", + org.eclipse.jgit.util.time;version="7.1.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 33d7b10bcd..df2e804924 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.0.202411261347-r -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.0.202411261347-r";roots="." +Bundle-Version: 7.1.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index a8b0bc578b..1805206ec1 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index eff57b4c44..256166bf10 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.0.202411261347-r + 7.1.1-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 39a16df34aa0a28cad1fb8c0d4f0a11a75049ec9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 27 Nov 2024 00:35:48 +0100 Subject: Prepare 7.2.0-SNAPSHOT builds Change-Id: Ie3108fefbcbb55a4f26273833c9817ce4bd750f1 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++---- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 42 ++++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 36 +++---- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 ++++----- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 86 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 28 ++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 40 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 118 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 ++-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 112 +++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 540 insertions(+), 540 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 4ac514afb1..0069b09467 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.ant.tasks;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 4e4b39fd7c..c6c81648ae 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 75a096720a..3af82e4759 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)" + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.1.1", - org.eclipse.jgit.ant.tasks;version="7.1.1"; +Export-Package: org.eclipse.jgit.ant;version="7.2.0", + org.eclipse.jgit.ant.tasks;version="7.2.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 3a123395f1..89d05be73b 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 157a67b7db..11806f15c6 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 067d32754c..b142a66a8c 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,18 +13,18 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.1.1"; +Export-Package: org.eclipse.jgit.archive;version="7.2.0"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.1.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.2.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index e7e2799ea1..3ca6590f02 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index cf024995d8..27a2bba5a2 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 0e267f9ed4..3079742c79 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 5cbf6a7c3e..9493c07dbc 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index a9e4bf69f7..35294256e1 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.sha1;version="[7.1.1,7.2.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.sha1;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 5a7cef510c..245ba7e127 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 345461de70..2120439e51 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.1,7.2.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", @@ -26,5 +26,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.1.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.1.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.2.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.2.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 9c94e598bc..532e749cb2 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 0090c2b7a9..f94e2b27b1 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c7f914d62a..7d23d53614 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.1.1"; + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.2.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 87c798111a..679252de34 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index a1c03fdf99..c390d8f5ee 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index f826797d56..39dc2ef42a 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="7.1.1", - org.eclipse.jgit.http.server.glue;version="7.1.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.2.0", + org.eclipse.jgit.http.server.glue;version="7.2.0"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.1.1"; + org.eclipse.jgit.http.server.resolver;version="7.2.0"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, @@ -19,14 +19,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)" + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index cc9c765744..e7940bd358 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index f6d701c739..3f79f8b82d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 89f06d6cfa..3550501dba 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -29,26 +29,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.http.server;version="[7.1.1,7.2.0)", - org.eclipse.jgit.http.server.glue;version="[7.1.1,7.2.0)", - org.eclipse.jgit.http.server.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.http.server;version="[7.2.0,7.3.0)", + org.eclipse.jgit.http.server.glue;version="[7.2.0,7.3.0)", + org.eclipse.jgit.http.server.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 6e9601e231..2f25191fee 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 7f1a850bbb..4ba595901b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,17 +22,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.http.server;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.http.server;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.1.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.2.0"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index dc32c8de78..5abd7d6d51 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index e7688c1068..ea38ae31ba 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 7a99b49421..bcd9fbfc81 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.14.0,2.15.0)", org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)", org.apache.sshd.sftp;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.1.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.2.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index a295cf26c0..b8f22cea5d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 5fc3c6a438..f937748212 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index e8d00d60eb..6488a887fb 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="7.1.1", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.time;version="[7.1.1,7.2.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="7.2.0", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.time;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.1.1"; +Export-Package: org.eclipse.jgit.junit;version="7.2.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.1.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.1.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.2.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index b5f9641f04..9d494cb2e0 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index d9ef7da365..9f43ced73b 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index af2ad199c7..77749c8d89 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,24 +26,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.test;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.test;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3f0a708b57..98e63b0f1e 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 1cdf62b450..1973b26477 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="7.1.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.1.1"; + org.eclipse.jgit.lfs.server.fs;version="7.2.0"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.1.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.1.1"; + org.eclipse.jgit.lfs.server.internal;version="7.2.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.2.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 6d10d29f60..73f5cab59d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 839cd67f51..0dd0786050 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index d2e3b7399e..f27377447c 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", +Import-Package: org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="7.1.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.2.0";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 96bb01c168..eff7e0b7eb 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 7a172cdc6e..fb211cc89c 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="7.1.1", - org.eclipse.jgit.lfs.errors;version="7.1.1", - org.eclipse.jgit.lfs.internal;version="7.1.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="7.1.1" +Export-Package: org.eclipse.jgit.lfs;version="7.2.0", + org.eclipse.jgit.lfs.errors;version="7.2.0", + org.eclipse.jgit.lfs.internal;version="7.2.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="7.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.hooks;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)" + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.hooks;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 5fb872d57a..4ca03a3f72 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 438ad28069..329740085e 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 815c18987b..43980f06ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index e89ddb85b6..59345e75f9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index da380e33b7..ae91bd5405 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 73a9a4bfcd..57d7d8dd69 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 5ff30c4db3..d9a9db307d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 860c0e40b4..8f0c532a4a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 2e5c2795d3..78867c96c0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 97f0600f99..d3773f54f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 5243b18152..b8f402e4f0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 8cc19ae75e..811beafca6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 573c19188d..a0cd57bcbb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index ec4d80a195..94b56faba9 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index c6addb57ad..60a60bb51d 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm.opt;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", +Import-Package: org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm.opt;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index e04c42b629..9195a369e7 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index ac4a20a3ef..fbcab95354 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,49 +14,49 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.archive;version="[7.1.1,7.2.0)", - org.eclipse.jgit.awtui;version="[7.1.1,7.2.0)", - org.eclipse.jgit.blame;version="[7.1.1,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.gitrepo;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.io;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.notes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http.apache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.sshd;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.archive;version="[7.2.0,7.3.0)", + org.eclipse.jgit.awtui;version="[7.2.0,7.3.0)", + org.eclipse.jgit.blame;version="[7.2.0,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.gitrepo;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.notes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="7.1.1"; +Export-Package: org.eclipse.jgit.console;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.1.1"; + org.eclipse.jgit.pgm;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -68,14 +68,14 @@ Export-Package: org.eclipse.jgit.console;version="7.1.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.1.1"; + org.eclipse.jgit.pgm.debug;version="7.2.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.1.1"; + org.eclipse.jgit.pgm.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.1.1"; + org.eclipse.jgit.pgm.opt;version="7.2.0"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 38f4bcbffd..0101464c82 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index a9d5712577..81efa44cc6 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index ac73327b24..6eeb24d6b4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.1.1,7.2.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.1.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.2.0";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 67c7459b46..30437f25ee 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index b2972b25d5..feec706a25 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 3699248127..f266ce106a 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -23,19 +23,19 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", org.apache.sshd.core;version="[2.14.0,2.15.0)", org.apache.sshd.server;version="[2.14.0,2.15.0)", org.apache.sshd.server.forward;version="[2.14.0,2.15.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.sshd;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.rules;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 9a50c8b306..2df07f7ea1 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 1fb5492ef9..b6b528cec4 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.1.1";x-internal:=true; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-internal:=true; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -24,19 +24,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.1.1";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.1.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.1.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.1.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.1.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.1.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.1.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.2.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.1.1", + org.eclipse.jgit.transport.sshd.agent;version="7.2.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.agent;version="[2.14.0,2.15.0)", @@ -91,14 +91,14 @@ Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", org.apache.sshd.sftp;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)", org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.fnmatch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.fnmatch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 80618201f7..c19e0aa253 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e1224dfb8d..a002290378 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index feef17a1f5..9cf812ce3b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 0873a316e7..e84ac4d574 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 05ad1a4cef..ed6115b046 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.1.1,7.2.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.1.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 883b7e4dd8..4e8da25752 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index eacd219ceb..fdc5ffb8b3 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index d33d3e1af1..c1aaea93b6 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -21,64 +21,64 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io;version="[2.15.0,3.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api;version="[7.1.1,7.2.0)", - org.eclipse.jgit.api.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.archive;version="[7.1.1,7.2.0)", - org.eclipse.jgit.attributes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.awtui;version="[7.1.1,7.2.0)", - org.eclipse.jgit.blame;version="[7.1.1,7.2.0)", - org.eclipse.jgit.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.dircache;version="[7.1.1,7.2.0)", - org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.events;version="[7.1.1,7.2.0)", - org.eclipse.jgit.fnmatch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.gitrepo;version="[7.1.1,7.2.0)", - org.eclipse.jgit.hooks;version="[7.1.1,7.2.0)", - org.eclipse.jgit.ignore;version="[7.1.1,7.2.0)", - org.eclipse.jgit.ignore.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.diff;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.fsck;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.1.1", - org.eclipse.jgit.internal.storage.dfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.io;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.1.1,7.2.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit;version="[7.1.1,7.2.0)", - org.eclipse.jgit.junit.time;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lfs;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.logging;version="[7.1.1,7.2.0)", - org.eclipse.jgit.merge;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.notes;version="[7.1.1,7.2.0)", - org.eclipse.jgit.patch;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm;version="[7.1.1,7.2.0)", - org.eclipse.jgit.pgm.internal;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.file;version="[7.1.1,7.2.0)", - org.eclipse.jgit.storage.pack;version="[7.1.1,7.2.0)", - org.eclipse.jgit.submodule;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.http;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport.resolver;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.treewalk.filter;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.io;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util.sha1;version="[7.1.1,7.2.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.archive;version="[7.2.0,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.awtui;version="[7.2.0,7.3.0)", + org.eclipse.jgit.blame;version="[7.2.0,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.events;version="[7.2.0,7.3.0)", + org.eclipse.jgit.fnmatch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.gitrepo;version="[7.2.0,7.3.0)", + org.eclipse.jgit.hooks;version="[7.2.0,7.3.0)", + org.eclipse.jgit.ignore;version="[7.2.0,7.3.0)", + org.eclipse.jgit.ignore.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.diff;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.fsck;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.2.0", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", + org.eclipse.jgit.junit.time;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.logging;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.notes;version="[7.2.0,7.3.0)", + org.eclipse.jgit.patch;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm;version="[7.2.0,7.3.0)", + org.eclipse.jgit.pgm.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", + org.eclipse.jgit.submodule;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util.sha1;version="[7.2.0,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index c3b80efa4d..c936b09fd7 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 68fd8e302e..423d22b748 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.awtui;version="7.1.1" -Import-Package: org.eclipse.jgit.errors;version="[7.1.1,7.2.0)", - org.eclipse.jgit.lib;version="[7.1.1,7.2.0)", - org.eclipse.jgit.nls;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revplot;version="[7.1.1,7.2.0)", - org.eclipse.jgit.revwalk;version="[7.1.1,7.2.0)", - org.eclipse.jgit.transport;version="[7.1.1,7.2.0)", - org.eclipse.jgit.util;version="[7.1.1,7.2.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.2.0" +Import-Package: org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", + org.eclipse.jgit.util;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 33c83b488d..12363f802e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 02bc6fe16c..ada06ed656 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 3c864fdc41..659ad8549f 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.1.1.qualifier +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.1.1", - org.eclipse.jgit.api;version="7.1.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.2.0", + org.eclipse.jgit.api;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,18 +25,18 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.1.1"; + org.eclipse.jgit.api.errors;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.1.1"; + org.eclipse.jgit.attributes;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.1.1"; + org.eclipse.jgit.blame;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff", - org.eclipse.jgit.diff;version="7.1.1"; + org.eclipse.jgit.diff;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, @@ -44,53 +44,53 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.1.1"; + org.eclipse.jgit.dircache;version="7.2.0"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="7.1.1"; + org.eclipse.jgit.errors;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.internal.storage.pack", - org.eclipse.jgit.events;version="7.1.1"; + org.eclipse.jgit.events;version="7.2.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.1.1", - org.eclipse.jgit.gitrepo;version="7.1.1"; + org.eclipse.jgit.fnmatch;version="7.2.0", + org.eclipse.jgit.gitrepo;version="7.2.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.1.1";x-internal:=true, - org.eclipse.jgit.hooks;version="7.1.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.ignore;version="7.1.1", - org.eclipse.jgit.ignore.internal;version="7.1.1"; + org.eclipse.jgit.gitrepo.internal;version="7.2.0";x-internal:=true, + org.eclipse.jgit.hooks;version="7.2.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.ignore;version="7.2.0", + org.eclipse.jgit.ignore.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.1.1"; + org.eclipse.jgit.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.1.1"; + org.eclipse.jgit.internal.diff;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.1.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.1.1"; + org.eclipse.jgit.internal.fsck;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.1.1"; + org.eclipse.jgit.internal.revwalk;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.1.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.1.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="7.1.1"; + org.eclipse.jgit.internal.storage.file;version="7.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -99,36 +99,36 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="7.1.1"; + org.eclipse.jgit.internal.storage.io;version="7.2.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.1.1"; + org.eclipse.jgit.internal.storage.memory;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.pack;version="7.1.1"; + org.eclipse.jgit.internal.storage.pack;version="7.2.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.1.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.2.0"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="7.1.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.1.1"; + org.eclipse.jgit.internal.submodule;version="7.2.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.1.1"; + org.eclipse.jgit.internal.transport.http;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.1.1"; + org.eclipse.jgit.internal.transport.parser;version="7.2.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.1.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.2.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.1.1"; + org.eclipse.jgit.internal.util;version="7.2.0"; x-friends:=" org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.1.1"; + org.eclipse.jgit.lib;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -142,12 +142,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.1.1"; + org.eclipse.jgit.lib.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.1.1", - org.eclipse.jgit.merge;version="7.1.1"; + org.eclipse.jgit.logging;version="7.2.0", + org.eclipse.jgit.merge;version="7.2.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -156,40 +156,40 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.1.1", - org.eclipse.jgit.notes;version="7.1.1"; + org.eclipse.jgit.nls;version="7.2.0", + org.eclipse.jgit.notes;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.1.1"; + org.eclipse.jgit.patch;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.1.1"; + org.eclipse.jgit.revplot;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk", - org.eclipse.jgit.revwalk;version="7.1.1"; + org.eclipse.jgit.revwalk;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.treewalk", - org.eclipse.jgit.revwalk.filter;version="7.1.1"; + org.eclipse.jgit.revwalk.filter;version="7.2.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.1.1"; + org.eclipse.jgit.storage.file;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.1.1"; + org.eclipse.jgit.storage.pack;version="7.2.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.1.1"; + org.eclipse.jgit.submodule;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.1.1"; + org.eclipse.jgit.transport;version="7.2.0"; uses:="javax.crypto, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, @@ -202,21 +202,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.1.1"; + org.eclipse.jgit.transport.http;version="7.2.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.1.1"; + org.eclipse.jgit.transport.resolver;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.1.1"; + org.eclipse.jgit.treewalk;version="7.2.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="7.1.1"; + org.eclipse.jgit.treewalk.filter;version="7.2.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.1.1"; + org.eclipse.jgit.util;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -229,12 +229,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.1.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.1.1"; + org.eclipse.jgit.util.io;version="7.2.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.1.1", - org.eclipse.jgit.util.time;version="7.1.1" + org.eclipse.jgit.util.sha1;version="7.2.0", + org.eclipse.jgit.util.time;version="7.2.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index df2e804924..0f9ec1fb22 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.1.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.1.1.qualifier";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 1805206ec1..df7ae83647 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 256166bf10..48d6e83c6a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.1.1-SNAPSHOT + 7.2.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 90da22c118c19c1c42029ae30c5a2a424ca62e7e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 27 Nov 2024 13:10:21 +0100 Subject: DiffFormatter: silence non-externalized string warnings Change-Id: I08488598d1cc58f17e6994cf00e74b20307ada06 --- org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index fa446e18cd..bc07cedf4f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -1334,7 +1334,7 @@ public class DiffFormatter implements AutoCloseable { continue; } if (matchesAny(diffDriver.getMatchPatterns(), line)) { - String funcName = line.replaceAll("^[ \\t]+", ""); + String funcName = line.replaceAll("^[ \\t]+", ""); //$NON-NLS-1$//$NON-NLS-2$ return funcName.substring(0, Math.min(funcName.length(), 80)).trim(); } -- cgit v1.2.3 From 5cdd45837a4af25fdd9ff06130d2b5c2f6757c94 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 27 Nov 2024 13:13:23 +0100 Subject: Remove unused API warning filters Change-Id: I4ec17bb532cf1fb2634ef7f5fc93b624bad7f8f0 --- org.eclipse.jgit/.settings/.api_filters | 67 --------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 org.eclipse.jgit/.settings/.api_filters diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters deleted file mode 100644 index 9f8018d312..0000000000 --- a/org.eclipse.jgit/.settings/.api_filters +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From bb2bca135793a53779e5cdaf930fb3317e63f0aa Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 27 Nov 2024 13:14:26 +0100 Subject: Update last jgit release version to 7.1.0.202411261347-r Change-Id: I7f392d5f334154437553141c0ab68917b56a7634 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48d6e83c6a..e5d5ea184d 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ ${commit.time.iso} - 7.0.0.202409031743-r + 7.1.0.202411261347-r 1.10.15 2.14.0 0.1.55 -- cgit v1.2.3 From 9018baf9fd1923a3566c32e6cd577137824409c4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 2 Dec 2024 23:18:07 +0100 Subject: Disable MergeToolTest#testEmptyToolName which started to fail long time after it was merged. Disable the test to unblock other apparently unrelated changes until the root cause is found and fixed. Bug: jgit-115 Change-Id: Ic9a4c10a16feb7b61fb348b0b5a4b17961af0dfd --- org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java index 54c4f26099..6a95f9a2d3 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java @@ -27,6 +27,7 @@ import org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool; import org.eclipse.jgit.internal.diffmergetool.MergeTools; import org.eclipse.jgit.lib.StoredConfig; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; /** @@ -77,6 +78,7 @@ public class MergeToolTest extends ToolTestCase { + errorReturnCode); } + @Ignore @Test public void testEmptyToolName() throws Exception { assumeLinuxPlatform(); -- cgit v1.2.3 From 702db13af2b96c0f699fa6be0a63ba281535f337 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 1 Dec 2024 21:59:03 +0100 Subject: UploadPack#implies: add missing @since tag The method was originally introduced in 7.1 and then back ported to the stable-6.10 branch. Change-Id: I7250013227a666de44e439802d51110bba5af2b9 --- org.eclipse.jgit/.settings/.api_filters | 8 ++++++++ org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index d3ae4cf376..94adb25f78 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -80,4 +80,12 @@ + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index e9ea9b25a6..968728de8d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -156,8 +156,10 @@ public class UploadPack implements Closeable { /** * Check if the current policy implies another, based on its bitmask. * - * @param implied the implied policy based on its bitmask. + * @param implied + * the implied policy based on its bitmask. * @return true if the policy is implied. + * @since 6.10.1 */ public boolean implies(RequestPolicy implied) { return (bitmask & implied.bitmask) != 0; -- cgit v1.2.3 From 44d61a3d727eb68db9e57acec0704bfc6758f878 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Wed, 27 Nov 2024 10:15:30 -0800 Subject: WindowCache: add bulk purge(), call from bulk sites Purging a Pack from the WindowCache requires a linear search over all the entries in the cache, and thus is rather expensive. Since git gc often deletes more than one packfile at a time, avoid multiplying this expensive operation when possible by purging a Set of Packs when closing deleted pack files during a directory scan. Purge the Set of Packs with a single linear search of the cache. Closing the PackDirectory also cccbngljkihltghcnbiftcubdvgugdcvujkejehbjr Change-Id: Ic9b45cab57e1ef610c2e20ad392d8b45f8091f41 Signed-off-by: Martin Fick --- .../eclipse/jgit/internal/storage/file/Pack.java | 25 ++++++++++++++++------ .../jgit/internal/storage/file/PackDirectory.java | 9 +++----- .../jgit/internal/storage/file/WindowCache.java | 24 +++++++++++++-------- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index 3518342f97..9073c1675a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -296,15 +296,28 @@ public class Pack implements Iterable { } /** - * Close the resources utilized by this repository + * Close the resources utilized by these pack files + * + * @param packs + * packs to close + */ + public static void close(Set packs) { + WindowCache.purge(packs); + packs.forEach(p -> p.closeIndices()); + } + + /** + * Close the resources utilized by this pack file */ public void close() { WindowCache.purge(this); - synchronized (this) { - loadedIdx.clear(); - reverseIdx.clear(); - bitmapIdx.clear(); - } + closeIndices(); + } + + private synchronized void closeIndices() { + loadedIdx.clear(); + reverseIdx.clear(); + bitmapIdx.clear(); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index 51a8148838..e31126f027 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -24,6 +24,7 @@ import java.util.Collection; import java.util.Collections; import java.util.EnumMap; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -111,9 +112,7 @@ class PackDirectory { void close() { PackList packs = packList.get(); if (packs != NO_PACKS && packList.compareAndSet(packs, NO_PACKS)) { - for (Pack p : packs.packs) { - p.close(); - } + Pack.close(Set.of(packs.packs)); } } @@ -484,9 +483,7 @@ class PackDirectory { return old; } - for (Pack p : forReuse.values()) { - p.close(); - } + Pack.close(new HashSet<>(forReuse.values())); if (list.isEmpty()) { return new PackList(snapshot, NO_PACKS.packs); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java index 30f8240aa9..3ec7e6e666 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java @@ -17,6 +17,7 @@ import java.lang.ref.SoftReference; import java.util.Collections; import java.util.Map; import java.util.Random; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; @@ -397,7 +398,11 @@ public class WindowCache { } static final void purge(Pack pack) { - cache.removeAll(pack); + purge(Collections.singleton(pack)); + } + + static final void purge(Set packs) { + cache.removeAll(packs); } /** cleanup released and/or garbage collected windows. */ @@ -710,20 +715,21 @@ public class WindowCache { /** * Clear all entries related to a single file. *

- * Typically this method is invoked during {@link Pack#close()}, when we - * know the pack is never going to be useful to us again (for example, it no - * longer exists on disk). A concurrent reader loading an entry from this - * same pack may cause the pack to become stuck in the cache anyway. + * Typically this method is invoked during {@link Pack#close()}, or + * {@link Pack#close(Set)}, when we know the packs are never going to be + * useful to us again (for example, they no longer exist on disk after gc). + * A concurrent reader loading an entry from these same packs may cause a + * pack to become stuck in the cache anyway. * - * @param pack - * the file to purge all entries of. + * @param packs + * the files to purge all entries of. */ - private void removeAll(Pack pack) { + private void removeAll(Set packs) { for (int s = 0; s < tableSize; s++) { final Entry e1 = table.get(s); boolean hasDead = false; for (Entry e = e1; e != null; e = e.next) { - if (e.ref.getPack() == pack) { + if (packs.contains(e.ref.getPack())) { e.kill(); hasDead = true; } else if (e.dead) -- cgit v1.2.3 From fb6adb0366bc3e15f30952fe49456b1f96bcf1af Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Fri, 22 Nov 2024 17:57:17 -0800 Subject: Pack: ensure packfile is still valid while still recoverable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When copyAsIs2() needs to send a large object requiring multiple read iterations — any of which could fail if the object isn't already in the WindowCache — verify first that the packfile is still valid at the latest possible moment, just before sending the header that would make recovery impossible. Change-Id: I234fd4b315b579a0506c8fbdea0c6787bdc09fcd Signed-off-by: Martin Fick --- .../src/org/eclipse/jgit/internal/storage/file/Pack.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index 9073c1675a..61577a956c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -597,13 +597,19 @@ public class Pack implements Iterable { assert(crc2 != null); crc2.update(buf, 0, n); } + cnt -= n; if (!isHeaderWritten) { + if (invalid && cnt > 0) { + // Since this is not the last iteration and the packfile is invalid, + // better to assume the iterations will not all complete here while + // it is still likely recoverable. + throw new StoredObjectRepresentationNotAvailableException(invalidatingCause); + } out.writeHeader(src, inflatedLength); isHeaderWritten = true; } out.write(buf, 0, n); pos += n; - cnt -= n; } if (validate) { assert(crc2 != null); -- cgit v1.2.3 From a960da9866ea86a6909911d7249a1bbfe1b628ac Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 4 Dec 2024 14:56:41 -0800 Subject: MergeToolTest: update expected error from the tool This test fails in jenkins becuase the error string is slightly different. It seems to come from an external tool (git mergetool?) that maybe changed that output (?). At the moment update the error string to match the output of the tool. Parsing error messages is bound to be flaky. Change-Id: I81e9bf65088b893af3a0d8e53d57052583fc2262 --- org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java index 54c4f26099..65c7e9a88c 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java @@ -91,7 +91,7 @@ public class MergeToolTest extends ToolTestCase { createMergeConflict(); - String araxisErrorLine = "compare: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1123."; + String araxisErrorLine = "compare-im6.q16: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1131."; String[] expectedErrorOutput = { araxisErrorLine, araxisErrorLine, }; runAndCaptureUsingInitRaw(Arrays.asList(expectedErrorOutput), MERGE_TOOL, "--no-prompt"); -- cgit v1.2.3 From bd57a19fa35b6de493926e2996b28235b96b5690 Mon Sep 17 00:00:00 2001 From: "jackdt@google.com" Date: Tue, 3 Dec 2024 16:21:55 -0800 Subject: TreeWalk: Make a null check before dereferencing the config variable. Gerrit finds a null pointer exception accessing the conf in some merge operations. It is not clear why, but could be related to [1] and [2] where the attributes node provider is set (instead of being null). Check if the config is there before reading the value and return null if not (as if the config didn't have the value set). The config is @Nullable so this check makes sense in any case. [1] https://review.gerrithub.io/c/eclipse-jgit/jgit/+/1203278 [2] https://gerrit-review.git.corp.google.com/c/gerrit/+/441721 Change-Id: I2b786c0a23fa2e09fb9fe041c025d42823defb04 --- org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java index aaac2a72e0..f66b3f65de 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java @@ -38,12 +38,12 @@ import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.CoreConfig.EolStreamType; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.MutableObjectId; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.lib.CoreConfig.EolStreamType; import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.treewalk.filter.PathFilter; import org.eclipse.jgit.treewalk.filter.TreeFilter; @@ -1591,6 +1591,9 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { String filterCommand = filterCommandsByNameDotType.get(key); if (filterCommand != null) return filterCommand; + if (config == null) { + return null; + } filterCommand = config.getString(ConfigConstants.CONFIG_FILTER_SECTION, filterDriverName, filterCommandType); boolean useBuiltin = config.getBoolean( -- cgit v1.2.3 From f2741cacec9f46724a0e48cc55cbb8892361e3d0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Dec 2024 10:34:10 +0100 Subject: Fix NPE in DiffFormatter#getDiffDriver Guard against diff attribute with a null value. Change-Id: Icc4b8d2f360ef105c6d64716cb42f2979967075b --- .../src/org/eclipse/jgit/diff/DiffFormatter.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java index fa446e18cd..6375a60383 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/DiffFormatter.java @@ -1356,13 +1356,17 @@ public class DiffFormatter implements AutoCloseable { private DiffDriver getDiffDriver(DiffEntry entry) { Attribute diffAttr = entry.getDiffAttribute(); - if (diffAttr != null) { - try { - return DiffDriver.valueOf(diffAttr.getValue()); - } catch (IllegalArgumentException e) { - return null; - } + if (diffAttr == null) { + return null; + } + String diffAttrValue = diffAttr.getValue(); + if (diffAttrValue == null) { + return null; + } + try { + return DiffDriver.valueOf(diffAttrValue); + } catch (IllegalArgumentException e) { + return null; } - return null; } } -- cgit v1.2.3 From 7f246a05dcbf11a6c9dcd21215f38f62ad801866 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Dec 2024 11:19:39 +0100 Subject: Fix potential NPE in ResolveMerger#getAttributesContentMergeStrategy Change-Id: I2a4c57438c16a0c5bc1af4c7772eaf65049911e2 --- org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java index a6a287bcf4..a50a6440b9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java @@ -1507,9 +1507,12 @@ public class ResolveMerger extends ThreeWayMerger { private ContentMergeStrategy getAttributesContentMergeStrategy( Attributes attributes, ContentMergeStrategy strategy) { Attribute attr = attributes.get(Constants.ATTR_MERGE); - if (attr != null && attr.getValue() - .equals(Constants.ATTR_BUILTIN_UNION_MERGE_DRIVER)) { - return ContentMergeStrategy.UNION; + if (attr != null) { + String attrValue = attr.getValue(); + if (attrValue != null && attrValue + .equals(Constants.ATTR_BUILTIN_UNION_MERGE_DRIVER)) { + return ContentMergeStrategy.UNION; + } } return strategy; } -- cgit v1.2.3 From 2f597a662e39a53cb2baac02cf0881204cb3555b Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 19 Nov 2024 12:01:31 -0800 Subject: RawParseUtils: Use java.time API to build PersonIdents PersonIdent has deprecated the long/int constructors for the time, in favor of Instant/ZoneId. Update RawParseUtils to create PersonIdents with the new constructors. Change-Id: Ic62ff0c4219b4bd228c694e73e00a7c794e3553a --- .../src/org/eclipse/jgit/util/RawParseUtils.java | 53 ++++++++++++++++------ 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java index 2ce86904c5..1fc695959a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java @@ -13,6 +13,8 @@ package org.eclipse.jgit.util; import static java.nio.charset.StandardCharsets.ISO_8859_1; import static java.nio.charset.StandardCharsets.UTF_8; +import static java.time.Instant.EPOCH; +import static java.time.ZoneOffset.UTC; import static org.eclipse.jgit.lib.ObjectChecker.author; import static org.eclipse.jgit.lib.ObjectChecker.committer; import static org.eclipse.jgit.lib.ObjectChecker.encoding; @@ -30,6 +32,9 @@ import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.UnsupportedCharsetException; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZoneOffset; import java.util.Arrays; import java.util.HashMap; import java.util.Map; @@ -458,6 +463,24 @@ public final class RawParseUtils { return tzHours * 60 + tzMins; } + /** + * Parse a Git style timezone string in [+-]hhmm format + * + * @param b + * buffer to scan. + * @param ptr + * position within buffer to start parsing digits at. + * @param ptrResult + * optional location to return the new ptr value through. If null + * the ptr value will be discarded. + * @return the ZoneOffset represention of the timezone offset string + */ + private static ZoneId parseZoneOffset(final byte[] b, int ptr, + MutableInteger ptrResult) { + int hhmm = parseBase10(b, ptr, ptrResult); + return ZoneOffset.ofHoursMinutes(hhmm / 100, hhmm % 100); + } + /** * Locate the first position after a given character. * @@ -1027,17 +1050,19 @@ public final class RawParseUtils { // character if there is no trailing LF. final int tzBegin = lastIndexOfTrim(raw, ' ', nextLF(raw, emailE - 1) - 2) + 1; - if (tzBegin <= emailE) // No time/zone, still valid - return new PersonIdent(name, email, 0, 0); + if (tzBegin <= emailE) { // No time/zone, still valid + return new PersonIdent(name, email, EPOCH, UTC); + } final int whenBegin = Math.max(emailE, lastIndexOfTrim(raw, ' ', tzBegin - 1) + 1); - if (whenBegin >= tzBegin - 1) // No time/zone, still valid - return new PersonIdent(name, email, 0, 0); + if (whenBegin >= tzBegin - 1) { // No time/zone, still valid + return new PersonIdent(name, email, EPOCH, UTC); + } - final long when = parseLongBase10(raw, whenBegin, null); - final int tz = parseTimeZoneOffset(raw, tzBegin); - return new PersonIdent(name, email, when * 1000L, tz); + long when = parseLongBase10(raw, whenBegin, null); + return new PersonIdent(name, email, Instant.ofEpochSecond(when), + parseZoneOffset(raw, tzBegin, null)); } /** @@ -1075,16 +1100,16 @@ public final class RawParseUtils { name = decode(raw, nameB, stop); final MutableInteger ptrout = new MutableInteger(); - long when; - int tz; + Instant when; + ZoneId tz; if (emailE < stop) { - when = parseLongBase10(raw, emailE + 1, ptrout); - tz = parseTimeZoneOffset(raw, ptrout.value); + when = Instant.ofEpochSecond(parseLongBase10(raw, emailE + 1, ptrout)); + tz = parseZoneOffset(raw, ptrout.value, null); } else { - when = 0; - tz = 0; + when = EPOCH; + tz = UTC; } - return new PersonIdent(name, email, when * 1000L, tz); + return new PersonIdent(name, email, when, tz); } /** -- cgit v1.2.3 From 4156bdfe8ef8af2cc1d48a185e62fdf83e14c8ed Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 4 Dec 2024 11:20:19 +0100 Subject: Mark Attribute#getValue as @Nullable Change-Id: I172c43ff2e3e682f38a91ce288190245fa5d5ebe --- org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java b/org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java index fe3e22a21f..9c4d8700a2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/attributes/Attribute.java @@ -9,6 +9,8 @@ */ package org.eclipse.jgit.attributes; +import org.eclipse.jgit.annotations.Nullable; + /** * Represents an attribute. *

@@ -139,6 +141,7 @@ public final class Attribute { * * @return the attribute value (may be null) */ + @Nullable public String getValue() { return value; } -- cgit v1.2.3 From dd8b13acc0d60b53f399ce7e0c6718b81ad2ab16 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Thu, 5 Dec 2024 13:37:37 -0800 Subject: FileSnapshot: refactor to share error handling It is important to keep the exception handling for getting file attributes the same in all places in this class; put that code into a common method. Change-Id: I1fcce5efd10aa562a4e0e34d3ce94bcc83850237 Signed-off-by: Martin Fick --- .../jgit/internal/storage/file/FileSnapshot.java | 30 +++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index c88ac984ec..c5e9e99673 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java @@ -22,6 +22,7 @@ import java.time.Instant; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.Locale; +import java.util.NoSuchElementException; import java.util.Objects; import java.util.concurrent.TimeUnit; @@ -231,14 +232,8 @@ public class FileSnapshot { this.useConfig = useConfig; BasicFileAttributes fileAttributes = null; try { - fileAttributes = FS.DETECTED.fileAttributes(file); - } catch (NoSuchFileException e) { - this.lastModified = Instant.EPOCH; - this.size = 0L; - this.fileKey = MISSING_FILEKEY; - return; - } catch (IOException e) { - LOG.error(e.getMessage(), e); + fileAttributes = getFileAttributes(file); + } catch (NoSuchElementException e) { this.lastModified = Instant.EPOCH; this.size = 0L; this.fileKey = MISSING_FILEKEY; @@ -319,16 +314,11 @@ public class FileSnapshot { long currSize; Object currFileKey; try { - BasicFileAttributes fileAttributes = FS.DETECTED.fileAttributes(path); + BasicFileAttributes fileAttributes = getFileAttributes(path); currLastModified = fileAttributes.lastModifiedTime().toInstant(); currSize = fileAttributes.size(); currFileKey = getFileKey(fileAttributes); - } catch (NoSuchFileException e) { - currLastModified = Instant.EPOCH; - currSize = 0L; - currFileKey = MISSING_FILEKEY; - } catch (IOException e) { - LOG.error(e.getMessage(), e); + } catch (NoSuchElementException e) { currLastModified = Instant.EPOCH; currSize = 0L; currFileKey = MISSING_FILEKEY; @@ -586,4 +576,14 @@ public class FileSnapshot { } return fileStoreAttributeCache; } + + private static BasicFileAttributes getFileAttributes(File path) throws NoSuchElementException { + try { + return FS.DETECTED.fileAttributes(path); + } catch (NoSuchFileException e) { + } catch (IOException e) { + LOG.error(e.getMessage(), e); + } + throw new NoSuchElementException(path.toString()); + } } -- cgit v1.2.3 From eb0ef9d16ea780c431837f904ad4d1ad0aaa5d7d Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Thu, 5 Dec 2024 14:33:34 -0800 Subject: FileSnapshot: silence "Not a Directory" exceptions Sometimes a FileSystemException with "Not a Directory" can be thrown while creating a FileSnapshot, likely because the file or directory was deleted. Since NoSuchFileExceptions are already silenced, and the FileSnapshot already handles all IOExceptions, there is likely no value in seeing this info in the logs, treat these situation the same and silence them also. Change-Id: I022639c42154a0a4c71065741f023f5eb95f9b55 Signed-off-by: Martin Fick --- .../src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index c5e9e99673..d34baf358c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java @@ -15,6 +15,7 @@ import static org.eclipse.jgit.util.FS.FileStoreAttributes.FALLBACK_TIMESTAMP_RE import java.io.File; import java.io.IOException; +import java.nio.file.FileSystemException; import java.nio.file.NoSuchFileException; import java.nio.file.attribute.BasicFileAttributes; import java.time.Duration; @@ -581,6 +582,10 @@ public class FileSnapshot { try { return FS.DETECTED.fileAttributes(path); } catch (NoSuchFileException e) { + } catch (FileSystemException e) { + if (!e.getMessage().endsWith("Not a directory")) { + LOG.error(e.getMessage(), e); + } } catch (IOException e) { LOG.error(e.getMessage(), e); } -- cgit v1.2.3 From 7fedd15c82eda8c8ff694b6e809e83bd64a5ab33 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Thu, 5 Dec 2024 15:53:01 -0800 Subject: FileSnapshot: silence "Stale file handle" exceptions Sometimes a FileSystemException with "Stale file handle" can be thrown while creating a FileSnapshot, likely because the file or directory was deleted. Since NoSuchFileExceptions are already silenced, and the FileSnapshot already handles all IOExceptions, there is likely no value in seeing this info in the logs, treat these situation the same and silence them also. Change-Id: I922f4edf2d332cd704e60276f41a76df242f281c Signed-off-by: Martin Fick --- .../eclipse/jgit/internal/storage/file/FileSnapshot.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index d34baf358c..d752e315db 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java @@ -28,6 +28,7 @@ import java.util.Objects; import java.util.concurrent.TimeUnit; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS.FileStoreAttributes; import org.slf4j.Logger; @@ -580,11 +581,18 @@ public class FileSnapshot { private static BasicFileAttributes getFileAttributes(File path) throws NoSuchElementException { try { - return FS.DETECTED.fileAttributes(path); + try { + return FS.DETECTED.fileAttributes(path); + } catch (IOException e) { + if (!FileUtils.isStaleFileHandle(e)) { + throw e; + } + } } catch (NoSuchFileException e) { } catch (FileSystemException e) { - if (!e.getMessage().endsWith("Not a directory")) { - LOG.error(e.getMessage(), e); + String msg = e.getMessage(); + if (!msg.endsWith("Not a directory")) { + LOG.error(msg, e); } } catch (IOException e) { LOG.error(e.getMessage(), e); -- cgit v1.2.3 From b5d8122812ff914ed0ee231db55e224e6796e4d0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 7 Dec 2024 00:06:11 +0100 Subject: Update .mailmap for contributors - who used multiple email addresses - who used multiple display names Change-Id: If868bfdfe6fbb37af2360e5553fb9453c7fa4835 --- .mailmap | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.mailmap b/.mailmap index 7116ebb4b5..1c7739521d 100644 --- a/.mailmap +++ b/.mailmap @@ -1,20 +1,33 @@ +Adithya Chakilam Adithya Chakilam Chris Aniszczyk Chris Aniszczyk Christian Halstrick Christian Halstrick Dani Megert Daniel Megert +Dariusz Luksza Dariusz Luksza +David Ostrovsky David Ostrovsky David Pursehouse David Pursehouse Han-Wen Nienhuys Han-Wen NIenhuys Hector Oswaldo Caballero Hector Caballero +Jackson Toeniskoetter Lars Vogel Lars Vogel Mark Ingram markdingram Markus Duft Markus Duft +Martin Fick Martin Fick +Martin Fick Martin Fick Michael Keppler Michael Keppler +Nasser Grainawi Nasser Grainawi Roberto Tyley roberto Saša Živkov Sasa Zivkov Saša Živkov Saša Živkov Saša Živkov Sasa Zivkov Sebastian Schuberth Sebastian Schuberth +Sebastian Schuberth Shawn Pearce Shawn O. Pearce Shawn Pearce Shawn Pearce Shawn Pearce Shawn O. Pearce +Sven Selberg Sven Selberg Terry Parker tparker Thomas Wolf Thomas Wolf +Tomasz Zarna +Tomasz Zarna +Tobias Pfeifer +Yunjie Li -- cgit v1.2.3 From e081e9b9049ff3ffb085cae40d50ebdfb563ef17 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Dec 2024 10:54:51 -0800 Subject: RawParseUtils: Default to UTC in invalid timezones PersonIdent used to translate invalid timezones to UTC [1], but the new java.time code just throws an exception. Also the parsing used happen on demand, but now is done in the constructor, so the exception is thrown even if the timezone is not used at all. Check the parsed timezone and default to UTC if it is out of range. [1] https://docs.oracle.com/javase/8/docs/api/java/util/TimeZone.html#getTimeZone-java.lang.String- Change-Id: I90dd7d842ac8f44caef3b76d57375dead76bebde --- .../jgit/util/RawParseUtils_ParsePersonIdentTest.java | 15 +++++++++++++++ .../src/org/eclipse/jgit/util/RawParseUtils.java | 10 ++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_ParsePersonIdentTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_ParsePersonIdentTest.java index e517889c83..6d23db81d8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_ParsePersonIdentTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_ParsePersonIdentTest.java @@ -107,6 +107,21 @@ public class RawParseUtils_ParsePersonIdentTest { assertPersonIdent("Me 1234567890 +8315"); + assertEquals(tooBig.getZoneOffset().getTotalSeconds(), 0); + + PersonIdent tooSmall = RawParseUtils + .parsePersonIdent("Me 1234567890 -8315"); + assertEquals(tooSmall.getZoneOffset().getTotalSeconds(), 0); + + PersonIdent notATime = RawParseUtils + .parsePersonIdent("Me 1234567890 -0370"); + assertEquals(notATime.getZoneOffset().getTotalSeconds(), 0); + } + private static void assertPersonIdent(String line, PersonIdent expected) { PersonIdent actual = RawParseUtils.parsePersonIdent(line); assertEquals(expected, actual); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java index 1fc695959a..3ed72516c7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java @@ -32,6 +32,7 @@ import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.UnsupportedCharsetException; +import java.time.DateTimeException; import java.time.Instant; import java.time.ZoneId; import java.time.ZoneOffset; @@ -473,12 +474,17 @@ public final class RawParseUtils { * @param ptrResult * optional location to return the new ptr value through. If null * the ptr value will be discarded. - * @return the ZoneOffset represention of the timezone offset string + * @return the ZoneOffset represention of the timezone offset string. + * Invalid offsets default to UTC. */ private static ZoneId parseZoneOffset(final byte[] b, int ptr, MutableInteger ptrResult) { int hhmm = parseBase10(b, ptr, ptrResult); - return ZoneOffset.ofHoursMinutes(hhmm / 100, hhmm % 100); + try { + return ZoneOffset.ofHoursMinutes(hhmm / 100, hhmm % 100); + } catch (DateTimeException e) { + return UTC; + } } /** -- cgit v1.2.3 From 76274b62a2cf4da2feb1ac7e9ed6c982d9d3f087 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 9 Dec 2024 13:31:44 -0800 Subject: PersonIdent: Default to UTC in timezone parsing The old method "getTimeZone(int tzOffset)" defaults to UTC if the offset is out of range, but the new "getZoneId(int tzOffset)" throws an exception. Return UTC if the offset is invalid, to keep the behavior consistent with older code. Change-Id: Iffe1980b3bd9c05ef2293635a1cbb493144afb79 --- org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java index 5d3db9e6ee..f22642c4ce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java @@ -12,7 +12,10 @@ package org.eclipse.jgit.lib; +import static java.time.ZoneOffset.UTC; + import java.io.Serializable; +import java.time.DateTimeException; import java.time.Instant; import java.time.ZoneId; import java.time.ZoneOffset; @@ -54,11 +57,15 @@ public class PersonIdent implements Serializable { * Translate a minutes offset into a ZoneId * * @param tzOffset as minutes east of UTC - * @return a ZoneId for this offset + * @return a ZoneId for this offset (UTC if invalid) * @since 7.1 */ public static ZoneId getZoneId(int tzOffset) { - return ZoneOffset.ofHoursMinutes(tzOffset / 60, tzOffset % 60); + try { + return ZoneOffset.ofHoursMinutes(tzOffset / 60, tzOffset % 60); + } catch (DateTimeException e) { + return UTC; + } } /** -- cgit v1.2.3 From 2b229df06c94fa351ce00227a107835e3b21f5ce Mon Sep 17 00:00:00 2001 From: Antonio Barone Date: Mon, 9 Dec 2024 16:22:18 +0100 Subject: Advertise "agent" capability when using protocol v2 The "agent" capability was not advertised by the server when executing git-upload-pack over protocol v2. This, in turn, prevented the clients from advertising its client agent too, as documented [1]: "The client may optionally send its own agent string by including the agent capability with a value Y (in the form agent=Y) in its request to the server (but it MUST NOT do so if the server did not advertise the agent capability)." When using jgit with Gerrit this had the effect of preventing the logging of the git client agent in the sshd_log. [1] https://git-scm.com/docs/protocol-v2#_agent Bug: jgit-118 Change-Id: Ifb6ea65fde020425920338f7dd9cc683fed6a4a4 --- .../tst/org/eclipse/jgit/transport/UploadPackTest.java | 12 ++++++------ .../src/org/eclipse/jgit/transport/UploadPack.java | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java index 017104c527..2bd40031cc 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java @@ -502,15 +502,15 @@ public class UploadPackTest { assertThat(hook.capabilitiesRequest, notNullValue()); assertThat(pckIn.readString(), is("version 2")); assertThat( - Arrays.asList(pckIn.readString(), pckIn.readString(), - pckIn.readString()), + Arrays.asList(pckIn.readString(),pckIn.readString(), + pckIn.readString(), pckIn.readString()), // TODO(jonathantanmy) This check is written this way // to make it simple to see that we expect this list of // capabilities, but probably should be loosened to // allow additional commands to be added to the list, // and additional capabilities to be added to existing // commands without requiring test changes. - hasItems("ls-refs", "fetch=shallow", "server-option")); + hasItems("agent=" + UserAgent.get() ,"ls-refs", "fetch=shallow", "server-option")); assertTrue(PacketLineIn.isEnd(pckIn.readString())); } @@ -536,7 +536,7 @@ public class UploadPackTest { lines.add(line); } } - assertThat(lines, containsInAnyOrder("ls-refs", "fetch", "server-option")); + assertThat(lines, containsInAnyOrder("ls-refs", "fetch", "server-option", "agent=" + UserAgent.get())); } private void checkUnadvertisedIfUnallowed(String configSection, @@ -643,9 +643,9 @@ public class UploadPackTest { assertThat(pckIn.readString(), is("version 2")); assertThat( - Arrays.asList(pckIn.readString(), pckIn.readString(), + Arrays.asList(pckIn.readString(),pckIn.readString(), pckIn.readString(), pckIn.readString()), - hasItems("ls-refs", "fetch=shallow", "server-option")); + hasItems("agent="+ UserAgent.get(),"ls-refs", "fetch=shallow", "server-option")); assertTrue(PacketLineIn.isEnd(pckIn.readString())); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 968728de8d..fbea7044f3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -1441,6 +1441,7 @@ public class UploadPack implements Closeable { if (transferConfig.isAdvertiseObjectInfo()) { caps.add(COMMAND_OBJECT_INFO); } + caps.add(OPTION_AGENT + "=" + UserAgent.get()); return caps; } -- cgit v1.2.3 From dbd0a6a745eaa1345aed8b1383e97eb88ac90e5f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 10 Dec 2024 17:28:13 +0100 Subject: Remove use of deprecated java.security.AccessController It's deprecated and marked for removal since Java 17. Change-Id: I6d0d4ac08f10cc73a409f202628a23faed4e5b36 --- .../internal/transport/sshd/auth/BasicAuthentication.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/auth/BasicAuthentication.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/auth/BasicAuthentication.java index 8866976c89..3e1fab34d9 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/auth/BasicAuthentication.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/auth/BasicAuthentication.java @@ -17,8 +17,6 @@ import java.net.InetSocketAddress; import java.net.PasswordAuthentication; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import java.security.AccessController; -import java.security.PrivilegedAction; import java.util.Arrays; import java.util.concurrent.CancellationException; @@ -113,13 +111,12 @@ public abstract class BasicAuthentication */ protected void askCredentials() { clearPassword(); - PasswordAuthentication auth = AccessController.doPrivileged( - (PrivilegedAction) () -> Authenticator - .requestPasswordAuthentication(proxy.getHostString(), - proxy.getAddress(), proxy.getPort(), - SshConstants.SSH_SCHEME, - SshdText.get().proxyPasswordPrompt, "Basic", //$NON-NLS-1$ - null, RequestorType.PROXY)); + PasswordAuthentication auth = Authenticator + .requestPasswordAuthentication(proxy.getHostString(), + proxy.getAddress(), proxy.getPort(), + SshConstants.SSH_SCHEME, + SshdText.get().proxyPasswordPrompt, "Basic", //$NON-NLS-1$ + null, RequestorType.PROXY); if (auth == null) { user = ""; //$NON-NLS-1$ throw new CancellationException( -- cgit v1.2.3 From e5bb59bc15f09651ffe0fff95dfe5ca5c8470619 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 10 Dec 2024 13:15:22 -0800 Subject: FileSnapshot: Delete malformed "catch" line (merge artifact?) The merge of this file left an empty catch block: error: [EmptyCatch] Caught exceptions should not be ignored Delete the catch, as the exception is a subclass of the FileSystemException catched just under it. Change-Id: I78d6b1ca8152b6eee50a69d24ca987868866ba06 --- .../src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index 8f83a37efc..3eea16b227 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java @@ -16,7 +16,6 @@ import static org.eclipse.jgit.util.FS.FileStoreAttributes.FALLBACK_TIMESTAMP_RE import java.io.File; import java.io.IOException; import java.nio.file.FileSystemException; -import java.nio.file.NoSuchFileException; import java.nio.file.attribute.BasicFileAttributes; import java.time.Duration; import java.time.Instant; @@ -547,7 +546,6 @@ public class FileSnapshot { private static BasicFileAttributes getFileAttributes(File path) throws NoSuchElementException { try { return FS.DETECTED.fileAttributes(path); - } catch (NoSuchFileException e) { } catch (FileSystemException e) { if (!e.getMessage().endsWith("Not a directory")) { LOG.error(e.getMessage(), e); -- cgit v1.2.3 From d2ff398bcbd0177200651f684920b513a923ab82 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Tue, 10 Dec 2024 17:36:26 -0700 Subject: Fix potential NPE in TreeWalk#getFilterCommandDefinition Change-Id: Ic6f0fd26153b47b4aeeec105bac431225d9bf8bf --- org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java index aaac2a72e0..b789c5120e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/treewalk/TreeWalk.java @@ -1587,6 +1587,9 @@ public class TreeWalk implements AutoCloseable, AttributesProvider { */ private String getFilterCommandDefinition(String filterDriverName, String filterCommandType) { + if (config == null) { + return null; + } String key = filterDriverName + "." + filterCommandType; //$NON-NLS-1$ String filterCommand = filterCommandsByNameDotType.get(key); if (filterCommand != null) -- cgit v1.2.3 From df7810957c00f3d857c006ff62ea7dd0e5b6fb76 Mon Sep 17 00:00:00 2001 From: Simon Eder Date: Wed, 31 Jul 2024 16:21:46 +0200 Subject: Submodules: use relative paths for worktree and gitdir Currently absolute paths are used for a submodules 'worktree' and 'gitdir'. This has drawbacks if a git repository containing submodules is copied to a different location. Enable using relative paths when creating a file-based repository. Add optional relative path support to the clone and init commands, and use it in the submodule commands to generate relative paths. The new implementation mimics the cgit behavior which also uses relative paths instead of absolute ones. Bug: jgit-78 Change-Id: I31c5a938d5cbc030d273fc649c94ee0c90b4ce01 --- .../tst/org/eclipse/jgit/api/CloneCommandTest.java | 11 +++--- .../eclipse/jgit/submodule/SubmoduleAddTest.java | 7 ++++ .../jgit/submodule/SubmoduleUpdateTest.java | 8 ++++ .../src/org/eclipse/jgit/api/CloneCommand.java | 17 +++++++++ .../src/org/eclipse/jgit/api/InitCommand.java | 23 ++++++++++- .../org/eclipse/jgit/api/SubmoduleAddCommand.java | 5 ++- .../eclipse/jgit/api/SubmoduleUpdateCommand.java | 7 ++-- .../jgit/internal/storage/file/FileRepository.java | 44 ++++++++++++++++++++-- 8 files changed, 107 insertions(+), 15 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java index 63ab8094ae..db5b27c2ab 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java @@ -647,7 +647,8 @@ public class CloneCommandTest extends RepositoryTestCase { new File(git.getRepository().getWorkTree(), walk.getPath()), subRepo.getWorkTree()); assertEquals(new File(new File(git.getRepository().getDirectory(), - "modules"), walk.getPath()), subRepo.getDirectory()); + "modules"), walk.getPath()).getCanonicalPath(), + subRepo.getDirectory().getCanonicalPath()); } File directory = createTempDirectory("testCloneRepositoryWithSubmodules"); @@ -681,8 +682,8 @@ public class CloneCommandTest extends RepositoryTestCase { walk.getPath()), clonedSub1.getWorkTree()); assertEquals( new File(new File(git2.getRepository().getDirectory(), - "modules"), walk.getPath()), - clonedSub1.getDirectory()); + "modules"), walk.getPath()).getCanonicalPath(), + clonedSub1.getDirectory().getCanonicalPath()); } } @@ -770,8 +771,8 @@ public class CloneCommandTest extends RepositoryTestCase { walk.getPath()), clonedSub1.getWorkTree()); assertEquals( new File(new File(git2.getRepository().getDirectory(), - "modules"), walk.getPath()), - clonedSub1.getDirectory()); + "modules"), walk.getPath()).getCanonicalPath(), + clonedSub1.getDirectory().getCanonicalPath()); status = new SubmoduleStatusCommand(clonedSub1); statuses = status.call(); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleAddTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleAddTest.java index 300c869b78..4306975f7b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleAddTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleAddTest.java @@ -114,6 +114,13 @@ public class SubmoduleAddTest extends RepositoryTestCase { try (Repository subModRepo = generator.getRepository()) { assertNotNull(subModRepo); assertEquals(subCommit, commit); + String worktreeDir = subModRepo.getConfig().getString( + ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_WORKTREE); + assertEquals("../../../sub", worktreeDir); + String gitdir = read(new File(subModRepo.getWorkTree(), + Constants.DOT_GIT)); + assertEquals("gitdir: ../.git/modules/sub", gitdir); } } Status status = Git.wrap(db).status().call(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java index b10bd73208..c5e9c2deaa 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java @@ -91,6 +91,14 @@ public class SubmoduleUpdateTest extends RepositoryTestCase { try (Repository subRepo = generator.getRepository()) { assertNotNull(subRepo); assertEquals(commit, subRepo.resolve(Constants.HEAD)); + String worktreeDir = subRepo.getConfig().getString( + ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_WORKTREE); + assertEquals("../../../sub", worktreeDir); + String gitdir = read( + new File(subRepo.getWorkTree(), Constants.DOT_GIT)); + assertEquals("gitdir: ../.git/modules/sub", gitdir); + } } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java index 3e034f1a6a..4a536b9534 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CloneCommand.java @@ -67,6 +67,8 @@ public class CloneCommand extends TransportCommand { private boolean bare; + private boolean relativePaths; + private FS fs; private String remote = Constants.DEFAULT_REMOTE_NAME; @@ -264,6 +266,7 @@ public class CloneCommand extends TransportCommand { private Repository init() throws GitAPIException { InitCommand command = Git.init(); command.setBare(bare); + command.setRelativeDirs(relativePaths); if (fs != null) { command.setFs(fs); } @@ -554,6 +557,20 @@ public class CloneCommand extends TransportCommand { return this; } + /** + * Set whether the cloned repository shall use relative paths for GIT_DIR + * and GIT_WORK_TREE + * + * @param relativePaths + * if true, use relative paths for GIT_DIR and GIT_WORK_TREE + * @return this instance + * @since 7.2 + */ + public CloneCommand setRelativePaths(boolean relativePaths) { + this.relativePaths = relativePaths; + return this; + } + /** * Set the file system abstraction to be used for repositories created by * this command. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java index 240290f4f9..1da71aa6eb 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/InitCommand.java @@ -19,6 +19,7 @@ import org.eclipse.jgit.api.errors.InvalidRefNameException; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; @@ -44,6 +45,8 @@ public class InitCommand implements Callable { private String initialBranch; + private boolean relativePaths; + /** * {@inheritDoc} *

@@ -100,7 +103,11 @@ public class InitCommand implements Callable { : initialBranch); Repository repository = builder.build(); if (!repository.getObjectDatabase().exists()) - repository.create(bare); + if (repository instanceof FileRepository) { + ((FileRepository) repository).create(bare, relativePaths); + } else { + repository.create(bare); + } return new Git(repository, true); } catch (IOException | ConfigInvalidException e) { throw new JGitInternalException(e.getMessage(), e); @@ -214,4 +221,18 @@ public class InitCommand implements Callable { this.initialBranch = branch; return this; } + + /** + * * Set whether the repository shall use relative paths for GIT_DIR and + * GIT_WORK_TREE + * + * @param relativePaths + * if true, use relative paths for GIT_DIR and GIT_WORK_TREE + * @return {@code this} + * @since 7.2 + */ + public InitCommand setRelativeDirs(boolean relativePaths) { + this.relativePaths = relativePaths; + return this; + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java index 401f069e4e..5105dfc2e5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleAddCommand.java @@ -176,8 +176,9 @@ public class SubmoduleAddCommand extends CloneCommand clone = Git.cloneRepository(); configure(clone); clone.setDirectory(moduleDirectory); - clone.setGitDir(new File(new File(repo.getCommonDirectory(), - Constants.MODULES), path)); + clone.setGitDir(new File( + new File(repo.getCommonDirectory(), Constants.MODULES), path)); + clone.setRelativePaths(true); clone.setURI(resolvedUri); if (monitor != null) clone.setProgressMonitor(monitor); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java index 751dabcd6b..3524984347 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java @@ -127,9 +127,10 @@ public class SubmoduleUpdateCommand extends configure(clone); clone.setURI(url); clone.setDirectory(generator.getDirectory()); - clone.setGitDir( - new File(new File(repo.getCommonDirectory(), Constants.MODULES), - generator.getPath())); + clone.setGitDir(new File( + new File(repo.getCommonDirectory(), Constants.MODULES), + generator.getPath())); + clone.setRelativePaths(true); if (monitor != null) { clone.setProgressMonitor(monitor); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index 84c85659ff..c5c36565d9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -2,7 +2,7 @@ * Copyright (C) 2007, Dave Watson * Copyright (C) 2008-2010, Google Inc. * Copyright (C) 2006-2010, Robin Rosenberg - * Copyright (C) 2006-2008, Shawn O. Pearce and others + * Copyright (C) 2006-2024, Shawn O. Pearce and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -215,6 +215,16 @@ public class FileRepository extends Repository { } } + private String getRelativeDir(File base, File other) { + File relPath; + try { + relPath = base.toPath().relativize(other.toPath()).toFile(); + } catch (IllegalArgumentException e) { + relPath = other; + } + return FileUtils.pathToString(relPath); + } + /** * {@inheritDoc} *

@@ -223,6 +233,22 @@ public class FileRepository extends Repository { */ @Override public void create(boolean bare) throws IOException { + create(bare, false); + } + + /** + * Create a new Git repository initializing the necessary files and + * directories. + * + * @param bare + * if true, a bare repository (a repository without a working + * directory) is created. + * @param relativePaths + * if true, relative paths are used for GIT_DIR and GIT_WORK_TREE + * @throws IOException + * in case of IO problem + */ + public void create(boolean bare, boolean relativePaths) throws IOException { final FileBasedConfig cfg = getConfig(); if (cfg.getFile().exists()) { throw new IllegalStateException(MessageFormat.format( @@ -293,15 +319,25 @@ public class FileRepository extends Repository { if (!bare) { File workTree = getWorkTree(); if (!getDirectory().getParentFile().equals(workTree)) { + String workTreePath; + String gitDirPath; + if (relativePaths) { + File canonGitDir = getDirectory().getCanonicalFile(); + File canonWorkTree = getWorkTree().getCanonicalFile(); + workTreePath = getRelativeDir(canonGitDir, canonWorkTree); + gitDirPath = getRelativeDir(canonWorkTree, canonGitDir); + } else { + workTreePath = getWorkTree().getAbsolutePath(); + gitDirPath = getDirectory().getAbsolutePath(); + } cfg.setString(ConfigConstants.CONFIG_CORE_SECTION, null, - ConfigConstants.CONFIG_KEY_WORKTREE, getWorkTree() - .getAbsolutePath()); + ConfigConstants.CONFIG_KEY_WORKTREE, workTreePath); LockFile dotGitLockFile = new LockFile(new File(workTree, Constants.DOT_GIT)); try { if (dotGitLockFile.lock()) { dotGitLockFile.write(Constants.encode(Constants.GITDIR - + getDirectory().getAbsolutePath())); + + gitDirPath)); dotGitLockFile.commit(); } } finally { -- cgit v1.2.3 From e9094fffdb9d5d498cf75584267d1fd7e3690374 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Thu, 5 Dec 2024 20:19:17 +0100 Subject: RevertCommand: use only first line in revert commit message C git uses only the first line of the title paragraph of the reverted commit to build the title of the revert commit. Align the JGit behavior with that. Since git 2.43.0, a revert of a revert uses a title "Reapply "xxx"" instead of "Revert "Revert "xxx""".[1] This is _not_ implemented in this change. [1] https://github.com/git/git/commit/883cb1b8f86d Bug: jgit-117 Change-Id: I030092c6b9447bb738e6d761af5ce50df58cc6d3 --- .../org/eclipse/jgit/api/RevertCommandTest.java | 9 ++++--- .../eclipse/jgit/revwalk/RevCommitParseTest.java | 11 ++++++++- .../src/org/eclipse/jgit/api/RevertCommand.java | 6 ++--- .../src/org/eclipse/jgit/revwalk/RevCommit.java | 28 ++++++++++++++++++++-- 4 files changed, 45 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java index 4ebe994ef7..afd6708d21 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, Robin Rosenberg and others + * Copyright (C) 2011, 2024 Robin Rosenberg and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -59,7 +59,9 @@ public class RevertCommandTest extends RepositoryTestCase { writeTrashFile("a", "first line\nsecond line\nthird line\nfourth line\n"); git.add().addFilepattern("a").call(); - RevCommit fixingA = git.commit().setMessage("fixed a").call(); + // Commit message with a non-empty second line on purpose + RevCommit fixingA = git.commit().setMessage("fixed a\nsecond line") + .call(); writeTrashFile("b", "first line\n"); git.add().addFilepattern("b").call(); @@ -78,7 +80,8 @@ public class RevertCommandTest extends RepositoryTestCase { + "This reverts commit " + fixingA.getId().getName() + ".\n"; assertEquals(expectedMessage, revertCommit.getFullMessage()); assertEquals("fixed b", history.next().getFullMessage()); - assertEquals("fixed a", history.next().getFullMessage()); + assertEquals("fixed a\nsecond line", + history.next().getFullMessage()); assertEquals("enlarged a", history.next().getFullMessage()); assertEquals("create b", history.next().getFullMessage()); assertEquals("create a", history.next().getFullMessage()); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java index 6872289a8b..2955516af0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2009, Google Inc. and others + * Copyright (C) 2008, 2024 Google Inc. and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -408,6 +408,7 @@ public class RevCommitParseTest extends RepositoryTestCase { final RevCommit c = create(msg); assertEquals(msg, c.getFullMessage()); assertEquals(msg, c.getShortMessage()); + assertEquals(msg, c.getFirstMessageLine()); } @Test @@ -415,6 +416,7 @@ public class RevCommitParseTest extends RepositoryTestCase { final RevCommit c = create("\n"); assertEquals("\n", c.getFullMessage()); assertEquals("", c.getShortMessage()); + assertEquals("", c.getFirstMessageLine()); } @Test @@ -423,6 +425,7 @@ public class RevCommitParseTest extends RepositoryTestCase { final RevCommit c = create(shortMsg); assertEquals(shortMsg, c.getFullMessage()); assertEquals(shortMsg, c.getShortMessage()); + assertEquals(shortMsg, c.getFirstMessageLine()); } @Test @@ -432,6 +435,7 @@ public class RevCommitParseTest extends RepositoryTestCase { final RevCommit c = create(fullMsg); assertEquals(fullMsg, c.getFullMessage()); assertEquals(shortMsg, c.getShortMessage()); + assertEquals(shortMsg, c.getFirstMessageLine()); } @Test @@ -441,6 +445,7 @@ public class RevCommitParseTest extends RepositoryTestCase { final RevCommit c = create(fullMsg); assertEquals(fullMsg, c.getFullMessage()); assertEquals(shortMsg, c.getShortMessage()); + assertEquals("This is a", c.getFirstMessageLine()); } @Test @@ -450,6 +455,7 @@ public class RevCommitParseTest extends RepositoryTestCase { final RevCommit c = create(fullMsg); assertEquals(fullMsg, c.getFullMessage()); assertEquals(shortMsg, c.getShortMessage()); + assertEquals("This is a", c.getFirstMessageLine()); } @Test @@ -461,6 +467,7 @@ public class RevCommitParseTest extends RepositoryTestCase { final RevCommit c = create(fullMsg); assertEquals(fullMsg, c.getFullMessage()); assertEquals(shortMsg, c.getShortMessage()); + assertEquals(shortMsg, c.getFirstMessageLine()); } @Test @@ -480,6 +487,7 @@ public class RevCommitParseTest extends RepositoryTestCase { assertEquals(author, p.getAuthorIdent()); assertEquals(committer, p.getCommitterIdent()); assertEquals("Test commit", p.getShortMessage()); + assertEquals("Test commit", p.getFirstMessageLine()); assertEquals(src.getMessage(), p.getFullMessage()); } @@ -494,6 +502,7 @@ public class RevCommitParseTest extends RepositoryTestCase { final RevCommit c = create(fullMsg); assertEquals(fullMsg, c.getFullMessage()); assertEquals(shortMsg, c.getShortMessage()); + assertEquals("This fixes a", c.getFirstMessageLine()); } private static ObjectId id(String str) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java index 855c3b1cf3..6643c83662 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RevertCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010, Christian Halstrick and others + * Copyright (C) 2010, 2024 Christian Halstrick and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -143,8 +143,8 @@ public class RevertCommand extends GitCommand { merger.setCommitNames(new String[] { "BASE", ourName, revertName }); //$NON-NLS-1$ - String shortMessage = "Revert \"" + srcCommit.getShortMessage() //$NON-NLS-1$ - + "\""; //$NON-NLS-1$ + String shortMessage = "Revert \"" //$NON-NLS-1$ + + srcCommit.getFirstMessageLine() + '"'; String newMessage = shortMessage + "\n\n" //$NON-NLS-1$ + "This reverts commit " + srcCommit.getId().getName() //$NON-NLS-1$ + ".\n"; //$NON-NLS-1$ diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java index 743a8ccce0..55ddebf288 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java @@ -1,6 +1,6 @@ /* - * Copyright (C) 2008-2009, Google Inc. - * Copyright (C) 2008, Shawn O. Pearce and others + * Copyright (C) 2008, 2009 Google Inc. + * Copyright (C) 2008, 2024 Shawn O. Pearce and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -523,6 +523,30 @@ public class RevCommit extends RevObject { return false; } + /** + * Parse the commit message and return its first line, i.e., everything up + * to but not including the first newline, if any. + * + * @return the first line of the decoded commit message as a string; never + * {@code null}. + * @since 7.2 + */ + public final String getFirstMessageLine() { + int msgB = RawParseUtils.commitMessage(buffer, 0); + if (msgB < 0) { + return ""; //$NON-NLS-1$ + } + int msgE = msgB; + byte[] raw = buffer; + while (msgE < raw.length && raw[msgE] != '\n') { + msgE++; + } + if (msgE > msgB && msgE > 0 && raw[msgE - 1] == '\r') { + msgE--; + } + return RawParseUtils.decode(guessEncoding(buffer), buffer, msgB, msgE); + } + /** * Determine the encoding of the commit message buffer. *

-- cgit v1.2.3 From cfb6b625d709c643e8e227b0cce15e650dacacff Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 10 Dec 2024 13:12:20 -0800 Subject: PushCertificateIdentTest: Add test for the timezone parsing PushCertificateIdent translates the hhmm in the certificate ident to minutes and then back to hhmm when a timezone is needed. This accepts invalid timezones like +0061 (which becomes +0101 (!)). Add test covering these peculiar timezone translations. This will help when porting the PushCertificateIdent to the new java.time API Change-Id: I008648d4e0c977eb3b3135e548d577680cf5f39c --- .../jgit/transport/PushCertificateIdentTest.java | 45 ++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateIdentTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateIdentTest.java index cee023d5a9..6290b7978e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateIdentTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateIdentTest.java @@ -138,6 +138,51 @@ public class PushCertificateIdentTest { "Me "); } + @Test + public void timezoneRange_hours() { + int HOUR_TO_MS = 60 * 60 * 1000; + + // java.util.TimeZone: Hours must be between 0 to 23 + PushCertificateIdent hourLimit = PushCertificateIdent + .parse("A U. Thor 1218123387 +2300"); + assertEquals(1380, hourLimit.getTimeZoneOffset()); + assertEquals(23 * HOUR_TO_MS, + hourLimit.getTimeZone().getOffset(1218123387)); + + PushCertificateIdent hourDubious = PushCertificateIdent + .parse("A U. Thor 1218123387 +2400"); + assertEquals(1440, hourDubious.getTimeZoneOffset()); + assertEquals(0, hourDubious.getTimeZone().getOffset(1218123387)); + } + + @Test + public void timezoneRange_minutes() { + PushCertificateIdent hourLimit = PushCertificateIdent + .parse("A U. Thor 1218123387 +0059"); + assertEquals(59, hourLimit.getTimeZoneOffset()); + assertEquals(59 * 60 * 1000, + hourLimit.getTimeZone().getOffset(1218123387)); + + // This becomes one hour and one minute (!) + PushCertificateIdent hourDubious = PushCertificateIdent + .parse("A U. Thor 1218123387 +0061"); + assertEquals(61, hourDubious.getTimeZoneOffset()); + assertEquals(61 * 60 * 1000, + hourDubious.getTimeZone().getOffset(1218123387)); + + PushCertificateIdent weirdCase = PushCertificateIdent + .parse("A U. Thor 1218123387 +0099"); + assertEquals(99, weirdCase.getTimeZoneOffset()); + assertEquals(99 * 60 * 1000, + weirdCase.getTimeZone().getOffset(1218123387)); + + PushCertificateIdent weirdCase2 = PushCertificateIdent + .parse("A U. Thor 1218123387 +0199"); + assertEquals(60 + 99, weirdCase2.getTimeZoneOffset()); + assertEquals((60 + 99) * 60 * 1000, + weirdCase2.getTimeZone().getOffset(1218123387)); + } + private static void assertMatchesPersonIdent(String raw, PersonIdent expectedPersonIdent, String expectedUserId) { PushCertificateIdent certIdent = PushCertificateIdent.parse(raw); -- cgit v1.2.3 From ae53d63837857d886cdf15442118597be717ff33 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Wed, 11 Dec 2024 17:00:17 -0800 Subject: Pack: fix threading bug getting idx When converting to Optionally, a threading bug was introduced, fix it. The Optionally class itself is not thread safe, and previously it was being called from idx() without any thread synchronization mechanism. This was because previously the variable which held the cached index was volatile. The Optionally kept the volatile attribute, but that only synchronizes the reference to the Optionally, and not the element inside the Optionally. A clear() from another thread could thus be missed by the idx() call, potentially allowing the idx() call to interact poorly with the Optionally, potentially even causing a memory leak. To fix this, extend the synchronized inside the idx() method to the entire method. Then, additionally remove the now redundant Optional fetch in idx() and the no longer needed volatile. Change-Id: I6077e1aaed96c53200805b4c87a67afb49c2b373 Signed-off-by: Martin Fick --- .../eclipse/jgit/internal/storage/file/Pack.java | 86 ++++++++++------------ 1 file changed, 40 insertions(+), 46 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index 61577a956c..8d2a86386f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -119,7 +119,7 @@ public class Pack implements Iterable { private byte[] packChecksum; - private volatile Optionally loadedIdx = Optionally.empty(); + private Optionally loadedIdx = Optionally.empty(); private Optionally reverseIdx = Optionally.empty(); @@ -159,60 +159,54 @@ public class Pack implements Iterable { length = Long.MAX_VALUE; } - private PackIndex idx() throws IOException { + private synchronized PackIndex idx() throws IOException { Optional optional = loadedIdx.getOptional(); if (optional.isPresent()) { return optional.get(); } - synchronized (this) { - optional = loadedIdx.getOptional(); - if (optional.isPresent()) { - return optional.get(); - } - if (invalid) { - throw new PackInvalidException(packFile, invalidatingCause); + if (invalid) { + throw new PackInvalidException(packFile, invalidatingCause); + } + try { + long start = System.currentTimeMillis(); + PackFile idxFile = packFile.create(INDEX); + PackIndex idx = PackIndex.open(idxFile); + if (LOG.isDebugEnabled()) { + LOG.debug(String.format( + "Opening pack index %s, size %.3f MB took %d ms", //$NON-NLS-1$ + idxFile.getAbsolutePath(), + Float.valueOf(idxFile.length() + / (1024f * 1024)), + Long.valueOf(System.currentTimeMillis() + - start))); } - try { - long start = System.currentTimeMillis(); - PackFile idxFile = packFile.create(INDEX); - PackIndex idx = PackIndex.open(idxFile); - if (LOG.isDebugEnabled()) { - LOG.debug(String.format( - "Opening pack index %s, size %.3f MB took %d ms", //$NON-NLS-1$ - idxFile.getAbsolutePath(), - Float.valueOf(idxFile.length() - / (1024f * 1024)), - Long.valueOf(System.currentTimeMillis() - - start))); - } - if (packChecksum == null) { - packChecksum = idx.getChecksum(); - fileSnapshot.setChecksum( - ObjectId.fromRaw(packChecksum)); - } else if (!Arrays.equals(packChecksum, - idx.getChecksum())) { - throw new PackMismatchException(MessageFormat - .format(JGitText.get().packChecksumMismatch, - packFile.getPath(), - PackExt.PACK.getExtension(), - Hex.toHexString(packChecksum), - PackExt.INDEX.getExtension(), - Hex.toHexString(idx.getChecksum()))); - } - loadedIdx = optionally(idx); - return idx; - } catch (InterruptedIOException e) { - // don't invalidate the pack, we are interrupted from - // another thread - throw e; - } catch (IOException e) { - invalid = true; - invalidatingCause = e; - throw e; + packChecksum = idx.getChecksum(); + fileSnapshot.setChecksum( + ObjectId.fromRaw(packChecksum)); + } else if (!Arrays.equals(packChecksum, + idx.getChecksum())) { + throw new PackMismatchException(MessageFormat + .format(JGitText.get().packChecksumMismatch, + packFile.getPath(), + PackExt.PACK.getExtension(), + Hex.toHexString(packChecksum), + PackExt.INDEX.getExtension(), + Hex.toHexString(idx.getChecksum()))); } + loadedIdx = optionally(idx); + return idx; + } catch (InterruptedIOException e) { + // don't invalidate the pack, we are interrupted from + // another thread + throw e; + } catch (IOException e) { + invalid = true; + invalidatingCause = e; + throw e; } } + /** * Get the File object which locates this pack on disk. * -- cgit v1.2.3 From cdbea5ea96f7e473a48e6bff15e84ecccd521800 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Wed, 11 Dec 2024 17:26:57 -0800 Subject: Optionally.Hard: avoid Optional creation on every use, Previously the getOptional() call created an new Optional for its element, and this appears to be somewhat expensive. During a time when a server is heavily loaded because of a poorly maintained repository with potentially 2K+ pack files, calls to Optionally.ofNullable() from within the getOptional() method appeared extensively in the Stacktrace. Reduce the getOptional() call overhead by storing an already created Optional of the element instead of the element itself. This trades the extra space of one extra reference for a potential speed gain in a hotspot. Since the current users of Optionally.Hard reference objects significantly larger than a single reference (and most users are likely to be, else why would they be using an Optionally?), this is likely a good tradeoff. Change-Id: I7adccc915480cbb97a43dcbe074cfb620888c936 Signed-off-by: Martin Fick --- .../src/org/eclipse/jgit/internal/util/Optionally.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/util/Optionally.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/util/Optionally.java index 3447f669ab..270b760562 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/util/Optionally.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/util/Optionally.java @@ -53,24 +53,24 @@ public interface Optionally { /** * The mutable optional object */ - protected T element; + protected Optional optional; /** * @param element * the mutable optional object */ public Hard(T element) { - this.element = element; + optional = Optional.ofNullable(element); } @Override public void clear() { - element = null; + optional = Optional.empty(); } @Override public Optional getOptional() { - return Optional.ofNullable(element); + return optional; } } -- cgit v1.2.3 From 9cf0a1f174886f844f61d056d4c3383415d27b9e Mon Sep 17 00:00:00 2001 From: XenoAmess Date: Tue, 24 Sep 2024 17:03:02 +0800 Subject: ArchiveCommandTest: add more detailed message if test failed Change-Id: I05230cd79d5b744bd1b37a2fb5ba69a8ad6bab62 --- .../tst/org/eclipse/jgit/api/ArchiveCommandTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java index 3a4ea8e733..9c2b16a0ae 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ArchiveCommandTest.java @@ -267,7 +267,10 @@ public class ArchiveCommandTest extends RepositoryTestCase { archive(git, archive, fmt, Map.of("compression-level", 9)); int sizeCompression9 = getNumBytes(archive); - assertTrue(sizeCompression1 > sizeCompression9); + assertTrue( + "Expected sizeCompression1 = " + sizeCompression1 + + " > sizeCompression9 = " + sizeCompression9, + sizeCompression1 > sizeCompression9); } } -- cgit v1.2.3 From bc66d1a8bf93c6ce6cd5a5d0c45d9b9859ae3851 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 13 Dec 2024 09:27:24 +0100 Subject: ArchiveCommandTest: add missing package import Transitive dependency to org.apache.commons.lang3 was missing when running tests in Eclipse. Change-Id: I364fabc8b76f5401e400e1bf6dcb4fa400ee0494 --- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index c1aaea93b6..5a5dd88587 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -20,6 +20,7 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)", org.apache.commons.io;version="[2.15.0,3.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", + org.apache.commons.lang3;version="[3.17.0,4.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", org.eclipse.jgit.api;version="[7.2.0,7.3.0)", -- cgit v1.2.3 From 320a95e37d3f791b0d16ff7753bc1d7b68b0681f Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 4 Nov 2024 15:23:47 -0800 Subject: TestRepository: Deprecate #getDate and use #getInstant instead Errorprone recomments to use the more modern java.time API instead of the java.util.Date family of classes. This removes all uses of TestRepository#getDate and replace them with getInstant. The method is marked as deprecated and doesn't have any other usages. Change-Id: I84ea63abf781d0d3c7c2724891fd2ef7afc2db1d --- .../src/org/eclipse/jgit/junit/TestRepository.java | 33 ++++++++++++++++------ .../tst/org/eclipse/jgit/pgm/CloneTest.java | 4 +-- .../org/eclipse/jgit/junit/TestRepositoryTest.java | 4 +-- .../org/eclipse/jgit/revwalk/RevWalkTestCase.java | 2 +- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index c6cdfafe84..33ec042930 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.OutputStream; import java.security.MessageDigest; import java.time.Instant; +import java.time.ZoneId; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -198,7 +199,9 @@ public class TestRepository implements AutoCloseable { * * @return current date. * @since 4.2 + * @deprecated Use {@link #getInstant()} instead. */ + @Deprecated public Date getDate() { return new Date(mockSystemReader.getCurrentTime()); } @@ -210,18 +213,30 @@ public class TestRepository implements AutoCloseable { * @since 6.8 */ public Instant getInstant() { - return Instant.ofEpochMilli(mockSystemReader.getCurrentTime()); + return mockSystemReader.now(); } /** * Get timezone * * @return timezone used for default identities. + * @deprecated Use {@link #getTimeZoneId()} instead. */ + @Deprecated public TimeZone getTimeZone() { return mockSystemReader.getTimeZone(); } + + /** + * Get timezone + * + * @return timezone used for default identities. + */ + public ZoneId getTimeZoneId() { + return mockSystemReader.getTimeZoneId(); + } + /** * Adjust the current time that will used by the next commit. * @@ -233,14 +248,14 @@ public class TestRepository implements AutoCloseable { } /** - * Set the author and committer using {@link #getDate()}. + * Set the author and committer using {@link #getInstant()}. * * @param c * the commit builder to store. */ public void setAuthorAndCommitter(org.eclipse.jgit.lib.CommitBuilder c) { - c.setAuthor(new PersonIdent(defaultAuthor, getDate())); - c.setCommitter(new PersonIdent(defaultCommitter, getDate())); + c.setAuthor(new PersonIdent(defaultAuthor, getInstant())); + c.setCommitter(new PersonIdent(defaultCommitter, getInstant())); } /** @@ -488,8 +503,8 @@ public class TestRepository implements AutoCloseable { c = new org.eclipse.jgit.lib.CommitBuilder(); c.setTreeId(tree); c.setParentIds(parents); - c.setAuthor(new PersonIdent(defaultAuthor, getDate())); - c.setCommitter(new PersonIdent(defaultCommitter, getDate())); + c.setAuthor(new PersonIdent(defaultAuthor, getInstant())); + c.setCommitter(new PersonIdent(defaultCommitter, getInstant())); c.setMessage(""); ObjectId id; try (ObjectInserter ins = inserter) { @@ -529,7 +544,7 @@ public class TestRepository implements AutoCloseable { final TagBuilder t = new TagBuilder(); t.setObjectId(dst); t.setTag(name); - t.setTagger(new PersonIdent(defaultCommitter, getDate())); + t.setTagger(new PersonIdent(defaultCommitter, getInstant())); t.setMessage(""); ObjectId id; try (ObjectInserter ins = inserter) { @@ -798,7 +813,7 @@ public class TestRepository implements AutoCloseable { b.setParentId(head); b.setTreeId(merger.getResultTreeId()); b.setAuthor(commit.getAuthorIdent()); - b.setCommitter(new PersonIdent(defaultCommitter, getDate())); + b.setCommitter(new PersonIdent(defaultCommitter, getInstant())); b.setMessage(commit.getFullMessage()); ObjectId result; try (ObjectInserter ins = inserter) { @@ -1408,7 +1423,7 @@ public class TestRepository implements AutoCloseable { c.setAuthor(author); if (committer != null) { if (updateCommitterTime) - committer = new PersonIdent(committer, getDate()); + committer = new PersonIdent(committer, getInstant()); c.setCommitter(committer); } diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java index a1fb9fb589..c56cc6bf3c 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/CloneTest.java @@ -126,7 +126,7 @@ public class CloneTest extends CLIRepositoryTestCase { JGitTestUtil.writeTrashFile(db, "Test.txt", "Some change"); git.add().addFilepattern("Test.txt").call(); return git.commit() - .setCommitter(new PersonIdent(this.committer, tr.getDate())) + .setCommitter(new PersonIdent(this.committer, tr.getInstant())) .setMessage("Second commit").call(); } @@ -134,7 +134,7 @@ public class CloneTest extends CLIRepositoryTestCase { JGitTestUtil.writeTrashFile(db, "change.txt", "another change"); git.add().addFilepattern("change.txt").call(); return git.commit() - .setCommitter(new PersonIdent(this.committer, tr.getDate())) + .setCommitter(new PersonIdent(this.committer, tr.getInstant())) .setMessage("Third commit").call(); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java index 450b753d94..924703464b 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java @@ -275,9 +275,9 @@ public class TestRepositoryTest { RevCommit toPick = tr.commit() .parent(tr.commit().create()) // Can't cherry-pick root. .author(new PersonIdent("Cherrypick Author", "cpa@example.com", - tr.getDate(), tr.getTimeZone())) + tr.getInstant(), tr.getTimeZoneId())) .author(new PersonIdent("Cherrypick Committer", "cpc@example.com", - tr.getDate(), tr.getTimeZone())) + tr.getInstant(), tr.getTimeZoneId())) .message("message to cherry-pick") .add("bar", "bar contents\n") .create(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkTestCase.java index ec0c0e7e84..b37a19dd7a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkTestCase.java @@ -39,7 +39,7 @@ public abstract class RevWalkTestCase extends RepositoryTestCase { } protected Date getDate() { - return util.getDate(); + return Date.from(util.getInstant()); } protected void tick(int secDelta) { -- cgit v1.2.3 From fef56c3c81cce48819fdc8247203717d87ba17c9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 15 Dec 2024 20:51:34 +0100 Subject: FileSnapshot: fix warnings - comment empty code block - suppress non-translatable text warning Change-Id: Id49b4a56bbe5454edfe1ea8b79ceeaf51ceac370 --- .../src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java index d752e315db..7f34aed902 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileSnapshot.java @@ -589,9 +589,10 @@ public class FileSnapshot { } } } catch (NoSuchFileException e) { + // ignore } catch (FileSystemException e) { String msg = e.getMessage(); - if (!msg.endsWith("Not a directory")) { + if (!msg.endsWith("Not a directory")) { //$NON-NLS-1$ LOG.error(msg, e); } } catch (IOException e) { -- cgit v1.2.3 From 937cfdc765c2c523013c00eff7e14cf3c88e94d1 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Dec 2024 09:53:17 -0800 Subject: CommitTimeRevFilter: Move to java.time API Deprecate the methods using Date and offer the equivalent as Instant. Keep an int with seconds as internal representation, as it seems more efficient to compare than Instant.before/after. Change-Id: Ie751ab5661c7dafaab58a16c219143b78092f84a --- .../eclipse/jgit/revwalk/RevWalkFilterTest.java | 123 ++++++++++++++++++++- .../org/eclipse/jgit/revwalk/RevWalkTestCase.java | 7 ++ .../jgit/revwalk/filter/CommitTimeRevFilter.java | 83 +++++++++++--- 3 files changed, 194 insertions(+), 19 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFilterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFilterTest.java index 81ff4a2f92..7fece66bf0 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFilterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkFilterTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import java.io.IOException; +import java.time.Instant; import java.util.Date; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -217,14 +218,132 @@ public class RevWalkFilterTest extends RevWalkTestCase { final RevCommit b = commit(a); tick(100); - Date since = getDate(); + Instant since = getInstant(); final RevCommit c1 = commit(b); tick(100); final RevCommit c2 = commit(b); tick(100); - Date until = getDate(); + Instant until = getInstant(); + final RevCommit d = commit(c1, c2); + tick(100); + + final RevCommit e = commit(d); + + { + RevFilter after = CommitTimeRevFilter.after(since); + assertNotNull(after); + rw.setRevFilter(after); + markStart(e); + assertCommit(e, rw.next()); + assertCommit(d, rw.next()); + assertCommit(c2, rw.next()); + assertCommit(c1, rw.next()); + assertNull(rw.next()); + } + + { + RevFilter before = CommitTimeRevFilter.before(until); + assertNotNull(before); + rw.reset(); + rw.setRevFilter(before); + markStart(e); + assertCommit(c2, rw.next()); + assertCommit(c1, rw.next()); + assertCommit(b, rw.next()); + assertCommit(a, rw.next()); + assertNull(rw.next()); + } + + { + RevFilter between = CommitTimeRevFilter.between(since, until); + assertNotNull(between); + rw.reset(); + rw.setRevFilter(between); + markStart(e); + assertCommit(c2, rw.next()); + assertCommit(c1, rw.next()); + assertNull(rw.next()); + } + } + + @Test + public void testCommitTimeRevFilter_date() throws Exception { + // Using deprecated Date api for the commit time rev filter. + // Delete this tests when method is removed. + final RevCommit a = commit(); + tick(100); + + final RevCommit b = commit(a); + tick(100); + + Date since = Date.from(getInstant()); + final RevCommit c1 = commit(b); + tick(100); + + final RevCommit c2 = commit(b); + tick(100); + + Date until = Date.from(getInstant()); + final RevCommit d = commit(c1, c2); + tick(100); + + final RevCommit e = commit(d); + + { + RevFilter after = CommitTimeRevFilter.after(since); + assertNotNull(after); + rw.setRevFilter(after); + markStart(e); + assertCommit(e, rw.next()); + assertCommit(d, rw.next()); + assertCommit(c2, rw.next()); + assertCommit(c1, rw.next()); + assertNull(rw.next()); + } + + { + RevFilter before = CommitTimeRevFilter.before(until); + assertNotNull(before); + rw.reset(); + rw.setRevFilter(before); + markStart(e); + assertCommit(c2, rw.next()); + assertCommit(c1, rw.next()); + assertCommit(b, rw.next()); + assertCommit(a, rw.next()); + assertNull(rw.next()); + } + + { + RevFilter between = CommitTimeRevFilter.between(since, until); + assertNotNull(between); + rw.reset(); + rw.setRevFilter(between); + markStart(e); + assertCommit(c2, rw.next()); + assertCommit(c1, rw.next()); + assertNull(rw.next()); + } + } + + @Test + public void testCommitTimeRevFilter_long() throws Exception { + final RevCommit a = commit(); + tick(100); + + final RevCommit b = commit(a); + tick(100); + + long since = getInstant().toEpochMilli(); + final RevCommit c1 = commit(b); + tick(100); + + final RevCommit c2 = commit(b); + tick(100); + + long until = getInstant().toEpochMilli(); final RevCommit d = commit(c1, c2); tick(100); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkTestCase.java index b37a19dd7a..8fa6a83670 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkTestCase.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.revwalk; import static org.junit.Assert.assertSame; +import java.time.Instant; import java.util.Date; import org.eclipse.jgit.dircache.DirCacheEntry; @@ -38,10 +39,16 @@ public abstract class RevWalkTestCase extends RepositoryTestCase { return new RevWalk(db); } + // Use getInstant() instead + @Deprecated protected Date getDate() { return Date.from(util.getInstant()); } + protected Instant getInstant() { + return util.getInstant(); + } + protected void tick(int secDelta) { util.tick(secDelta); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java index 4100e877df..40f56e38ba 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.revwalk.filter; import java.io.IOException; +import java.time.Instant; import java.util.Date; import org.eclipse.jgit.errors.IncorrectObjectTypeException; @@ -30,9 +31,23 @@ public abstract class CommitTimeRevFilter extends RevFilter { * @param ts * the point in time to cut on. * @return a new filter to select commits on or before ts. + * + * @deprecated Use {@link #before(Instant)} instead. */ + @Deprecated(since="7.2") public static final RevFilter before(Date ts) { - return before(ts.getTime()); + return before(ts.toInstant()); + } + + /** + * Create a new filter to select commits before a given date/time. + * + * @param ts + * the point in time to cut on. + * @return a new filter to select commits on or before ts. + */ + public static RevFilter before(Instant ts) { + return new Before(ts); } /** @@ -43,7 +58,7 @@ public abstract class CommitTimeRevFilter extends RevFilter { * @return a new filter to select commits on or before ts. */ public static final RevFilter before(long ts) { - return new Before(ts); + return new Before(Instant.ofEpochMilli(ts)); } /** @@ -52,9 +67,23 @@ public abstract class CommitTimeRevFilter extends RevFilter { * @param ts * the point in time to cut on. * @return a new filter to select commits on or after ts. + * + * @deprecated Use {@link #after(Instant)} instead. */ + @Deprecated(since="7.2") public static final RevFilter after(Date ts) { - return after(ts.getTime()); + return after(ts.toInstant()); + } + + /** + * Create a new filter to select commits after a given date/time. + * + * @param ts + * the point in time to cut on. + * @return a new filter to select commits on or after ts. + */ + public static RevFilter after(Instant ts) { + return new After(ts); } /** @@ -65,7 +94,7 @@ public abstract class CommitTimeRevFilter extends RevFilter { * @return a new filter to select commits on or after ts. */ public static final RevFilter after(long ts) { - return new After(ts); + return after(Instant.ofEpochMilli(ts)); } /** @@ -75,9 +104,24 @@ public abstract class CommitTimeRevFilter extends RevFilter { * @param since the point in time to cut on. * @param until the point in time to cut off. * @return a new filter to select commits between the given date/times. + * + * @deprecated Use {@link #between(Instant, Instant)} instead. */ + @Deprecated(since="7.2") public static final RevFilter between(Date since, Date until) { - return between(since.getTime(), until.getTime()); + return between(since.toInstant(), until.toInstant()); + } + + /** + * Create a new filter to select commits after or equal a given date/time since + * and before or equal a given date/time until. + * + * @param since the point in time to cut on. + * @param until the point in time to cut off. + * @return a new filter to select commits between the given date/times. + */ + public static RevFilter between(Instant since, Instant until) { + return new Between(since, until); } /** @@ -87,9 +131,12 @@ public abstract class CommitTimeRevFilter extends RevFilter { * @param since the point in time to cut on, in milliseconds. * @param until the point in time to cut off, in millisconds. * @return a new filter to select commits between the given date/times. + * + * @deprecated Use {@link #between(Instant, Instant)} instead. */ + @Deprecated(since="7.2") public static final RevFilter between(long since, long until) { - return new Between(since, until); + return new Between(Instant.ofEpochMilli(since), Instant.ofEpochMilli(until)); } final int when; @@ -98,6 +145,10 @@ public abstract class CommitTimeRevFilter extends RevFilter { when = (int) (ts / 1000); } + CommitTimeRevFilter(Instant t) { + when = (int) t.getEpochSecond(); + } + @Override public RevFilter clone() { return this; @@ -109,8 +160,8 @@ public abstract class CommitTimeRevFilter extends RevFilter { } private static class Before extends CommitTimeRevFilter { - Before(long ts) { - super(ts); + Before(Instant t) { + super(t); } @Override @@ -123,14 +174,12 @@ public abstract class CommitTimeRevFilter extends RevFilter { @SuppressWarnings("nls") @Override public String toString() { - return super.toString() + "(" + new Date(when * 1000L) + ")"; + return super.toString() + "(" + Instant.ofEpochSecond(when) + ")"; } } private static class After extends CommitTimeRevFilter { - After(long ts) { - super(ts); - } + After(Instant t) { super(t); } @Override public boolean include(RevWalk walker, RevCommit cmit) @@ -148,16 +197,16 @@ public abstract class CommitTimeRevFilter extends RevFilter { @SuppressWarnings("nls") @Override public String toString() { - return super.toString() + "(" + new Date(when * 1000L) + ")"; + return super.toString() + "(" + Instant.ofEpochSecond(when) + ")"; } } private static class Between extends CommitTimeRevFilter { private final int until; - Between(long since, long until) { + Between(Instant since, Instant until) { super(since); - this.until = (int) (until / 1000); + this.until = (int) until.getEpochSecond(); } @Override @@ -170,8 +219,8 @@ public abstract class CommitTimeRevFilter extends RevFilter { @SuppressWarnings("nls") @Override public String toString() { - return super.toString() + "(" + new Date(when * 1000L) + " - " - + new Date(until * 1000L) + ")"; + return super.toString() + "(" + Instant.ofEpochSecond(when) + " - " + + Instant.ofEpochSecond(until) + ")"; } } -- cgit v1.2.3 From a783bb76caa148577d2f5ce11ef037a547d51c34 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 13 Dec 2024 10:47:08 -0800 Subject: transport: Remove usage of CommitTimeRevFilter with long and Dates [errorprone] The Date API is full of major design flaws and pitfalls and should be avoided at all costs. Prefer the java.time APIs, specifically, java.time.Instant (for physical time) and java.time.LocalDate[Time] (for civil time). Move callers to the CommitTimeRevFilter java.time.Instant API introduced in the parent commit. Change-Id: Ib92c56ae09f1ad3df7628a8c61212eb84250700d --- .../src/org/eclipse/jgit/transport/BasePackFetchConnection.java | 5 ++--- org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java index 469a3d6015..be0d37b96e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BasePackFetchConnection.java @@ -12,10 +12,10 @@ package org.eclipse.jgit.transport; -import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_DELIM; import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_DEEPEN; import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_DEEPEN_NOT; import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_DEEPEN_SINCE; +import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_DELIM; import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_DONE; import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_END; import static org.eclipse.jgit.transport.GitProtocolConstants.PACKET_ERR; @@ -32,7 +32,6 @@ import java.time.Instant; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.Date; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; @@ -715,7 +714,7 @@ public abstract class BasePackFetchConnection extends BasePackConnection // wind up later matching up against things we want and we // can avoid asking for something we already happen to have. // - final Date maxWhen = new Date(maxTime * 1000L); + Instant maxWhen = Instant.ofEpochSecond(maxTime); walk.sort(RevSort.COMMIT_TIME_DESC); walk.markStart(reachableCommits); walk.setRevFilter(CommitTimeRevFilter.after(maxWhen)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index d972067e40..41ab8acf05 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -2226,7 +2226,7 @@ public class UploadPack implements Closeable { walk.resetRetain(SAVE); walk.markStart((RevCommit) want); if (oldestTime != 0) - walk.setRevFilter(CommitTimeRevFilter.after(oldestTime * 1000L)); + walk.setRevFilter(CommitTimeRevFilter.after(Instant.ofEpochSecond(oldestTime))); for (;;) { final RevCommit c = walk.next(); if (c == null) -- cgit v1.2.3 From 7fc6382689f95961e5a6f86046be6da1f86f7bc4 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Thu, 19 Dec 2024 20:54:33 +0100 Subject: CommitTimeRevFilter: add missing @since Annotate the new methods using Instant. Change-Id: I1dc4eec59b44e784bcc151bd6a28347f6fd0de03 --- .../eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java index 40f56e38ba..c9186b5491 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/filter/CommitTimeRevFilter.java @@ -45,6 +45,7 @@ public abstract class CommitTimeRevFilter extends RevFilter { * @param ts * the point in time to cut on. * @return a new filter to select commits on or before ts. + * @since 7.2 */ public static RevFilter before(Instant ts) { return new Before(ts); @@ -81,6 +82,7 @@ public abstract class CommitTimeRevFilter extends RevFilter { * @param ts * the point in time to cut on. * @return a new filter to select commits on or after ts. + * @since 7.2 */ public static RevFilter after(Instant ts) { return new After(ts); @@ -113,12 +115,16 @@ public abstract class CommitTimeRevFilter extends RevFilter { } /** - * Create a new filter to select commits after or equal a given date/time since - * and before or equal a given date/time until. + * Create a new filter to select commits after or equal a given date/time + * since and before or equal a given date/time + * until. * - * @param since the point in time to cut on. - * @param until the point in time to cut off. + * @param since + * the point in time to cut on. + * @param until + * the point in time to cut off. * @return a new filter to select commits between the given date/times. + * @since 7.2 */ public static RevFilter between(Instant since, Instant until) { return new Between(since, until); -- cgit v1.2.3 From 105a313eadf1ff2e74dd6642079f3cce9c1f7983 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 19 Dec 2024 21:59:28 +0100 Subject: Update target platform version in maven build to 4.32 (2024-06) The p2 repositories matching jgit-4.17 target platform were moved to the archive server and are no longer available on the download server. Update to the jgit-4.32 target platform which matches Eclipse platform 2024-06. Purge older target platforms to reduce our maintenance effort. Change-Id: I948400e5b8c0db2ab0d50f8fa4e0e42521302ce7 --- .../org.eclipse.jgit.target/jgit-4.17.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.17.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.18.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.18.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.19.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.19.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.20.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.20.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.21.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.21.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.22.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.22.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.23.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.23.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.24.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.24.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.25.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.25.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.26.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.26.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.27.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.27.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.28.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.28.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.29.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.29.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.30.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.30.tpd | 8 - .../org.eclipse.jgit.target/jgit-4.31.target | 284 --------------------- .../org.eclipse.jgit.target/jgit-4.31.tpd | 8 - org.eclipse.jgit.packaging/pom.xml | 2 +- 31 files changed, 1 insertion(+), 4381 deletions(-) delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd 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 deleted file mode 100644 index 8b4cb40836..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd deleted file mode 100644 index b3ff2050b7..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.17.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.17" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2020-09/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 79f5200c33..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd deleted file mode 100644 index 719476a829..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.18.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.18" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2020-12/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 7eca94891f..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd deleted file mode 100644 index 9eb4436772..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.19.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.19-staging" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2021-03/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 453b635041..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd deleted file mode 100644 index 264c040313..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.20.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.20" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2021-06/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 0e92133e60..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd deleted file mode 100644 index 5c7a112075..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.21.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.21" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2021-09/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 2b3071c0ee..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd deleted file mode 100644 index ecc776e34c..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.22.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.22" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2021-12/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 4cd69ada22..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd deleted file mode 100644 index 16efb408fb..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.23.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.23" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2022-03/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 9b54c0c960..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd deleted file mode 100644 index d0f8e8d0b5..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.24.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.24" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2022-06/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 8b072cbdda..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd deleted file mode 100644 index be37c10223..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.25.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.25" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2022-09/" { - org.eclipse.osgi lazy -} 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 deleted file mode 100644 index 1c056a6f2b..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd deleted file mode 100644 index e269919d49..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.26.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.26" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2022-12/" { - org.eclipse.osgi lazy -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target deleted file mode 100644 index 66bc3145e1..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.tpd deleted file mode 100644 index b67718a7c7..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.27.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.27" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2023-03/" { - org.eclipse.osgi lazy -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target deleted file mode 100644 index 4a59b0657a..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.tpd deleted file mode 100644 index 1a9a22a5aa..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.28.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.28" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2023-06" { - org.eclipse.osgi lazy -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target deleted file mode 100644 index 3d2a578bfb..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.tpd deleted file mode 100644 index 4e34280ec2..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.29.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.29" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2023-09" { - org.eclipse.osgi lazy -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target deleted file mode 100644 index ddad08e693..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.tpd deleted file mode 100644 index dfb44741e3..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.30" with source configurePhase - -include "orbit/orbit-4.30.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/staging/2023-12/" { - org.eclipse.osgi lazy -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target deleted file mode 100644 index 17babd84b6..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.target +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.tukaani - xz - 1.9 - jar - - - - - - - org.slf4j - slf4j-api - 1.7.36 - jar - - - org.slf4j - slf4j-simple - 1.7.36 - jar - - - - - - - org.apache.sshd - sshd-osgi - 2.14.0 - jar - - - org.apache.sshd - sshd-sftp - 2.14.0 - jar - - - - - - - org.mockito - mockito-core - 5.12.0 - jar - - - - - - - net.java.dev.jna - jna - 5.14.0 - jar - - - net.java.dev.jna - jna-platform - 5.14.0 - jar - - - - - - - org.eclipse.jetty - jetty-http - 10.0.21 - jar - - - org.eclipse.jetty - jetty-io - 10.0.21 - jar - - - org.eclipse.jetty - jetty-security - 10.0.21 - jar - - - org.eclipse.jetty - jetty-server - 10.0.21 - jar - - - org.eclipse.jetty - jetty-servlet - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util - 10.0.21 - jar - - - org.eclipse.jetty - jetty-util-ajax - 10.0.21 - jar - - - jakarta.servlet - jakarta.servlet-api - 4.0.4 - jar - - - - - - - com.googlecode.javaewah - JavaEWAH - 1.2.3 - jar - - - - - - - org.hamcrest - hamcrest - 2.2 - jar - - - - - - - com.google.code.gson - gson - 2.11.0 - jar - - - - - - - net.bytebuddy - byte-buddy - 1.14.16 - jar - - - net.bytebuddy - byte-buddy-agent - 1.14.16 - jar - - - - - - - org.bouncycastle - bcpg-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcprov-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcpkix-jdk18on - 1.78.1 - jar - - - org.bouncycastle - bcutil-jdk18on - 1.78.1 - jar - - - - - - - org.assertj - assertj-core - 3.26.0 - jar - - - - - - - args4j - args4j - 2.37 - jar - - - - - - - commons-codec - commons-codec - 1.17.0 - jar - - - org.apache.commons - commons-compress - 1.26.2 - jar - - - org.apache.commons - commons-lang3 - 3.14.0 - jar - - - commons-io - commons-io - 2.16.1 - jar - - - commons-logging - commons-logging - 1.3.2 - jar - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd deleted file mode 100644 index 8174709b7c..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.31.tpd +++ /dev/null @@ -1,8 +0,0 @@ -target "jgit-4.31" with source configurePhase - -include "orbit/orbit-4.31.tpd" -include "maven/dependencies.tpd" - -location "https://download.eclipse.org/releases/2024-03/" { - org.eclipse.osgi lazy -} diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index a5dee45990..e568f7bdc3 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -31,7 +31,7 @@ 11 4.0.8 - jgit-4.17 + jgit-4.32 ${git.commit.time} -- cgit v1.2.3 From 1177e1e4a9b6fa52f4e40fe961263cd510114f81 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Wed, 4 Dec 2024 09:33:00 -0800 Subject: WindowCache: share removal work among multiple threads Split the removal process into blocks so that it can be shared by multiple threads. This potential work sharing can provide 2 optimizations for removals: 1) It provides an opportunity for separate removal requests to be consolidated into one removal pass. 2) It can reduce removing thread latencies by sharing the removal work with other removing threads which otherwise might not have any work to do due to their removal request being consolidated. This makes the system more efficient and can actually reduce latencies as system load increases due to pack removals! The optimizations above are all achieved without blockng threads to wait for other threads to complete (although naturally there are some synchronization points), and while ensuring that no threads do more work than if they were the only thread available to perform a removal. Change-Id: Ic6809a8abf056299abde0f0c58c77aaf245a8df5 Signed-off-by: Martin Fick --- .../jgit/internal/storage/file/WindowCache.java | 131 ++++++++++++++++++++- 1 file changed, 126 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java index 3ec7e6e666..fd80faf4ed 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java @@ -15,6 +15,7 @@ import java.io.IOException; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; import java.util.Collections; +import java.util.HashSet; import java.util.Map; import java.util.Random; import java.util.Set; @@ -402,7 +403,7 @@ public class WindowCache { } static final void purge(Set packs) { - cache.removeAll(packs); + cache.queueRemoveAll(packs); } /** cleanup released and/or garbage collected windows. */ @@ -446,6 +447,29 @@ public class WindowCache { private final boolean useStrongIndexRefs; + /** Removers are purely CPU/mem bound (no I/O), so likely should not go above # CPUs */ + private final int idealNumRemovers; + + /** Number of blocks to split the Pack removal into. + * + * Consolidation is better with more blocks since it increases + * the wait before moving to the next set by allowing more work + * to accumulate in the next set. On the flip side, the more + * blocks, the more synchronization overhead increasing each + * removers latency. + */ + private final int numRemovalBlocks; + + private final int removalBlockSize; + + private Set packsToRemove = new HashSet<>(); + + private Set packsBeingRemoved; + + private int numRemovers; + + private int blockBeingRemoved; + private WindowCache(WindowCacheConfig cfg) { tableSize = tableSize(cfg); final int lockCount = lockCount(cfg); @@ -484,6 +508,23 @@ public class WindowCache { statsRecorder = mbean; publishMBean.set(cfg.getExposeStatsViaJmx()); + /* Since each worker will only process up to one full set of blocks, at least 2 + * workers are needed anytime there are queued removals to ensure that all the + * blocks will get processed. However, if workers are maxed out at only 2, then + * enough newer workers will never start in order to make it safe for older + * workers to quit early. At least 3 workers are needed to make older worker + * relief transitions possible. + */ + idealNumRemovers = Math.max(3, Runtime.getRuntime().availableProcessors()); + + int bs = 1024; + if (tableSize < 2 * bs) { + bs = tableSize / 2; + } + removalBlockSize = bs; + numRemovalBlocks = tableSize / removalBlockSize; + blockBeingRemoved = numRemovalBlocks - 1; + if (maxFiles < 1) throw new IllegalArgumentException(JGitText.get().openFilesMustBeAtLeast1); if (maxBytes < windowSize) @@ -713,7 +754,7 @@ public class WindowCache { } /** - * Clear all entries related to a single file. + * Asynchronously clear all entries related to files. *

* Typically this method is invoked during {@link Pack#close()}, or * {@link Pack#close(Set)}, when we know the packs are never going to be @@ -721,11 +762,91 @@ public class WindowCache { * A concurrent reader loading an entry from these same packs may cause a * pack to become stuck in the cache anyway. * + * Work on clearing files will be split up into blocks so that removing + * can be shared by more than one thread. This potential work sharing + * can provide 2 optimizations for removals: + *

    + *
  1. It provides an opportunity for separate removal requests to be + * consolidated into one removal pass.
    2. + *
  2. It can reduce removing thread latencies by sharing the removal work + * with other removing threads which otherwise might not have any work to do + * due to their removal request being consolidated. This makes the system + * more efficient and can actually reduce latencies as system load increases + * due to pack removals!
    3. + *
+ * The optimizations above are all achieved without blockng threads to wait + * for other threads to complete (although naturally there are some + * synchronization points), and while ensuring that no threads do more work + * than if they were the only thread available to perform a removal. + * * @param packs - * the files to purge all entries of. + * the files to purge all entries of */ - private void removeAll(Set packs) { - for (int s = 0; s < tableSize; s++) { + private void queueRemoveAll(Set packs) { + synchronized (this) { + packsToRemove.addAll(packs); + if (numRemovers >= idealNumRemovers) { + return; + } + numRemovers++; + } + for (int numRemoved = 0; removeNextBlock(numRemoved); numRemoved++); + synchronized (this) { + if (numRemovers > 0) { + numRemovers--; + } + } + } + + /** Determine which block to remove next, if any, and do so. + * + * @param numRemoved + * the number of already processed block removals by the current thread + * @return whether more processing should be done by the current thread + */ + private boolean removeNextBlock(int numRemoved) { + Set toRemove; + int block; + synchronized (this) { + if (packsBeingRemoved == null || blockBeingRemoved >= numRemovalBlocks - 1) { + if (packsToRemove.isEmpty()) { + return false; + } + + blockBeingRemoved = 0; + packsBeingRemoved = packsToRemove; + packsToRemove = new HashSet<>(); + } else { + blockBeingRemoved++; + } + + toRemove = packsBeingRemoved; + block = blockBeingRemoved; + } + + removeBlock(toRemove, block); + numRemoved++; + + /* Ensure threads never work on more than a full set of blocks (the equivalent + * of removing one Pack) */ + boolean isLast = numRemoved >= numRemovalBlocks; + synchronized (this) { + if (numRemovers >= idealNumRemovers) { + isLast = true; + } + } + return !isLast; + } + + /** Remove a block of entries for a Set of files + * @param packs + * the files to purge all entries of + * @param block + * the specific block to process removals for + */ + private void removeBlock(Set packs, int block) { + int starting = block * removalBlockSize; + for (int s = starting; s < starting + removalBlockSize && s < tableSize; s++) { final Entry e1 = table.get(s); boolean hasDead = false; for (Entry e = e1; e != null; e = e.next) { -- cgit v1.2.3 From 31db36bbea6d081c8714a4c7ed3f5d81112ae8b8 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 19 Dec 2024 15:14:54 -0800 Subject: http.server/BUILD: expose servlet resources as target JGit has moved to jakarta servlet-api, but gerrit is still in the javax version. This is blocking gerrit to update their jgit code. Gerrit can workaround this rebuilding the jar of jgit-servlet but it is complicated to pass-through the resources. Expose the resources of the servlet as a target, to help gerrit build a javax version of the jgit-servlet. Change-Id: Ifd794e4222ad442f4a538a4d38caa73d58be0f6d --- org.eclipse.jgit.http.server/BUILD | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index f8aa44db94..a0dae488b8 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -2,11 +2,16 @@ load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "jgit-servlet-resources", + srcs = glob(["resources/**"]), +) + java_library( name = "jgit-servlet", srcs = glob(["src/**/*.java"]), resource_strip_prefix = "org.eclipse.jgit.http.server/resources", - resources = glob(["resources/**"]), + resources = [":jgit-servlet-resources"], deps = [ "//lib:servlet-api", # We want these deps to be provided_deps -- cgit v1.2.3 From 5aebfd78c3ab07d1f4292179d36734b39ac3fce2 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Dec 2024 01:32:49 +0100 Subject: Update maven plugins - cyclonedx-maven-plugin to 2.9.1 - eclipse-jarsigner-plugin to 1.5.2 - git-commit-id-maven-plugin to 9.0.1 - gmavenplus-plugin to 4.0.1 - japicmp-maven-plugin to 0.23.0 - maven-artifact-plugin to 3.5.3 - maven-clean-plugin to 3.4.0 - maven-dependency-plugin to 3.8.1 - maven-deploy-plugin to 3.1.3 - maven-enforcer-plugin to 3.5.0 - maven-install-plugin to 3.1.3 - maven-jar-plugin to 3.4.2 - maven-javadoc-plugin-version to 3.11.2 - maven-jxr-plugin-version>3.6.0 - maven-pmd-plugin to 3.26.0 - maven-project-info-reports-plugin-version>3.8.0 - maven-shade-plugin to 3.6.0 - maven-site-plugin to 4.0.0-M16 - maven-surefire-plugin-version>3.5.2 - maven-surefire-report-plugin to 3.5.2 - spotbugs-maven-plugin-version>4.8.6.6 - spring-boot-maven-plugin to 3.4.1 - tycho to 4.0.10 Change-Id: I604c0550c98cb98ebc79817ee352ac5b0357d35f --- org.eclipse.jgit.packaging/pom.xml | 22 ++++++++++---------- pom.xml | 42 +++++++++++++++++++------------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 3560d17033..5bc67b458e 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -30,7 +30,7 @@ 17 - 4.0.8 + 4.0.10 jgit-4.32 ${git.commit.time} @@ -174,7 +174,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 enforce-maven @@ -204,7 +204,7 @@ org.cyclonedx cyclonedx-maven-plugin - 2.8.0 + 2.9.1 library 1.4 @@ -233,7 +233,7 @@ io.github.git-commit-id git-commit-id-maven-plugin - 8.0.2 + 9.0.1 get-the-git-infos @@ -273,7 +273,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 @@ -381,7 +381,7 @@ org.eclipse.cbi.maven.plugins eclipse-jarsigner-plugin - 1.4.3 + 1.5.2 org.codehaus.mojo @@ -390,27 +390,27 @@ maven-clean-plugin - 3.3.2 + 3.4.0 org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins maven-install-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins maven-site-plugin - 4.0.0-M14 + 4.0.0-M16 org.apache.maven.plugins maven-artifact-plugin - 3.5.1 + 3.5.3 **/*cyclonedx.json true diff --git a/pom.xml b/pom.xml index e5d5ea184d..5330d0e5f7 100644 --- a/pom.xml +++ b/pom.xml @@ -131,17 +131,17 @@ 6.0.0 6.1.0 12.0.15 - 0.21.2 + 0.23.0 4.5.14 4.4.16 1.7.36 - 3.6.3 + 3.11.2 2.11.0 1.79 - 4.8.5.0 - 3.5.1 - 3.3.2 - 3.2.5 + 4.8.6.6 + 3.8.0 + 3.6.0 + 3.5.2 ${maven-surefire-plugin-version} 3.13.0 2.13.0 @@ -184,7 +184,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 @@ -208,13 +208,13 @@ maven-clean-plugin - 3.3.2 + 3.4.0 org.apache.maven.plugins maven-shade-plugin - 3.5.3 + 3.6.0 @@ -226,7 +226,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.8.1 @@ -277,7 +277,7 @@ org.apache.maven.plugins maven-pmd-plugin - 3.22.0 + 3.26.0 ${project.build.sourceEncoding} 100 @@ -300,7 +300,7 @@ org.eclipse.cbi.maven.plugins eclipse-jarsigner-plugin - 1.4.3 + 1.5.2 org.jacoco @@ -310,7 +310,7 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M14 + 4.0.0-M16 org.apache.maven.wagon @@ -337,12 +337,12 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins maven-install-plugin - 3.1.2 + 3.1.3 org.apache.maven.plugins @@ -357,7 +357,7 @@ org.springframework.boot spring-boot-maven-plugin - 2.7.18 + 3.4.1 org.eclipse.dash @@ -367,12 +367,12 @@ org.cyclonedx cyclonedx-maven-plugin - 2.8.0 + 2.9.1 org.apache.maven.plugins maven-artifact-plugin - 3.5.1 + 3.5.3 **/*cyclonedx.json true @@ -381,7 +381,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 @@ -623,7 +623,7 @@ io.github.git-commit-id git-commit-id-maven-plugin - 8.0.2 + 9.0.1 get-the-git-infos @@ -642,7 +642,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 3.0.2 + 4.0.1 org.apache.groovy -- cgit v1.2.3 From c57605982bee73dcf44eed05e3dce1552c916e08 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Dec 2024 01:47:19 +0100 Subject: Add missing @since 7.2 to TestRepository#getTimeZoneId Change-Id: Icf3b29d075e5d91e64cea06dcd75119745bd13e0 --- org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java | 1 + 1 file changed, 1 insertion(+) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index 33ec042930..706930a50f 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -232,6 +232,7 @@ public class TestRepository implements AutoCloseable { * Get timezone * * @return timezone used for default identities. + * @since 7.2 */ public ZoneId getTimeZoneId() { return mockSystemReader.getTimeZoneId(); -- cgit v1.2.3 From f9104f6133d47388010c97eb46389b8d216e3c95 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Dec 2024 02:07:35 +0100 Subject: Update commons-io:commons-io to 2.18.0 Change-Id: I91c7bc8f856a490669be74df953443c143c61357 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e1adb8a082..ea5b012758 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -180,8 +180,8 @@ maven_jar( maven_jar( name = "commons-io", - artifact = "commons-io:commons-io:2.17.0", - sha1 = "ddcc8433eb019fb48fe25207c0278143f3e1d7e2", + artifact = "commons-io:commons-io:2.18.0", + sha1 = "44084ef756763795b31c578403dd028ff4a22950", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index efae5a13d6..c54e0489b5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.17.0 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 1578e4c031..1e402a51a3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.17.0 + 2.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 43678e7317..20c8779899 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -275,7 +275,7 @@ commons-io commons-io - 2.17.0 + 2.18.0 jar 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 7b9a397bfb..12143137f9 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 @@ -25,7 +25,7 @@ maven apache dependency { groupId = "commons-io" artifactId = "commons-io" - version = "2.17.0" + version = "2.18.0" } dependency { groupId = "commons-logging" diff --git a/pom.xml b/pom.xml index 5330d0e5f7..bcd97d5bd5 100644 --- a/pom.xml +++ b/pom.xml @@ -898,7 +898,7 @@ org.apache.commons commons-io - 2.17.0 + 2.18.0 -- cgit v1.2.3 From 182fa818b4a343f90a9f5c2065efabc7ed443176 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Dec 2024 02:10:19 +0100 Subject: Update bytebuddy to 1.15.11 Change-Id: Ic101cbc37da273b52c8b5a334ca9ea5ecfc2bee6 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index ea5b012758..dc395292e1 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "0d26263eb7524252d98e602fc6942996a3195e29", ) -BYTE_BUDDY_VERSION = "1.15.10" +BYTE_BUDDY_VERSION = "1.15.11" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "635c873fadd853c084f84fdc3cbd58c5dd8537f9", + sha1 = "f61886478e0f9ee4c21d09574736f0ff45e0a46c", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "0e8eb255b2c378b9a6c7341e7b0e12f0a5636377", + sha1 = "a38b16385e867f59a641330f0362ebe742788ed8", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index c54e0489b5..e73e47cc84 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.10 + 1.15.11 jar net.bytebuddy byte-buddy-agent - 1.15.10 + 1.15.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 1e402a51a3..b32355c25d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.10 + 1.15.11 jar net.bytebuddy byte-buddy-agent - 1.15.10 + 1.15.11 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 20c8779899..143fd8e74a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.10 + 1.15.11 jar net.bytebuddy byte-buddy-agent - 1.15.10 + 1.15.11 jar 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 12143137f9..4360c3a802 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.15.10" + version = "1.15.11" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.15.10" + version = "1.15.11" } } diff --git a/pom.xml b/pom.xml index bcd97d5bd5..1746d62728 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.26.3 5.15.0 - 1.15.10 + 1.15.11 jacoco -- cgit v1.2.3 From d91555854e05093576da852158b30e8103c2a5f8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Dec 2024 02:29:21 +0100 Subject: Update jetty to 12.0.16 Change-Id: Iec52e35db378c3f58f9d80c7e721e98d5e8f01b2 --- WORKSPACE | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.32.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.33.target | 18 +++++++++--------- .../org.eclipse.jgit.target/jgit-4.34.target | 18 +++++++++--------- .../org.eclipse.jgit.target/maven/dependencies.tpd | 16 ++++++++-------- pom.xml | 2 +- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index dc395292e1..8946481ad5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -246,54 +246,54 @@ maven_jar( sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", ) -JETTY_VER = "12.0.15" +JETTY_VER = "12.0.16" maven_jar( name = "jetty-servlet", artifact = "org.eclipse.jetty.ee10:jetty-ee10-servlet:" + JETTY_VER, - sha1 = "a9362717fa1756f9f1f18e0ef2ce671e742b7afb", + sha1 = "022a746c00b1ac5c790fee65a398c707160a46d8", ) maven_jar( name = "jetty-security", artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER, - sha1 = "e15efd84ed53277f8e893574edaed4734c161f44", + sha1 = "23b1a3abecf9d6f5498064a32d9145ae1d8330f9", ) maven_jar( name = "jetty-server", artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER, - sha1 = "2bd3742c6831e42c6ebfa9c990386a8dca71dee8", + sha1 = "3e3638b4bfbee04c27b3ae68e4949fc43b40a042", ) maven_jar( name = "jetty-session", artifact = "org.eclipse.jetty:jetty-session:" + JETTY_VER, - sha1 = "2819021282ff2f7fbaa53feb2fe063130bd4613c", + sha1 = "79cdedc7afebbdba4453f603dfe2f970baa35cc3", ) maven_jar( name = "jetty-http", artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER, - sha1 = "a36fcfde8316b374102c5b43d7247ec501e906d8", + sha1 = "68019fa90e8420ae15c109bd8c8611cacbaf43e5", ) maven_jar( name = "jetty-io", artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER, - sha1 = "e1657f842a0e362171a8a41f35d85cdba1a47872", + sha1 = "7a162c537a99bbaf35a074fec9a50815e6c81d9d", ) maven_jar( name = "jetty-util", artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER, - sha1 = "9fbd3ac58607af034ad065b366798798bb5f7b5e", + sha1 = "e262e505363e5925df15618622d9888aefc1b0d0", ) maven_jar( name = "jetty-util-ajax", artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER, - sha1 = "d5c2f0ea177c5c178874101c186cc9729cf7ea92", + sha1 = "60225034131e3f771b40bc75c15bd9cc4952302b", ) BOUNCYCASTLE_VER = "1.79" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index e73e47cc84..717daa5f66 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-http - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-io - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-security - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-server - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-session - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-util - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-util-ajax - 12.0.15 + 12.0.16 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index b32355c25d..c296252741 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-http - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-io - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-security - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-server - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-session - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-util - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-util-ajax - 12.0.15 + 12.0.16 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 143fd8e74a..df32211809 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -105,49 +105,49 @@ org.eclipse.jetty.ee10 jetty-ee10-servlet - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-http - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-io - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-security - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-server - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-session - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-util - 12.0.15 + 12.0.16 jar org.eclipse.jetty jetty-util-ajax - 12.0.15 + 12.0.16 jar 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 4360c3a802..cdd6f35723 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 @@ -154,42 +154,42 @@ maven jetty dependency { groupId = "org.eclipse.jetty.ee10" artifactId = "jetty-ee10-servlet" - version = "12.0.15" + version = "12.0.16" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-http" - version = "12.0.15" + version = "12.0.16" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-io" - version = "12.0.15" + version = "12.0.16" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-security" - version = "12.0.15" + version = "12.0.16" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-server" - version = "12.0.15" + version = "12.0.16" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-session" - version = "12.0.15" + version = "12.0.16" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util" - version = "12.0.15" + version = "12.0.16" } dependency { groupId = "org.eclipse.jetty" artifactId = "jetty-util-ajax" - version = "12.0.15" + version = "12.0.16" } dependency { groupId = "jakarta.servlet" diff --git a/pom.xml b/pom.xml index 1746d62728..0cdf6c7f7b 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 1.27.1 6.0.0 6.1.0 - 12.0.15 + 12.0.16 0.23.0 4.5.14 4.4.16 -- cgit v1.2.3 From e7e633c480c47665937b4b3d954bb23e85dcd96e Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 20 Dec 2024 10:41:22 +0100 Subject: Update assertj-core to 3.27.0 Change-Id: Ib52a7e36f34e83ab42da9a1ee81de8ac7c7c24b1 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8946481ad5..e015895592 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -216,8 +216,8 @@ maven_jar( maven_jar( name = "assertj-core", - artifact = "org.assertj:assertj-core:3.26.3", - sha1 = "0d26263eb7524252d98e602fc6942996a3195e29", + artifact = "org.assertj:assertj-core:3.27.0", + sha1 = "a04bf3feaf3dc6ede0770c160a7dc1c214f1a2c9", ) BYTE_BUDDY_VERSION = "1.15.11" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 717daa5f66..ff4f0262f1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.3 + 3.27.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index c296252741..a94fc6c9d4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.3 + 3.27.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index df32211809..c67117ea45 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.26.3 + 3.27.0 jar 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 cdd6f35723..bbea833864 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 @@ -56,7 +56,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.26.3" + version = "3.27.0" } } diff --git a/pom.xml b/pom.xml index 0cdf6c7f7b..4fb22188d8 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 3.13.0 2.13.0 2.2 - 3.26.3 + 3.27.0 5.15.0 1.15.11 -- cgit v1.2.3 From d5cc102e7b9b6104a191be0c64017793432bd9dc Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 19 Dec 2024 15:14:54 -0800 Subject: http.server/BUILD: expose servlet resources as target JGit has moved to jakarta servlet-api, but gerrit is still in the javax version. This is blocking gerrit to update their jgit code. Gerrit can workaround this rebuilding the jar of jgit-servlet but it is complicated to pass-through the resources. Expose the resources of the servlet as a target, to help gerrit build a javax version of the jgit-servlet. Change-Id: Ifd794e4222ad442f4a538a4d38caa73d58be0f6d (cherry picked from commit 31db36bbea6d081c8714a4c7ed3f5d81112ae8b8) --- org.eclipse.jgit.http.server/BUILD | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.http.server/BUILD b/org.eclipse.jgit.http.server/BUILD index f8aa44db94..a0dae488b8 100644 --- a/org.eclipse.jgit.http.server/BUILD +++ b/org.eclipse.jgit.http.server/BUILD @@ -2,11 +2,16 @@ load("@rules_java//java:defs.bzl", "java_library") package(default_visibility = ["//visibility:public"]) +filegroup( + name = "jgit-servlet-resources", + srcs = glob(["resources/**"]), +) + java_library( name = "jgit-servlet", srcs = glob(["src/**/*.java"]), resource_strip_prefix = "org.eclipse.jgit.http.server/resources", - resources = glob(["resources/**"]), + resources = [":jgit-servlet-resources"], deps = [ "//lib:servlet-api", # We want these deps to be provided_deps -- cgit v1.2.3 From 2ec1dc20ec71daa33007fb0fa62eff96eabf8254 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 20 Dec 2024 19:26:40 +0100 Subject: SignatureUtils.toString(): allow null signature creation date Some signatures may not have a "created at" timestamp, or the tool used to verify the signature does not report it. If we get none, do not report anything about the signature creation time. This can happen for instance if 'smimesign' is used for verifying x509 signatures. Change-Id: I1a63aa62ffe173e00f27e8aea539b26cd40387c0 --- .../src/org/eclipse/jgit/util/SignatureUtils.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java index 90524db20a..820ac2db91 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java @@ -45,12 +45,15 @@ public final class SignatureUtils { public static String toString(SignatureVerification verification, PersonIdent creator, GitDateFormatter formatter) { StringBuilder result = new StringBuilder(); - // Use the creator's timezone for the signature date - PersonIdent dateId = new PersonIdent(creator, - verification.creationDate()); - result.append(MessageFormat.format(JGitText.get().verifySignatureMade, - formatter.formatDate(dateId))); - result.append('\n'); + if (verification.creationDate() != null) { + // Use the creator's timezone for the signature date + PersonIdent dateId = new PersonIdent(creator, + verification.creationDate()); + result.append( + MessageFormat.format(JGitText.get().verifySignatureMade, + formatter.formatDate(dateId))); + result.append('\n'); + } result.append(MessageFormat.format( JGitText.get().verifySignatureKey, verification.keyFingerprint().toUpperCase(Locale.ROOT))); -- cgit v1.2.3 From 51d6c63fe1602a9e812dc3610c10d7e6e31eeafd Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Tue, 17 Dec 2024 17:30:17 -0800 Subject: Pack: separate an open/close accounting lock Previously the open/close accounting code used whole Pack object synchronization for locking. Unfortunately, there are other unrelated methods which use whole Pack object synchronization also, mostly to avoid concurrent loading of these independent indices, and they do not touch or need to coordinate with the open/close accounting data. During heavy load when a new file appears after repacking the readFully() threads could uselessly block on threads reading the reverse index. These threads could have been reading from the Pack file instead of waiting for the reverse index to be read. Use a new lock to make this locking more fine grained to prevent the readFully() calling threads from getting blocked in beginWindowCache() while the reverse index or bitmaps are being loaded. Change-Id: I7ac9067ca10cd6d6be0ab25148d99da3ace7ba36 Signed-off-by: Martin Fick --- .../eclipse/jgit/internal/storage/file/Pack.java | 56 ++++++++++++++-------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index 8d2a86386f..1a7b5de1d7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -95,6 +95,9 @@ public class Pack implements Iterable { private RandomAccessFile fd; + /** For managing open/close accounting of {@link #fd}. */ + private final Object activeLock = new Object(); + /** Serializes reads performed against {@link #fd}. */ private final Object readLock = new Object(); @@ -645,37 +648,48 @@ public class Pack implements Iterable { throw new EOFException(); } - private synchronized void beginCopyAsIs() + private void beginCopyAsIs() throws StoredObjectRepresentationNotAvailableException { - if (++activeCopyRawData == 1 && activeWindows == 0) { - try { - doOpen(); - } catch (IOException thisPackNotValid) { - throw new StoredObjectRepresentationNotAvailableException( - thisPackNotValid); + synchronized (activeLock) { + if (++activeCopyRawData == 1 && activeWindows == 0) { + try { + doOpen(); + } catch (IOException thisPackNotValid) { + throw new StoredObjectRepresentationNotAvailableException( + thisPackNotValid); + } } } } - private synchronized void endCopyAsIs() { - if (--activeCopyRawData == 0 && activeWindows == 0) - doClose(); + private void endCopyAsIs() { + synchronized (activeLock) { + if (--activeCopyRawData == 0 && activeWindows == 0) { + doClose(); + } + } } - synchronized boolean beginWindowCache() throws IOException { - if (++activeWindows == 1) { - if (activeCopyRawData == 0) - doOpen(); - return true; + boolean beginWindowCache() throws IOException { + synchronized (activeLock) { + if (++activeWindows == 1) { + if (activeCopyRawData == 0) { + doOpen(); + } + return true; + } + return false; } - return false; } - synchronized boolean endWindowCache() { - final boolean r = --activeWindows == 0; - if (r && activeCopyRawData == 0) - doClose(); - return r; + boolean endWindowCache() { + synchronized (activeLock) { + boolean r = --activeWindows == 0; + if (r && activeCopyRawData == 0) { + doClose(); + } + return r; + } } private void doOpen() throws IOException { -- cgit v1.2.3 From cef16a6105fe26847a9ad71f53cb7ffd778c1170 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 23 Dec 2024 09:59:01 -0800 Subject: PushCertificateStore: Use Instant, unused var, boxing PendingCerts are ordered using PersonIdent#getWhen, which returns the time as java.util.Date. That method is deprecated, as we are moving to the new java.time.Instant API. Sort the pending certs using the Instant time (PersonIdent#getWhenAsInstant). Take the chance to fix two minor warnings: * the inserter is never used in the try{} block * Unnecessary boxing in message format Change-Id: I211e5319dc9865bd5a3468c7f5bbc141a6d5e71e --- .../src/org/eclipse/jgit/transport/PushCertificateStore.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificateStore.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificateStore.java index a9e93b6be6..6bdaf0e234 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificateStore.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/PushCertificateStore.java @@ -24,6 +24,7 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -329,7 +330,7 @@ public class PushCertificateStore implements AutoCloseable { if (newId == null) { return RefUpdate.Result.NO_CHANGE; } - try (ObjectInserter inserter = db.newObjectInserter()) { + try { RefUpdate.Result result = updateRef(newId); switch (result) { case FAST_FORWARD: @@ -404,8 +405,8 @@ public class PushCertificateStore implements AutoCloseable { } private static void sortPending(List pending) { - Collections.sort(pending, (PendingCert a, PendingCert b) -> Long.signum( - a.ident.getWhen().getTime() - b.ident.getWhen().getTime())); + Collections.sort(pending, + Comparator.comparing((PendingCert a) -> a.ident.getWhenAsInstant())); } private DirCache newDirCache() throws IOException { @@ -503,7 +504,7 @@ public class PushCertificateStore implements AutoCloseable { } else { sb.append(MessageFormat.format( JGitText.get().storePushCertMultipleRefs, - Integer.valueOf(cert.getCommands().size()))); + cert.getCommands().size())); } return sb.append('\n').toString(); } -- cgit v1.2.3 From ac269d4ae2433c2c65ff0d026589741c8029ac24 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 15 Nov 2024 12:20:05 -0800 Subject: ProposedTimestamp: mark unused methods as deprecated date() and timestamp() don't seem to have any use. I find only calls to instant(). Mark as deprecated to remove usages of java.util.Date and related classes. Change-Id: I4e77c64678295b5ea83ada253c0e120f7bae5843 --- .../src/org/eclipse/jgit/util/time/ProposedTimestamp.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/time/ProposedTimestamp.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/time/ProposedTimestamp.java index a5ee1070d0..a20eaaf908 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/time/ProposedTimestamp.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/time/ProposedTimestamp.java @@ -138,7 +138,10 @@ public abstract class ProposedTimestamp implements AutoCloseable { * Get time since epoch, with up to microsecond resolution. * * @return time since epoch, with up to microsecond resolution. + * + * @deprecated Use instant() instead */ + @Deprecated(since = "7.2") public Timestamp timestamp() { return Timestamp.from(instant()); } @@ -147,7 +150,10 @@ public abstract class ProposedTimestamp implements AutoCloseable { * Get time since epoch, with up to millisecond resolution. * * @return time since epoch, with up to millisecond resolution. + * + * @deprecated Use instant() instead */ + @Deprecated(since = "7.2") public Date date() { return new Date(millis()); } -- cgit v1.2.3 From 9219a7724e4f8b46130577acd24fee8cd7956099 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 6 Nov 2024 14:54:52 -0800 Subject: RelativeDateFormatter: Use Instant instead of date Errorprone suggest to use the more modern java.time.Instant instead of the older Date API. Offer a variant of RelativeDateFormatter#format method for Instants. Change-Id: I536230327ec7b617958191fbe36f98b1294f6d2e --- .../jgit/util/RelativeDateFormatterTest.java | 8 ++++---- .../org/eclipse/jgit/util/GitDateFormatter.java | 2 +- .../eclipse/jgit/util/RelativeDateFormatter.java | 23 ++++++++++++++++++++-- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RelativeDateFormatterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RelativeDateFormatterTest.java index 214bbca944..a927d8dbef 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RelativeDateFormatterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RelativeDateFormatterTest.java @@ -16,7 +16,7 @@ import static org.eclipse.jgit.util.RelativeDateFormatter.SECOND_IN_MILLIS; import static org.eclipse.jgit.util.RelativeDateFormatter.YEAR_IN_MILLIS; import static org.junit.Assert.assertEquals; -import java.util.Date; +import java.time.Instant; import org.eclipse.jgit.junit.MockSystemReader; import org.junit.After; @@ -37,9 +37,9 @@ public class RelativeDateFormatterTest { private static void assertFormat(long ageFromNow, long timeUnit, String expectedFormat) { - Date d = new Date(SystemReader.getInstance().getCurrentTime() - - ageFromNow * timeUnit); - String s = RelativeDateFormatter.format(d); + long millis = ageFromNow * timeUnit; + Instant aTime = SystemReader.getInstance().now().minusMillis(millis); + String s = RelativeDateFormatter.format(aTime); assertEquals(expectedFormat, s); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java index e6bf497ac4..524126b098 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java @@ -148,7 +148,7 @@ public class GitDateFormatter { return String.format("%d %s%02d%02d", //$NON-NLS-1$ ident.getWhen().getTime() / 1000, sign, hours, minutes); case RELATIVE: - return RelativeDateFormatter.format(ident.getWhen()); + return RelativeDateFormatter.format(ident.getWhenAsInstant()); case LOCALELOCAL: case LOCAL: dateTimeInstance.setTimeZone(SystemReader.getInstance() diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java index 5611b1e78e..b6b19e0e7b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/RelativeDateFormatter.java @@ -10,6 +10,8 @@ package org.eclipse.jgit.util; import java.text.MessageFormat; +import java.time.Duration; +import java.time.Instant; import java.util.Date; import org.eclipse.jgit.internal.JGitText; @@ -42,12 +44,29 @@ public class RelativeDateFormatter { * @return age of given {@link java.util.Date} compared to now formatted in * the same relative format as returned by * {@code git log --relative-date} + * @deprecated Use {@link #format(Instant)} instead. */ + @Deprecated(since = "7.2") @SuppressWarnings("boxing") public static String format(Date when) { + return format(when.toInstant()); + } - long ageMillis = SystemReader.getInstance().getCurrentTime() - - when.getTime(); + /** + * Get age of given {@link java.time.Instant} compared to now formatted in the + * same relative format as returned by {@code git log --relative-date} + * + * @param when + * an instant to format + * @return age of given instant compared to now formatted in + * the same relative format as returned by + * {@code git log --relative-date} + * @since 7.2 + */ + @SuppressWarnings("boxing") + public static String format(Instant when) { + long ageMillis = Duration + .between(when, SystemReader.getInstance().now()).toMillis(); // shouldn't happen in a perfect world if (ageMillis < 0) -- cgit v1.2.3 From 478c91216ff1867b747bbe6cfe0c180b4e0bbdf4 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 17 Dec 2024 10:19:48 -0800 Subject: RecursiveMerger: Create PersonIdent with java.time API We are moving away from the old java.util.Date api to the java.time.Instant version. This class uses a deprecated constructor in PersonIdent. Use the new constructor for PersonIdent with Instant/ZoneId. Change-Id: I50e2a643ad17a5c0722f87b1bb8abcad286745a5 --- .../src/org/eclipse/jgit/merge/RecursiveMerger.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java index fc5ab62898..f58ef4faba 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/RecursiveMerger.java @@ -18,10 +18,10 @@ package org.eclipse.jgit.merge; import java.io.IOException; import java.text.MessageFormat; +import java.time.Instant; +import java.time.ZoneOffset; import java.util.ArrayList; -import java.util.Date; import java.util.List; -import java.util.TimeZone; import java.util.stream.Collectors; import org.eclipse.jgit.dircache.DirCache; @@ -233,12 +233,11 @@ public class RecursiveMerger extends ResolveMerger { private static PersonIdent mockAuthor(List parents) { String name = RecursiveMerger.class.getSimpleName(); int time = 0; - for (RevCommit p : parents) + for (RevCommit p : parents) { time = Math.max(time, p.getCommitTime()); - return new PersonIdent( - name, name + "@JGit", //$NON-NLS-1$ - new Date((time + 1) * 1000L), - TimeZone.getTimeZone("GMT+0000")); //$NON-NLS-1$ + } + return new PersonIdent(name, name + "@JGit", //$NON-NLS-1$ + Instant.ofEpochSecond(time+1), ZoneOffset.UTC); } private String failingPathsMessage() { -- cgit v1.2.3 From fba765626899fac2e16d899551c86d4864bc1de0 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 17 Dec 2024 15:40:38 -0800 Subject: LocalDiskRepositoryTestCase: Use java.time API to create PersonIdent This code is using deprecated methods in the mock system reader to invoke a deprecated constructor of PersonIdent. Both classes have now new methods with the java.time API. Use java.time methods to get the timestamp and timezone and build the PersonIdent. Change-Id: I4271d9d1d3c9128cfcedc680410448498530de88 --- .../src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java index 407290a399..c15fc9921e 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java @@ -20,6 +20,7 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; import java.time.Instant; +import java.time.ZoneId; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -233,8 +234,8 @@ public abstract class LocalDiskRepositoryTestCase { */ protected void tick() { mockSystemReader.tick(5 * 60); - final long now = mockSystemReader.getCurrentTime(); - final int tz = mockSystemReader.getTimezone(now); + Instant now = mockSystemReader.now(); + ZoneId tz = mockSystemReader.getTimeZoneId(); author = new PersonIdent(author, now, tz); committer = new PersonIdent(committer, now, tz); -- cgit v1.2.3 From a1c3a818b739ee2bedfda1c69cdac23989f1e97f Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Mon, 23 Dec 2024 14:06:12 -0800 Subject: UploadPackTest: Construct PersonIdent with Instant/ZoneId We are moving away of java.util.Date to the newers java.time API. PersonIdent has deprecated old constructors with long/int for time and tz and provides alternatives with Instant/ZoneId. Use the new constructors in PersonIdent. Change-Id: Ibb32f70818f44fdcc6875e6e706c4c56f85bbabd --- .../org/eclipse/jgit/transport/UploadPackTest.java | 56 ++++++++++++++-------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java index aaecfd290e..5c2f0e5c7d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/UploadPackTest.java @@ -1,5 +1,6 @@ package org.eclipse.jgit.transport; +import static java.time.ZoneOffset.UTC; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.Matchers.containsString; @@ -18,6 +19,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; +import java.time.Instant; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -1506,14 +1508,19 @@ public class UploadPackTest { public void testV2FetchShallowSince() throws Exception { PersonIdent person = new PersonIdent(remote.getRepository()); - RevCommit beyondBoundary = remote.commit() - .committer(new PersonIdent(person, 1510000000, 0)).create(); - RevCommit boundary = remote.commit().parent(beyondBoundary) - .committer(new PersonIdent(person, 1520000000, 0)).create(); - RevCommit tooOld = remote.commit() - .committer(new PersonIdent(person, 1500000000, 0)).create(); + RevCommit beyondBoundary = remote.commit().committer( + new PersonIdent(person, Instant.ofEpochSecond(1510000), UTC)) + .create(); + RevCommit boundary = remote.commit().parent(beyondBoundary).committer( + new PersonIdent(person, Instant.ofEpochSecond(1520000), UTC)) + .create(); + RevCommit tooOld = remote.commit().committer( + new PersonIdent(person, Instant.ofEpochSecond(1500000), UTC)) + .create(); RevCommit merge = remote.commit().parent(boundary).parent(tooOld) - .committer(new PersonIdent(person, 1530000000, 0)).create(); + .committer(new PersonIdent(person, + Instant.ofEpochSecond(1530000), UTC)) + .create(); remote.update("branch1", merge); @@ -1559,12 +1566,15 @@ public class UploadPackTest { public void testV2FetchShallowSince_excludedParentWithMultipleChildren() throws Exception { PersonIdent person = new PersonIdent(remote.getRepository()); - RevCommit base = remote.commit() - .committer(new PersonIdent(person, 1500000000, 0)).create(); - RevCommit child1 = remote.commit().parent(base) - .committer(new PersonIdent(person, 1510000000, 0)).create(); - RevCommit child2 = remote.commit().parent(base) - .committer(new PersonIdent(person, 1520000000, 0)).create(); + RevCommit base = remote.commit().committer( + new PersonIdent(person, Instant.ofEpochSecond(1500000), UTC)) + .create(); + RevCommit child1 = remote.commit().parent(base).committer( + new PersonIdent(person, Instant.ofEpochSecond(1510000), UTC)) + .create(); + RevCommit child2 = remote.commit().parent(base).committer( + new PersonIdent(person, Instant.ofEpochSecond(1520000), UTC)) + .create(); remote.update("branch1", child1); remote.update("branch2", child2); @@ -1601,8 +1611,9 @@ public class UploadPackTest { public void testV2FetchShallowSince_noCommitsSelected() throws Exception { PersonIdent person = new PersonIdent(remote.getRepository()); - RevCommit tooOld = remote.commit() - .committer(new PersonIdent(person, 1500000000, 0)).create(); + RevCommit tooOld = remote.commit().committer( + new PersonIdent(person, Instant.ofEpochSecond(1500000), UTC)) + .create(); remote.update("branch1", tooOld); @@ -1726,12 +1737,15 @@ public class UploadPackTest { public void testV2FetchDeepenNot_excludedParentWithMultipleChildren() throws Exception { PersonIdent person = new PersonIdent(remote.getRepository()); - RevCommit base = remote.commit() - .committer(new PersonIdent(person, 1500000000, 0)).create(); - RevCommit child1 = remote.commit().parent(base) - .committer(new PersonIdent(person, 1510000000, 0)).create(); - RevCommit child2 = remote.commit().parent(base) - .committer(new PersonIdent(person, 1520000000, 0)).create(); + RevCommit base = remote.commit().committer( + new PersonIdent(person, Instant.ofEpochSecond(1500000), UTC)) + .create(); + RevCommit child1 = remote.commit().parent(base).committer( + new PersonIdent(person, Instant.ofEpochSecond(1510000), UTC)) + .create(); + RevCommit child2 = remote.commit().parent(base).committer( + new PersonIdent(person, Instant.ofEpochSecond(1520000), UTC)) + .create(); remote.update("base", base); remote.update("branch1", child1); -- cgit v1.2.3 From 0be7e96ed1aef31acc945974aa1f0fd190a3f795 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 24 Dec 2024 17:10:29 +0100 Subject: Mark static method PersonIdent#getTimeZone as deprecated since it's using java.util.Timezone. Instead promote usage of #getZoneId which uses ZoneId from the preferred java.time API. Change-Id: I15dee551a81acf0b8aafdbfcfcf200c0d38069f4 --- org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java index f22642c4ce..50f4a83b93 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PersonIdent.java @@ -45,7 +45,9 @@ public class PersonIdent implements Serializable { * timezone offset as in {@link #getTimeZoneOffset()}. * @return time zone object for the given offset. * @since 4.1 + * @deprecated use {@link #getZoneId(int)} instead */ + @Deprecated(since = "7.2") public static TimeZone getTimeZone(int tzOffset) { StringBuilder tzId = new StringBuilder(8); tzId.append("GMT"); //$NON-NLS-1$ -- cgit v1.2.3 From fc5cbf1d778f705acd1c388208846040cb7fa70a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 00:49:30 +0100 Subject: GitDateFormatter: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: I904556f94cb28677cce565054bd2cd0f4fb2a096 --- .../org/eclipse/jgit/util/GitDateFormatter.java | 86 ++++++++++++---------- 1 file changed, 48 insertions(+), 38 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java index 524126b098..332e65985e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitDateFormatter.java @@ -10,10 +10,10 @@ package org.eclipse.jgit.util; -import java.text.DateFormat; -import java.text.SimpleDateFormat; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.time.format.FormatStyle; import java.util.Locale; -import java.util.TimeZone; import org.eclipse.jgit.lib.PersonIdent; @@ -26,9 +26,9 @@ import org.eclipse.jgit.lib.PersonIdent; */ public class GitDateFormatter { - private DateFormat dateTimeInstance; + private DateTimeFormatter dateTimeFormat; - private DateFormat dateTimeInstance2; + private DateTimeFormatter dateTimeFormat2; private final Format format; @@ -96,30 +96,34 @@ public class GitDateFormatter { default: break; case DEFAULT: // Not default: - dateTimeInstance = new SimpleDateFormat( + dateTimeFormat = DateTimeFormatter.ofPattern( "EEE MMM dd HH:mm:ss yyyy Z", Locale.US); //$NON-NLS-1$ break; case ISO: - dateTimeInstance = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", //$NON-NLS-1$ + dateTimeFormat = DateTimeFormatter.ofPattern( + "yyyy-MM-dd HH:mm:ss Z", //$NON-NLS-1$ Locale.US); break; case LOCAL: - dateTimeInstance = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy", //$NON-NLS-1$ + dateTimeFormat = DateTimeFormatter.ofPattern( + "EEE MMM dd HH:mm:ss yyyy", //$NON-NLS-1$ Locale.US); break; case RFC: - dateTimeInstance = new SimpleDateFormat( + dateTimeFormat = DateTimeFormatter.ofPattern( "EEE, dd MMM yyyy HH:mm:ss Z", Locale.US); //$NON-NLS-1$ break; case SHORT: - dateTimeInstance = new SimpleDateFormat("yyyy-MM-dd", Locale.US); //$NON-NLS-1$ + dateTimeFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd", //$NON-NLS-1$ + Locale.US); break; case LOCALE: case LOCALELOCAL: - SystemReader systemReader = SystemReader.getInstance(); - dateTimeInstance = systemReader.getDateTimeInstance( - DateFormat.DEFAULT, DateFormat.DEFAULT); - dateTimeInstance2 = systemReader.getSimpleDateFormat("Z"); //$NON-NLS-1$ + dateTimeFormat = DateTimeFormatter + .ofLocalizedDateTime(FormatStyle.MEDIUM) + .withLocale(Locale.US); + dateTimeFormat2 = DateTimeFormatter.ofPattern("Z", //$NON-NLS-1$ + Locale.US); break; } } @@ -135,39 +139,45 @@ public class GitDateFormatter { @SuppressWarnings("boxing") public String formatDate(PersonIdent ident) { switch (format) { - case RAW: - int offset = ident.getTimeZoneOffset(); + case RAW: { + int offset = ident.getZoneOffset().getTotalSeconds(); String sign = offset < 0 ? "-" : "+"; //$NON-NLS-1$ //$NON-NLS-2$ int offset2; - if (offset < 0) + if (offset < 0) { offset2 = -offset; - else + } else { offset2 = offset; - int hours = offset2 / 60; - int minutes = offset2 % 60; + } + int minutes = (offset2 / 60) % 60; + int hours = offset2 / 60 / 60; return String.format("%d %s%02d%02d", //$NON-NLS-1$ - ident.getWhen().getTime() / 1000, sign, hours, minutes); + ident.getWhenAsInstant().getEpochSecond(), sign, hours, + minutes); + } case RELATIVE: return RelativeDateFormatter.format(ident.getWhenAsInstant()); case LOCALELOCAL: case LOCAL: - dateTimeInstance.setTimeZone(SystemReader.getInstance() - .getTimeZone()); - return dateTimeInstance.format(ident.getWhen()); - case LOCALE: - TimeZone tz = ident.getTimeZone(); - if (tz == null) - tz = SystemReader.getInstance().getTimeZone(); - dateTimeInstance.setTimeZone(tz); - dateTimeInstance2.setTimeZone(tz); - return dateTimeInstance.format(ident.getWhen()) + " " //$NON-NLS-1$ - + dateTimeInstance2.format(ident.getWhen()); - default: - tz = ident.getTimeZone(); - if (tz == null) - tz = SystemReader.getInstance().getTimeZone(); - dateTimeInstance.setTimeZone(ident.getTimeZone()); - return dateTimeInstance.format(ident.getWhen()); + return dateTimeFormat + .withZone(SystemReader.getInstance().getTimeZoneId()) + .format(ident.getWhenAsInstant()); + case LOCALE: { + ZoneId tz = ident.getZoneId(); + if (tz == null) { + tz = SystemReader.getInstance().getTimeZoneId(); + } + return dateTimeFormat.withZone(tz).format(ident.getWhenAsInstant()) + + " " //$NON-NLS-1$ + + dateTimeFormat2.withZone(tz) + .format(ident.getWhenAsInstant()); + } + default: { + ZoneId tz = ident.getZoneId(); + if (tz == null) { + tz = SystemReader.getInstance().getTimeZoneId(); + } + return dateTimeFormat.withZone(tz).format(ident.getWhenAsInstant()); + } } } } -- cgit v1.2.3 From a2c281f39f9a455bce18efc166d81887245c880a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 01:05:32 +0100 Subject: Show: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: I19a705329e5bae66df6532b956d74c981dde6f57 --- .../src/org/eclipse/jgit/pgm/Show.java | 30 ++++++++++++---------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java index 1576792234..a3a6782a71 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Show.java @@ -14,11 +14,10 @@ package org.eclipse.jgit.pgm; import java.io.BufferedOutputStream; import java.io.IOException; -import java.text.DateFormat; import java.text.MessageFormat; -import java.text.SimpleDateFormat; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; import java.util.Locale; -import java.util.TimeZone; import org.eclipse.jgit.diff.DiffFormatter; import org.eclipse.jgit.diff.RawTextComparator; @@ -51,9 +50,9 @@ import org.kohsuke.args4j.Option; @Command(common = true, usage = "usage_show") class Show extends TextBuiltin { - private final TimeZone myTZ = TimeZone.getDefault(); + private final ZoneId myTZ = ZoneId.systemDefault(); - private final DateFormat fmt; + private final DateTimeFormatter fmt; private DiffFormatter diffFmt; @@ -157,7 +156,8 @@ class Show extends TextBuiltin { // END -- Options shared with Diff Show() { - fmt = new SimpleDateFormat("EEE MMM dd HH:mm:ss yyyy ZZZZZ", Locale.US); //$NON-NLS-1$ + fmt = DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss yyyy ZZ", //$NON-NLS-1$ + Locale.US); } @Override @@ -232,15 +232,17 @@ class Show extends TextBuiltin { outw.print(tag.getTagName()); outw.println(); - final PersonIdent tagger = tag.getTaggerIdent(); + PersonIdent tagger = tag.getTaggerIdent(); if (tagger != null) { outw.println(MessageFormat.format(CLIText.get().taggerInfo, tagger.getName(), tagger.getEmailAddress())); - final TimeZone taggerTZ = tagger.getTimeZone(); - fmt.setTimeZone(taggerTZ != null ? taggerTZ : myTZ); + ZoneId taggerTZ = tagger.getZoneId(); + String formattedTaggerTime = fmt + .withZone(taggerTZ != null ? taggerTZ : myTZ) + .format(tagger.getWhenAsInstant()); outw.println(MessageFormat.format(CLIText.get().dateInfo, - fmt.format(tagger.getWhen()))); + formattedTaggerTime)); } outw.println(); @@ -293,10 +295,12 @@ class Show extends TextBuiltin { outw.println(MessageFormat.format(CLIText.get().authorInfo, author.getName(), author.getEmailAddress())); - final TimeZone authorTZ = author.getTimeZone(); - fmt.setTimeZone(authorTZ != null ? authorTZ : myTZ); + final ZoneId authorTZ = author.getZoneId(); + String formattedAuthorTime = fmt + .withZone(authorTZ != null ? authorTZ : myTZ) + .format(author.getWhenAsInstant()); outw.println(MessageFormat.format(CLIText.get().dateInfo, - fmt.format(author.getWhen()))); + formattedAuthorTime)); outw.println(); final String[] lines = c.getFullMessage().split("\n"); //$NON-NLS-1$ -- cgit v1.2.3 From f031b33289ea4596e283209decbe70d8d4c809b4 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 01:17:03 +0100 Subject: AllowedSigners: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: I66147445b90df8ca8c8c65239bc9f1ca3f086e75 --- .../org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java index cfbe7a78a7..e31ed64ed9 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java @@ -21,6 +21,7 @@ import java.text.MessageFormat; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; @@ -36,8 +37,6 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.TimeZone; -import java.util.concurrent.TimeUnit; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -482,12 +481,8 @@ final class AllowedSigners extends ModifiableFileWatcher { if (isUTC) { return time.atOffset(ZoneOffset.UTC).toInstant(); } - TimeZone tz = SystemReader.getInstance().getTimeZone(); - // Since there are a few TimeZone IDs that are not recognized by ZoneId, - // use offsets. - return time.atOffset(ZoneOffset.ofTotalSeconds( - (int) TimeUnit.MILLISECONDS.toSeconds(tz.getRawOffset()))) - .toInstant(); + ZoneId tz = SystemReader.getInstance().getTimeZoneId(); + return time.atZone(tz).toInstant(); } // OpenSSH uses the backslash *only* to quote the double-quote. -- cgit v1.2.3 From d32a770f144d3b8a87eeb811e4c8987ae9145966 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 01:26:46 +0100 Subject: SystemReader: add version when annotated methods became deprecated Change-Id: I2a4e8c18378c1bcbf01c12a79d31cb5a2a050e97 --- org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java index 55cc878e02..22b82b3610 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SystemReader.java @@ -523,7 +523,7 @@ public abstract class SystemReader { * * @deprecated Use {@link #now()} */ - @Deprecated + @Deprecated(since = "7.1") public abstract long getCurrentTime(); /** @@ -569,7 +569,7 @@ public abstract class SystemReader { * * @deprecated Use {@link #getTimeZoneAt(Instant)} instead. */ - @Deprecated + @Deprecated(since = "7.1") public abstract int getTimezone(long when); /** @@ -592,7 +592,7 @@ public abstract class SystemReader { * * @deprecated Use {@link #getTimeZoneId()} */ - @Deprecated + @Deprecated(since = "7.1") public TimeZone getTimeZone() { return TimeZone.getDefault(); } -- cgit v1.2.3 From 5a75acc2f893d2095136369ab13d04a8a0f14734 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 01:31:27 +0100 Subject: TestRepository: add version when annotated methods became deprecated Change-Id: Ib9466bfbc3d7ecf53af88dd6b5bade7ae48c7165 --- org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index 706930a50f..e53dbf1bfc 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -201,7 +201,7 @@ public class TestRepository implements AutoCloseable { * @since 4.2 * @deprecated Use {@link #getInstant()} instead. */ - @Deprecated + @Deprecated(since = "7.2") public Date getDate() { return new Date(mockSystemReader.getCurrentTime()); } @@ -222,7 +222,7 @@ public class TestRepository implements AutoCloseable { * @return timezone used for default identities. * @deprecated Use {@link #getTimeZoneId()} instead. */ - @Deprecated + @Deprecated(since = "7.2") public TimeZone getTimeZone() { return mockSystemReader.getTimeZone(); } -- cgit v1.2.3 From f2d742daa54ef129306375f0837464a28e1d993b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 01:39:31 +0100 Subject: CommitCommandTest: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: I44947d26086396b0779ce6e1f9b9f30375032388 --- .../tst/org/eclipse/jgit/api/CommitCommandTest.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java index e74e234297..2cbd223ee8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java @@ -19,9 +19,9 @@ import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; import java.io.File; -import java.util.Date; +import java.time.Instant; +import java.time.ZoneOffset; import java.util.List; -import java.util.TimeZone; import java.util.concurrent.atomic.AtomicInteger; import org.eclipse.jgit.api.CherryPickResult.CherryPickStatus; @@ -486,11 +486,11 @@ public class CommitCommandTest extends RepositoryTestCase { writeTrashFile("file1", "file1"); git.add().addFilepattern("file1").call(); - final String authorName = "First Author"; - final String authorEmail = "author@example.org"; - final Date authorDate = new Date(1349621117000L); + String authorName = "First Author"; + String authorEmail = "author@example.org"; + Instant authorDate = Instant.ofEpochSecond(1349621117L); PersonIdent firstAuthor = new PersonIdent(authorName, authorEmail, - authorDate, TimeZone.getTimeZone("UTC")); + authorDate, ZoneOffset.UTC); git.commit().setMessage("initial commit").setAuthor(firstAuthor).call(); RevCommit amended = git.commit().setAmend(true) @@ -499,7 +499,8 @@ public class CommitCommandTest extends RepositoryTestCase { PersonIdent amendedAuthor = amended.getAuthorIdent(); assertEquals(authorName, amendedAuthor.getName()); assertEquals(authorEmail, amendedAuthor.getEmailAddress()); - assertEquals(authorDate.getTime(), amendedAuthor.getWhen().getTime()); + assertEquals(authorDate.getEpochSecond(), + amendedAuthor.getWhenAsInstant().getEpochSecond()); } } -- cgit v1.2.3 From 8d23d870275490b67b3bcc84fba36b09e788f121 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 14:03:15 +0100 Subject: Don't override maven-compiler-plugin version since it's already set in the parent pom. Change-Id: I9ba0275dfddb9844951e62ce4537186b75ff2036 --- org.eclipse.jgit.benchmarks/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 3079742c79..c92fa9f156 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -79,7 +79,6 @@ org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin-version} UTF-8 ${java.version} -- cgit v1.2.3 From c2b2c3d1e2da84c932c4041da79bb556d101c102 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 21:29:32 +0100 Subject: RebuildCommitGraph: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: I6e52a4f37180a079f592b5002c3a34c6fb7c8a97 --- .../src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java index 2f96ef7d57..22d9e3440a 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/RebuildCommitGraph.java @@ -18,8 +18,8 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.text.MessageFormat; +import java.time.Instant; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.ListIterator; @@ -166,7 +166,8 @@ class RebuildCommitGraph extends TextBuiltin { final CommitBuilder newc = new CommitBuilder(); newc.setTreeId(emptyTree); - newc.setAuthor(new PersonIdent(me, new Date(t.commitTime))); + newc.setAuthor(new PersonIdent(me, + Instant.ofEpochSecond(t.commitTime))); newc.setCommitter(newc.getAuthor()); newc.setParentIds(newParents); newc.setMessage("ORIGINAL " + t.oldId.name() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ -- cgit v1.2.3 From c17ebb09a43bdf9863bd9b2fdb28640cc559f420 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 21:43:06 +0100 Subject: Blame: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: Ib54d66848b920436c40f7f754193a4dee9566feb --- .../src/org/eclipse/jgit/pgm/Blame.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java index d2285ae64a..285fe2a96a 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Blame.java @@ -18,7 +18,7 @@ import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH; import java.io.IOException; import java.text.MessageFormat; -import java.text.SimpleDateFormat; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -91,7 +91,7 @@ class Blame extends TextBuiltin { private final Map abbreviatedCommits = new HashMap<>(); - private SimpleDateFormat dateFmt; + private DateTimeFormatter dateFmt; private int begin; @@ -125,9 +125,9 @@ class Blame extends TextBuiltin { } if (showRawTimestamp) { - dateFmt = new SimpleDateFormat("ZZZZ"); //$NON-NLS-1$ + dateFmt = DateTimeFormatter.ofPattern("ZZ"); //$NON-NLS-1$ } else { - dateFmt = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss ZZZZ"); //$NON-NLS-1$ + dateFmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss ZZ"); //$NON-NLS-1$ } try (ObjectReader reader = db.newObjectReader(); @@ -335,12 +335,14 @@ class Blame extends TextBuiltin { if (author == null) return ""; //$NON-NLS-1$ - dateFmt.setTimeZone(author.getTimeZone()); - if (!showRawTimestamp) - return dateFmt.format(author.getWhen()); + if (!showRawTimestamp) { + return dateFmt.withZone(author.getZoneId()) + .format(author.getWhenAsInstant()); + } return String.format("%d %s", //$NON-NLS-1$ - Long.valueOf(author.getWhen().getTime() / 1000L), - dateFmt.format(author.getWhen())); + Long.valueOf(author.getWhenAsInstant().getEpochSecond()), + dateFmt.withZone(author.getZoneId()) + .format(author.getWhenAsInstant())); } private String abbreviate(ObjectReader reader, RevCommit commit) -- cgit v1.2.3 From 5a56be277dac6328c9aec8ada60ab89c9750b1da Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 21:54:48 +0100 Subject: DescribeCommand: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: I46b1f12192fe40d3bb740c3ce8632fffcd5fc5de --- org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java index 805a886392..934245781f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java @@ -15,11 +15,11 @@ import static org.eclipse.jgit.lib.TypedConfigGetter.UNSET_INT; import java.io.IOException; import java.text.MessageFormat; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.Optional; @@ -274,10 +274,10 @@ public class DescribeCommand extends GitCommand { } } - private Date tagDate(Ref tag) throws IOException { + private Instant tagDate(Ref tag) throws IOException { RevTag t = w.parseTag(tag.getObjectId()); w.parseBody(t); - return t.getTaggerIdent().getWhen(); + return t.getTaggerIdent().getWhenAsInstant(); } }; -- cgit v1.2.3 From 8497c89192b80fd333b6227a7e222fbd4d1697e7 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 27 Dec 2024 16:45:38 -0800 Subject: DfsGarbageCollector: Use SystemReader.now() instead of getCurrentTime() getCurrentTime() is deprecated. Use now() that returns an Instant. Change-Id: I107af03342e6815d97181d6dccd94e2fae2d3b21 --- .../eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java index e6068a15ec..199481cf33 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java @@ -90,7 +90,7 @@ public class DfsGarbageCollector { private long coalesceGarbageLimit = 50 << 20; private long garbageTtlMillis = TimeUnit.DAYS.toMillis(1); - private long startTimeMillis; + private Instant startTime; private List packsBefore; private List reftablesBefore; private List expiredGarbagePacks; @@ -352,7 +352,7 @@ public class DfsGarbageCollector { throw new IllegalStateException( JGitText.get().supportOnlyPackIndexVersion2); - startTimeMillis = SystemReader.getInstance().getCurrentTime(); + startTime = SystemReader.getInstance().now(); ctx = objdb.newReader(); try { refdb.refresh(); @@ -435,7 +435,7 @@ public class DfsGarbageCollector { packsBefore = new ArrayList<>(packs.length); expiredGarbagePacks = new ArrayList<>(packs.length); - long now = SystemReader.getInstance().getCurrentTime(); + long now = SystemReader.getInstance().now().toEpochMilli(); for (DfsPackFile p : packs) { DfsPackDescription d = p.getPackDescription(); if (d.getPackSource() != UNREACHABLE_GARBAGE) { @@ -723,7 +723,7 @@ public class DfsGarbageCollector { PackStatistics stats = pw.getStatistics(); pack.setPackStats(stats); - pack.setLastModified(startTimeMillis); + pack.setLastModified(startTime.toEpochMilli()); newPackDesc.add(pack); newPackStats.add(stats); newPackObj.add(pw.getObjectSet()); -- cgit v1.2.3 From a45b3cce4517a9c95d8039826a04e51e6276c3d7 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 27 Dec 2024 17:02:36 -0800 Subject: TestRepository: Stop using deprecated methods in SystemReader Change-Id: I1d1f174f739137c24fb586cb2f6d054d4785d716 --- org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index e53dbf1bfc..2d00a850e5 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -159,8 +159,8 @@ public class TestRepository implements AutoCloseable { this.pool = rw; this.inserter = db.newObjectInserter(); this.mockSystemReader = reader; - long now = mockSystemReader.getCurrentTime(); - int tz = mockSystemReader.getTimezone(now); + Instant now = mockSystemReader.now(); + ZoneId tz = mockSystemReader.getTimeZoneAt(now); defaultAuthor = new PersonIdent(AUTHOR, AUTHOR_EMAIL, now, tz); defaultCommitter = new PersonIdent(COMMITTER, COMMITTER_EMAIL, now, tz); } -- cgit v1.2.3 From 57dbbfe98b7f80830fbfb49aa35335052d2c6f9f Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 27 Dec 2024 17:07:38 -0800 Subject: PackWriterBitmapPreparer: Use SystemReader.now() instead of deprecated method SystemReader.getCurrentTime() is deprecated. Change-Id: If4d683633a77eec9b4cc32daed00254fbaa3114b --- .../jgit/internal/storage/pack/PackWriterBitmapPreparer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java index dabc1f0c5f..bf87c4c9d6 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/pack/PackWriterBitmapPreparer.java @@ -14,6 +14,7 @@ import static org.eclipse.jgit.internal.storage.file.PackBitmapIndex.FLAG_REUSE; import static org.eclipse.jgit.revwalk.RevFlag.SEEN; import java.io.IOException; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -28,16 +29,16 @@ import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.revwalk.AddUnseenToBitmapFilter; import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl; +import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap; import org.eclipse.jgit.internal.storage.file.PackBitmapIndex; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexBuilder; import org.eclipse.jgit.internal.storage.file.PackBitmapIndexRemapper; -import org.eclipse.jgit.internal.storage.file.BitmapIndexImpl.CompressedBitmap; import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectReader; import org.eclipse.jgit.lib.ProgressMonitor; -import org.eclipse.jgit.lib.BitmapIndex.BitmapBuilder; import org.eclipse.jgit.revwalk.BitmapWalker; import org.eclipse.jgit.revwalk.ObjectWalk; import org.eclipse.jgit.revwalk.RevCommit; @@ -99,10 +100,10 @@ class PackWriterBitmapPreparer { this.excessiveBranchCount = config.getBitmapExcessiveBranchCount(); this.excessiveBranchTipCount = Math.max(excessiveBranchCount, config.getBitmapExcessiveBranchTipCount()); - long now = SystemReader.getInstance().getCurrentTime(); + Instant now = SystemReader.getInstance().now(); long ageInSeconds = (long) config.getBitmapInactiveBranchAgeInDays() * DAY_IN_SECONDS; - this.inactiveBranchTimestamp = (now / 1000) - ageInSeconds; + this.inactiveBranchTimestamp = now.getEpochSecond() - ageInSeconds; } /** -- cgit v1.2.3 From 300a53dd6f84a630c73754632de0b4a1651ff890 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 23:05:42 +0100 Subject: GarbageCollectCommand, GC: use java.time API We are moving away from the old java.util.Date API to the java.time API. Add GitTimeParser#parseInstant to support this. Change-Id: I3baeafeda5b65421dc94c1045b0ba576d4f79662 --- .../org/eclipse/jgit/api/GitConstructionTest.java | 3 +- .../tst/org/eclipse/jgit/api/PushCommandTest.java | 3 +- .../eclipse/jgit/api/GarbageCollectCommand.java | 28 +++++++- .../org/eclipse/jgit/internal/storage/file/GC.java | 78 ++++++++++++++++------ .../src/org/eclipse/jgit/util/GitTimeParser.java | 35 ++++++++++ 5 files changed, 122 insertions(+), 25 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/GitConstructionTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/GitConstructionTest.java index 76934343da..e847e72415 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/GitConstructionTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/GitConstructionTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.fail; import java.io.File; import java.io.IOException; +import java.time.Instant; import org.eclipse.jgit.api.ListBranchCommand.ListMode; import org.eclipse.jgit.api.errors.GitAPIException; @@ -100,7 +101,7 @@ public class GitConstructionTest extends RepositoryTestCase { GitAPIException { File workTree = db.getWorkTree(); Git git = Git.open(workTree); - git.gc().setExpire(null).call(); + git.gc().setExpire((Instant) null).call(); git.checkout().setName(git.getRepository().resolve("HEAD^").getName()) .call(); try { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java index 70e990dedf..d1696d62a8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PushCommandTest.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.PrintStream; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; +import java.time.Instant; import java.util.Properties; import org.eclipse.jgit.api.errors.DetachedHeadException; @@ -1146,7 +1147,7 @@ public class PushCommandTest extends RepositoryTestCase { RevCommit commit2 = git2.commit().setMessage("adding a").call(); // run a gc to ensure we have a bitmap index - Properties res = git1.gc().setExpire(null).call(); + Properties res = git1.gc().setExpire((Instant) null).call(); assertEquals(8, res.size()); // create another commit so we have something else to push diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java index 88d7e91860..f6935e1c67 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/GarbageCollectCommand.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.api; import java.io.IOException; import java.text.MessageFormat; import java.text.ParseException; +import java.time.Instant; import java.util.Date; import java.util.Properties; import java.util.concurrent.ExecutionException; @@ -59,7 +60,7 @@ public class GarbageCollectCommand extends GitCommand { private ProgressMonitor monitor; - private Date expire; + private Instant expire; private PackConfig pconfig; @@ -98,8 +99,29 @@ public class GarbageCollectCommand extends GitCommand { * @param expire * minimal age of objects to be pruned. * @return this instance + * @deprecated use {@link #setExpire(Instant)} instead */ + @Deprecated(since = "7.2") public GarbageCollectCommand setExpire(Date expire) { + if (expire != null) { + this.expire = expire.toInstant(); + } + return this; + } + + /** + * During gc() or prune() each unreferenced, loose object which has been + * created or modified after expire will not be pruned. Only + * older objects may be pruned. If set to null then every object is a + * candidate for pruning. Use {@link org.eclipse.jgit.util.GitTimeParser} to + * parse time formats used by git gc. + * + * @param expire + * minimal age of objects to be pruned. + * @return this instance + * @since 7.2 + */ + public GarbageCollectCommand setExpire(Instant expire) { this.expire = expire; return this; } @@ -108,8 +130,8 @@ public class GarbageCollectCommand extends GitCommand { * Whether to use aggressive mode or not. If set to true JGit behaves more * similar to native git's "git gc --aggressive". If set to * true compressed objects found in old packs are not reused - * but every object is compressed again. Configuration variables - * pack.window and pack.depth are set to 250 for this GC. + * but every object is compressed again. Configuration variables pack.window + * and pack.depth are set to 250 for this GC. * * @since 3.6 * @param aggressive diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 7f3369364b..09cf35a0cf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -102,9 +102,8 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS.LockToken; import org.eclipse.jgit.util.FileUtils; -import org.eclipse.jgit.util.GitDateParser; +import org.eclipse.jgit.util.GitTimeParser; import org.eclipse.jgit.util.StringUtils; -import org.eclipse.jgit.util.SystemReader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -160,11 +159,11 @@ public class GC { private long expireAgeMillis = -1; - private Date expire; + private Instant expire; private long packExpireAgeMillis = -1; - private Date packExpire; + private Instant packExpire; private Boolean packKeptObjects; @@ -698,16 +697,18 @@ public class GC { if (expire == null && expireAgeMillis == -1) { String pruneExpireStr = getPruneExpireStr(); - if (pruneExpireStr == null) + if (pruneExpireStr == null) { pruneExpireStr = PRUNE_EXPIRE_DEFAULT; - expire = GitDateParser.parse(pruneExpireStr, null, SystemReader - .getInstance().getLocale()); + } + expire = GitTimeParser.parseInstant(pruneExpireStr); expireAgeMillis = -1; } - if (expire != null) - expireDate = expire.getTime(); - if (expireAgeMillis != -1) + if (expire != null) { + expireDate = expire.toEpochMilli(); + } + if (expireAgeMillis != -1) { expireDate = System.currentTimeMillis() - expireAgeMillis; + } return expireDate; } @@ -724,16 +725,18 @@ public class GC { String prunePackExpireStr = repo.getConfig().getString( ConfigConstants.CONFIG_GC_SECTION, null, ConfigConstants.CONFIG_KEY_PRUNEPACKEXPIRE); - if (prunePackExpireStr == null) + if (prunePackExpireStr == null) { prunePackExpireStr = PRUNE_PACK_EXPIRE_DEFAULT; - packExpire = GitDateParser.parse(prunePackExpireStr, null, - SystemReader.getInstance().getLocale()); + } + packExpire = GitTimeParser.parseInstant(prunePackExpireStr); packExpireAgeMillis = -1; } - if (packExpire != null) - packExpireDate = packExpire.getTime(); - if (packExpireAgeMillis != -1) + if (packExpire != null) { + packExpireDate = packExpire.toEpochMilli(); + } + if (packExpireAgeMillis != -1) { packExpireDate = System.currentTimeMillis() - packExpireAgeMillis; + } return packExpireDate; } @@ -1655,12 +1658,31 @@ public class GC { * candidate for pruning. * * @param expire - * instant in time which defines object expiration - * objects with modification time before this instant are expired - * objects with modification time newer or equal to this instant - * are not expired + * instant in time which defines object expiration objects with + * modification time before this instant are expired objects with + * modification time newer or equal to this instant are not + * expired + * @deprecated use {@link #setExpire(Instant)} instead */ + @Deprecated(since = "7.2") public void setExpire(Date expire) { + this.expire = expire.toInstant(); + expireAgeMillis = -1; + } + + /** + * During gc() or prune() each unreferenced, loose object which has been + * created or modified after or at expire will not be pruned. + * Only older objects may be pruned. If set to null then every object is a + * candidate for pruning. + * + * @param expire + * instant in time which defines object expiration objects with + * modification time before this instant are expired objects with + * modification time newer or equal to this instant are not + * expired + */ + public void setExpire(Instant expire) { this.expire = expire; expireAgeMillis = -1; } @@ -1673,8 +1695,24 @@ public class GC { * * @param packExpire * instant in time which defines packfile expiration + * @deprecated use {@link #setPackExpire(Instant)} instead */ + @Deprecated(since = "7.2") public void setPackExpire(Date packExpire) { + this.packExpire = packExpire.toInstant(); + packExpireAgeMillis = -1; + } + + /** + * During gc() or prune() packfiles which are created or modified after or + * at packExpire will not be deleted. Only older packfiles may + * be deleted. If set to null then every packfile is a candidate for + * deletion. + * + * @param packExpire + * instant in time which defines packfile expiration + */ + public void setPackExpire(Instant packExpire) { this.packExpire = packExpire; packExpireAgeMillis = -1; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java index 7d00fcd5ed..acaa1ce563 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/GitTimeParser.java @@ -11,6 +11,7 @@ package org.eclipse.jgit.util; import java.text.MessageFormat; import java.text.ParseException; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -97,6 +98,40 @@ public class GitTimeParser { return parse(dateStr, SystemReader.getInstance().civilNow()); } + /** + * Parses a string into a {@link java.time.Instant} using the default + * locale. Since this parser also supports relative formats (e.g. + * "yesterday") the caller can specify the reference date. These types of + * strings can be parsed: + *
    + *
  • "never"
    • + *
  • "now"
    • + *
  • "yesterday"
    • + *
  • "(x) years|months|weeks|days|hours|minutes|seconds ago"
    + * Multiple specs can be combined like in "2 weeks 3 days ago". Instead of ' + * ' one can use '.' to separate the words
    • + *
  • "yyyy-MM-dd HH:mm:ss Z" (ISO)
    • + *
  • "EEE, dd MMM yyyy HH:mm:ss Z" (RFC)
    • + *
  • "yyyy-MM-dd"
    • + *
  • "yyyy.MM.dd"
    • + *
  • "MM/dd/yyyy",
    • + *
  • "dd.MM.yyyy"
    • + *
  • "EEE MMM dd HH:mm:ss yyyy Z" (DEFAULT)
    • + *
  • "EEE MMM dd HH:mm:ss yyyy" (LOCAL)
    • + *
+ * + * @param dateStr + * the string to be parsed + * @return the parsed {@link java.time.Instant} + * @throws java.text.ParseException + * if the given dateStr was not recognized + * @since 7.2 + */ + public static Instant parseInstant(String dateStr) throws ParseException { + return parse(dateStr).atZone(SystemReader.getInstance().getTimeZoneId()) + .toInstant(); + } + // Only tests seem to use this method static LocalDateTime parse(String dateStr, LocalDateTime now) throws ParseException { -- cgit v1.2.3 From 7ad712ae71e481c34cd551f4c2a64e190738566f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 23:16:16 +0100 Subject: TestRepositoryTest: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: Iffcb6ff709cbc101e0700520b8312328ff70b2eb --- .../tst/org/eclipse/jgit/junit/TestRepositoryTest.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java index 924703464b..1581d49797 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/junit/TestRepositoryTest.java @@ -11,6 +11,7 @@ package org.eclipse.jgit.junit; import static java.nio.charset.StandardCharsets.UTF_8; +import static java.time.Instant.EPOCH; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; @@ -18,7 +19,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import java.util.Date; import java.util.regex.Pattern; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; @@ -199,8 +199,8 @@ public class TestRepositoryTest { assertEquals(orig.getAuthorIdent(), amended.getAuthorIdent()); // Committer name/email is the same, but time was incremented. - assertEquals(new PersonIdent(orig.getCommitterIdent(), new Date(0)), - new PersonIdent(amended.getCommitterIdent(), new Date(0))); + assertEquals(new PersonIdent(orig.getCommitterIdent(), EPOCH), + new PersonIdent(amended.getCommitterIdent(), EPOCH)); assertTrue(orig.getCommitTime() < amended.getCommitTime()); assertEquals("foo contents", blobAsString(amended, "foo")); @@ -294,8 +294,8 @@ public class TestRepositoryTest { assertEquals(toPick.getAuthorIdent(), result.getAuthorIdent()); // Committer name/email matches default, and time was incremented. - assertEquals(new PersonIdent(head.getCommitterIdent(), new Date(0)), - new PersonIdent(result.getCommitterIdent(), new Date(0))); + assertEquals(new PersonIdent(head.getCommitterIdent(), EPOCH), + new PersonIdent(result.getCommitterIdent(), EPOCH)); assertTrue(toPick.getCommitTime() < result.getCommitTime()); assertEquals("message to cherry-pick", result.getFullMessage()); -- cgit v1.2.3 From ba80e7d2220669a09988f76f2b8ab5fc23dceb62 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 25 Dec 2024 23:21:15 +0100 Subject: GC tests: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: Ie645d7bf4e958f6602ec106e8c2296d675f62904 --- .../org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java | 4 ++-- .../jgit/internal/storage/file/GcPruneNonReferencedTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java index 6cad8b6c62..434f7e4bef 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcBasicPackingTest.java @@ -16,9 +16,9 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; +import java.time.Instant; import java.util.ArrayList; import java.util.Collection; -import java.util.Date; import java.util.List; import org.eclipse.jgit.junit.TestRepository.BranchBuilder; @@ -206,7 +206,7 @@ public class GcBasicPackingTest extends GcTestCase { // The old packfile is too young to be deleted. We should end up with // two pack files - gc.setExpire(new Date(oldPackfile.lastModified() - 1)); + gc.setExpire(Instant.ofEpochMilli(oldPackfile.lastModified() - 1)); gc.gc().get(); stats = gc.getStatistics(); assertEquals(0, stats.numberOfLooseObjects); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java index ca0f6842fc..84ec132e24 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcPruneNonReferencedTest.java @@ -16,8 +16,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; +import java.time.Instant; import java.util.Collections; -import java.util.Date; import org.eclipse.jgit.junit.TestRepository.BranchBuilder; import org.eclipse.jgit.lib.ObjectId; @@ -30,7 +30,7 @@ public class GcPruneNonReferencedTest extends GcTestCase { @Test public void nonReferencedNonExpiredObject_notPruned() throws Exception { RevBlob a = tr.blob("a"); - gc.setExpire(new Date(lastModified(a))); + gc.setExpire(Instant.ofEpochMilli(lastModified(a))); gc.prune(Collections. emptySet()); assertTrue(repo.getObjectDatabase().has(a)); } @@ -58,7 +58,7 @@ public class GcPruneNonReferencedTest extends GcTestCase { @Test public void nonReferencedObjects_onlyExpiredPruned() throws Exception { RevBlob a = tr.blob("a"); - gc.setExpire(new Date(lastModified(a) + 1)); + gc.setExpire(Instant.ofEpochMilli(lastModified(a) + 1)); fsTick(); RevBlob b = tr.blob("b"); -- cgit v1.2.3 From 9df4831f8eff4cc04311a958d2aa0cb1fdbc9ac1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 26 Dec 2024 00:01:31 +0100 Subject: TransportHttpTest: use java.time API We are moving away from the old java.util.Date API to the java.time API. Change-Id: I6d2ff9d0dfb81ca8385f8776e3fa73e090247b79 --- .../tst/org/eclipse/jgit/transport/TransportHttpTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportHttpTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportHttpTest.java index 029b45e1e6..96d3a5835a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportHttpTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/TransportHttpTest.java @@ -14,10 +14,10 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.io.File; import java.io.IOException; import java.net.HttpCookie; +import java.time.Duration; import java.time.Instant; import java.util.Arrays; import java.util.Collections; -import java.util.Date; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -101,7 +101,7 @@ public class TransportHttpTest extends SampleDataRepositoryTestCase { .singletonList("cookie2=some value; Max-Age=1234; Path=/")); try (TransportHttp transportHttp = new TransportHttp(db, uri)) { - Date creationDate = new Date(); + Instant creationDate = Instant.now(); transportHttp.processResponseCookies(connection); // evaluate written cookie file @@ -112,8 +112,9 @@ public class TransportHttpTest extends SampleDataRepositoryTestCase { cookie.setPath("/u/2/"); cookie.setMaxAge( - (Instant.parse("2100-01-01T11:00:00.000Z").toEpochMilli() - - creationDate.getTime()) / 1000); + Duration.between(creationDate, + Instant.parse("2100-01-01T11:00:00.000Z")) + .getSeconds()); cookie.setSecure(true); cookie.setHttpOnly(true); expectedCookies.add(cookie); -- cgit v1.2.3 From c990b7921eb0574f2defe7ea0991af16687c4f19 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:14:48 +0100 Subject: DfsGarbageCollectorTest: replace deprecated PersonIdent constructor We are moving away from java.util.Date to java.time APIs. Change-Id: Ifad3fce57f4a742289a5a687a7cf8776fff6bf1c --- .../storage/dfs/DfsGarbageCollectorTest.java | 42 ++++++++++------------ 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java index f9fbfe8db0..00a3760e21 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollectorTest.java @@ -17,10 +17,9 @@ import static org.junit.Assert.fail; import java.io.IOException; import java.time.Instant; +import java.time.ZoneOffset; import java.util.Arrays; import java.util.Collections; -import java.util.Date; -import java.util.GregorianCalendar; import java.util.concurrent.TimeUnit; import org.eclipse.jgit.internal.storage.commitgraph.CommitGraph; @@ -50,7 +49,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.storage.pack.PackConfig; import org.eclipse.jgit.transport.ReceiveCommand; -import org.eclipse.jgit.util.GitDateParser; +import org.eclipse.jgit.util.GitTimeParser; import org.eclipse.jgit.util.SystemReader; import org.junit.After; import org.junit.Before; @@ -1294,23 +1293,22 @@ public class DfsGarbageCollectorTest { DfsPackDescription t1 = odb.newPack(INSERT); Ref next = new ObjectIdRef.PeeledNonTag(Ref.Storage.LOOSE, "refs/heads/next", commit0.copy()); - long currentDay = new Date().getTime(); - GregorianCalendar cal = new GregorianCalendar(SystemReader - .getInstance().getTimeZone(), SystemReader.getInstance() - .getLocale()); - long ten_days_ago = GitDateParser.parse("10 days ago",cal,SystemReader.getInstance() - .getLocale()).getTime() ; - long twenty_days_ago = GitDateParser.parse("20 days ago",cal,SystemReader.getInstance() - .getLocale()).getTime() ; - long thirty_days_ago = GitDateParser.parse("30 days ago",cal,SystemReader.getInstance() - .getLocale()).getTime() ;; - long fifty_days_ago = GitDateParser.parse("50 days ago",cal,SystemReader.getInstance() - .getLocale()).getTime() ; - PersonIdent who2 = new PersonIdent("J.Author", "authemail", currentDay, -8 * 60); - PersonIdent who3 = new PersonIdent("J.Author", "authemail", ten_days_ago, -8 * 60); - PersonIdent who4 = new PersonIdent("J.Author", "authemail", twenty_days_ago, -8 * 60); - PersonIdent who5 = new PersonIdent("J.Author", "authemail", thirty_days_ago, -8 * 60); - PersonIdent who6 = new PersonIdent("J.Author", "authemail", fifty_days_ago, -8 * 60); + Instant currentDay = Instant.now(); + Instant ten_days_ago = GitTimeParser.parseInstant("10 days ago"); + Instant twenty_days_ago = GitTimeParser.parseInstant("20 days ago"); + Instant thirty_days_ago = GitTimeParser.parseInstant("30 days ago"); + Instant fifty_days_ago = GitTimeParser.parseInstant("50 days ago"); + final ZoneOffset offset = ZoneOffset.ofHours(-8); + PersonIdent who2 = new PersonIdent("J.Author", "authemail", currentDay, + offset); + PersonIdent who3 = new PersonIdent("J.Author", "authemail", + ten_days_ago, offset); + PersonIdent who4 = new PersonIdent("J.Author", "authemail", + twenty_days_ago, offset); + PersonIdent who5 = new PersonIdent("J.Author", "authemail", + thirty_days_ago, offset); + PersonIdent who6 = new PersonIdent("J.Author", "authemail", + fifty_days_ago, offset); try (DfsOutputStream out = odb.writeFile(t1, REFTABLE)) { ReftableWriter w = new ReftableWriter(out); @@ -1332,7 +1330,7 @@ public class DfsGarbageCollectorTest { gc = new DfsGarbageCollector(repo); gc.setReftableConfig(new ReftableConfig()); // Expire ref log entries older than 30 days - gc.setRefLogExpire(Instant.ofEpochMilli(thirty_days_ago)); + gc.setRefLogExpire(thirty_days_ago); run(gc); // Single GC pack present with all objects. @@ -1360,9 +1358,7 @@ public class DfsGarbageCollectorTest { assertEquals(lc.getRefName(),"refs/heads/branch2"); // Old entries are purged assertFalse(lc.next()); - } - } -- cgit v1.2.3 From 1b39ee910b8c8f36916468204d126664366e915d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:19:00 +0100 Subject: GcLog: replace deprecated GitDateParser with GitTimeParser We are moving from java.util.Date to java.time APIs. Change-Id: I6f99d52c2e5bd4734ac1fe5378eed29b398e8c25 --- .../src/org/eclipse/jgit/internal/storage/file/GcLog.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java index 8647b3e664..862aaab0ee 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GcLog.java @@ -23,8 +23,7 @@ import java.time.Instant; import org.eclipse.jgit.api.errors.JGitInternalException; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.util.FileUtils; -import org.eclipse.jgit.util.GitDateParser; -import org.eclipse.jgit.util.SystemReader; +import org.eclipse.jgit.util.GitTimeParser; /** * This class manages the gc.log file for a {@link FileRepository}. @@ -62,8 +61,7 @@ class GcLog { if (logExpiryStr == null) { logExpiryStr = LOG_EXPIRY_DEFAULT; } - gcLogExpire = GitDateParser.parse(logExpiryStr, null, - SystemReader.getInstance().getLocale()).toInstant(); + gcLogExpire = GitTimeParser.parseInstant(logExpiryStr); } return gcLogExpire; } -- cgit v1.2.3 From 4172b4980ead79fc222f01658c7e04a4bd9b8d7b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:22:47 +0100 Subject: GarbageCollectCommandTest: replace deprecated GitDateParser Change-Id: Ide7f67345fa9a63da16562eed76ca5b2a88b8f8a --- .../org/eclipse/jgit/api/GarbageCollectCommandTest.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/GarbageCollectCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/GarbageCollectCommandTest.java index f98db3497b..6090d5efbe 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/GarbageCollectCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/GarbageCollectCommandTest.java @@ -11,12 +11,11 @@ package org.eclipse.jgit.api; import static org.junit.Assert.assertTrue; -import java.util.Date; +import java.time.Instant; import java.util.Properties; import org.eclipse.jgit.junit.RepositoryTestCase; -import org.eclipse.jgit.util.GitDateParser; -import org.eclipse.jgit.util.SystemReader; +import org.eclipse.jgit.util.GitTimeParser; import org.junit.Before; import org.junit.Test; @@ -36,9 +35,8 @@ public class GarbageCollectCommandTest extends RepositoryTestCase { @Test public void testGConeCommit() throws Exception { - Date expire = GitDateParser.parse("now", null, SystemReader - .getInstance().getLocale()); - Properties res = git.gc().setExpire(expire).call(); + Instant expireNow = GitTimeParser.parseInstant("now"); + Properties res = git.gc().setExpire(expireNow).call(); assertTrue(res.size() == 8); } @@ -52,11 +50,8 @@ public class GarbageCollectCommandTest extends RepositoryTestCase { writeTrashFile("b.txt", "a couple of words for gc to pack more 2"); writeTrashFile("c.txt", "a couple of words for gc to pack more 3"); git.commit().setAll(true).setMessage("commit3").call(); - Properties res = git - .gc() - .setExpire( - GitDateParser.parse("now", null, SystemReader - .getInstance().getLocale())).call(); + Instant expireNow = GitTimeParser.parseInstant("now"); + Properties res = git.gc().setExpire(expireNow).call(); assertTrue(res.size() == 8); } } -- cgit v1.2.3 From 0e70ee5befd80990dda96e8ced17d4d1825e1085 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:26:22 +0100 Subject: RevCommit: replace deprecated RawParseUtils#headerEnd Change-Id: I4e61af621b63b0715596b5a8c7d8eb985d64ce26 --- org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java index 55ddebf288..871545fca2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevCommit.java @@ -401,13 +401,13 @@ public class RevCommit extends RevObject { * @since 5.1 */ public final byte[] getRawGpgSignature() { - final byte[] raw = buffer; - final byte[] header = { 'g', 'p', 'g', 's', 'i', 'g' }; - final int start = RawParseUtils.headerStart(header, raw, 0); + byte[] raw = buffer; + byte[] header = { 'g', 'p', 'g', 's', 'i', 'g' }; + int start = RawParseUtils.headerStart(header, raw, 0); if (start < 0) { return null; } - final int end = RawParseUtils.headerEnd(raw, start); + int end = RawParseUtils.nextLfSkippingSplitLines(raw, start); return RawParseUtils.headerValue(raw, start, end); } -- cgit v1.2.3 From 873648956f83931c23330d0814224410c3bdd225 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:29:32 +0100 Subject: WindowCache: fix "empty control-flow statement" warning Change-Id: I61259fc76454b473aee92dc96180219e5f4a4084 --- .../src/org/eclipse/jgit/internal/storage/file/WindowCache.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java index fd80faf4ed..15c125c684 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/WindowCache.java @@ -790,7 +790,9 @@ public class WindowCache { } numRemovers++; } - for (int numRemoved = 0; removeNextBlock(numRemoved); numRemoved++); + for (int numRemoved = 0; removeNextBlock(numRemoved); numRemoved++) { + // empty + } synchronized (this) { if (numRemovers > 0) { numRemovers--; -- cgit v1.2.3 From 0688bdc5c5621e1f06a8a8c24772cfd8cf08b3b3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:37:31 +0100 Subject: Replace use of deprecated constructor AttributesHandler(TreeWalk) Change-Id: Ie0b39e0c41bf2827af5f6282ea33ebd21afd47f6 --- .../jgit/attributes/AttributesNodeDirCacheIteratorTest.java | 9 +++++---- .../tst/org/eclipse/jgit/attributes/AttributesNodeTest.java | 6 ++++-- .../jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java | 8 +++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeDirCacheIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeDirCacheIteratorTest.java index f23469eda0..35b953320e 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeDirCacheIteratorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeDirCacheIteratorTest.java @@ -26,6 +26,7 @@ import org.eclipse.jgit.attributes.Attribute.State; import org.eclipse.jgit.dircache.DirCacheIterator; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.treewalk.CanonicalTreeParser; import org.eclipse.jgit.treewalk.TreeWalk; import org.junit.Before; import org.junit.Test; @@ -230,10 +231,10 @@ public class AttributesNodeDirCacheIteratorTest extends RepositoryTestCase { else { Attributes entryAttributes = new Attributes(); - new AttributesHandler(walk).mergeAttributes(attributesNode, - pathName, - false, - entryAttributes); + new AttributesHandler(walk, + () -> walk.getTree(CanonicalTreeParser.class)) + .mergeAttributes(attributesNode, pathName, false, + entryAttributes); if (nodeAttrs != null && !nodeAttrs.isEmpty()) { for (Attribute attribute : nodeAttrs) { diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeTest.java index 1fcfbaf0fa..dbbcb75da9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeTest.java @@ -20,6 +20,7 @@ import java.io.InputStream; import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription; import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository; +import org.eclipse.jgit.treewalk.CanonicalTreeParser; import org.eclipse.jgit.treewalk.TreeWalk; import org.junit.After; import org.junit.Test; @@ -156,8 +157,9 @@ public class AttributesNodeTest { private void assertAttribute(String path, AttributesNode node, Attributes attrs) throws IOException { Attributes attributes = new Attributes(); - new AttributesHandler(DUMMY_WALK).mergeAttributes(node, path, false, - attributes); + new AttributesHandler(DUMMY_WALK, + () -> DUMMY_WALK.getTree(CanonicalTreeParser.class)) + .mergeAttributes(node, path, false, attributes); assertEquals(attrs, attributes); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java index 7b573e122e..c6c91386a2 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/attributes/AttributesNodeWorkingTreeIteratorTest.java @@ -26,6 +26,7 @@ import org.eclipse.jgit.attributes.Attribute.State; import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.treewalk.CanonicalTreeParser; import org.eclipse.jgit.treewalk.FileTreeIterator; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.WorkingTreeIterator; @@ -194,9 +195,10 @@ public class AttributesNodeWorkingTreeIteratorTest extends RepositoryTestCase { else { Attributes entryAttributes = new Attributes(); - new AttributesHandler(walk).mergeAttributes(attributesNode, - pathName, false, - entryAttributes); + new AttributesHandler(walk, + () -> walk.getTree(CanonicalTreeParser.class)) + .mergeAttributes(attributesNode, pathName, false, + entryAttributes); if (nodeAttrs != null && !nodeAttrs.isEmpty()) { for (Attribute attribute : nodeAttrs) { -- cgit v1.2.3 From 085b24aaf416308634388038ab186d22cc51a806 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:39:25 +0100 Subject: SignatureUtils: replace deprecated PersonIdent constructor Change-Id: Ibf38c44d6893a1ce3baf83f8f0dbc06d1c8405ad --- org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java index 820ac2db91..e3e3e04fd9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/SignatureUtils.java @@ -48,7 +48,7 @@ public final class SignatureUtils { if (verification.creationDate() != null) { // Use the creator's timezone for the signature date PersonIdent dateId = new PersonIdent(creator, - verification.creationDate()); + verification.creationDate().toInstant()); result.append( MessageFormat.format(JGitText.get().verifySignatureMade, formatter.formatDate(dateId))); -- cgit v1.2.3 From 09f98fd56731250ea17b99a6511c046eaff1b81a Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:46:48 +0100 Subject: ChangeIdUtilTest: use java.time instead of java.util.Date API Change-Id: Ideb32d24c78aa8f42546d9098991257ab6f205c4 --- .../tst/org/eclipse/jgit/util/ChangeIdUtilTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java index 32652494d2..e7f2049bb9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java @@ -12,7 +12,9 @@ package org.eclipse.jgit.util; import static org.junit.Assert.assertEquals; -import java.util.concurrent.TimeUnit; +import java.time.Duration; +import java.time.Instant; +import java.time.ZoneId; import org.eclipse.jgit.junit.MockSystemReader; import org.eclipse.jgit.lib.ObjectId; @@ -53,9 +55,9 @@ public class ChangeIdUtilTest { MockSystemReader mockSystemReader = new MockSystemReader(); - final long when = mockSystemReader.getCurrentTime(); + Instant when = mockSystemReader.now(); - final int tz = new MockSystemReader().getTimezone(when); + ZoneId tz = new MockSystemReader().getTimeZoneAt(when); PersonIdent author = new PersonIdent("J. Author", "ja@example.com"); { @@ -342,9 +344,7 @@ public class ChangeIdUtilTest { /** Increment the {@link #author} and {@link #committer} times. */ protected void tick() { - final long delta = TimeUnit.MILLISECONDS.convert(5 * 60, - TimeUnit.SECONDS); - final long now = author.getWhen().getTime() + delta; + Instant now = author.getWhenAsInstant().plus(Duration.ofMinutes(5)); author = new PersonIdent(author, now, tz); committer = new PersonIdent(committer, now, tz); -- cgit v1.2.3 From d9531eb398e384ec59204f1b57b0ab81d8ae9048 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sat, 28 Dec 2024 23:57:42 +0100 Subject: ReflogConfigTest: use java.time instead of java.util.Date API Change-Id: I00c63c928ad64a447ad101e01508d917de26bd71 --- .../tst/org/eclipse/jgit/lib/ReflogConfigTest.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java index 854180e3ea..ad47cef0f4 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java @@ -16,6 +16,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.io.IOException; +import java.time.Duration; +import java.time.Instant; +import java.time.ZoneOffset; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.storage.file.FileBasedConfig; @@ -24,21 +27,21 @@ import org.junit.Test; public class ReflogConfigTest extends RepositoryTestCase { @Test public void testlogAllRefUpdates() throws Exception { - long commitTime = 1154236443000L; - int tz = -4 * 60; + Instant commitTime = Instant.ofEpochSecond(1154236443L); + ZoneOffset tz = ZoneOffset.ofHours(-4); // check that there are no entries in the reflog and turn off writing // reflogs assertTrue(db.getReflogReader(Constants.HEAD).getReverseEntries() .isEmpty()); - final FileBasedConfig cfg = db.getConfig(); + FileBasedConfig cfg = db.getConfig(); cfg.setBoolean("core", null, "logallrefupdates", false); cfg.save(); // do one commit and check that reflog size is 0: no reflogs should be // written commit("A Commit\n", commitTime, tz); - commitTime += 60 * 1000; + commitTime = commitTime.plus(Duration.ofMinutes(1)); assertTrue("Reflog for HEAD still contain no entry", db .getReflogReader(Constants.HEAD).getReverseEntries().isEmpty()); @@ -52,7 +55,7 @@ public class ReflogConfigTest extends RepositoryTestCase { // do one commit and check that reflog size is increased to 1 commit("A Commit\n", commitTime, tz); - commitTime += 60 * 1000; + commitTime = commitTime.plus(Duration.ofMinutes(1)); assertTrue( "Reflog for HEAD should contain one entry", db.getReflogReader(Constants.HEAD).getReverseEntries().size() == 1); @@ -67,7 +70,7 @@ public class ReflogConfigTest extends RepositoryTestCase { // do one commit and check that reflog size is 2 commit("A Commit\n", commitTime, tz); - commitTime += 60 * 1000; + commitTime = commitTime.plus(Duration.ofMinutes(1)); assertTrue( "Reflog for HEAD should contain two entries", db.getReflogReader(Constants.HEAD).getReverseEntries().size() == 2); @@ -88,9 +91,9 @@ public class ReflogConfigTest extends RepositoryTestCase { .size() == 3); } - private void commit(String commitMsg, long commitTime, int tz) + private void commit(String commitMsg, Instant commitTime, ZoneOffset tz) throws IOException { - final CommitBuilder commit = new CommitBuilder(); + CommitBuilder commit = new CommitBuilder(); commit.setAuthor(new PersonIdent(author, commitTime, tz)); commit.setCommitter(new PersonIdent(committer, commitTime, tz)); commit.setMessage(commitMsg); -- cgit v1.2.3 From 7c37899eaefbe43d1ac8eeb40f27cec39f567c31 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 00:09:34 +0100 Subject: BlockReader: use java.time instead of java.util.Date API Change-Id: Iea1147f89fb14821b7d052d4e9c3397033dfade4 --- .../org/eclipse/jgit/internal/storage/reftable/BlockReader.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java index d07713db8e..e9ff02700d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/BlockReader.java @@ -32,6 +32,8 @@ import static org.eclipse.jgit.lib.Ref.Storage.PACKED; import java.io.IOException; import java.nio.ByteBuffer; +import java.time.Instant; +import java.time.ZoneOffset; import java.util.Arrays; import java.util.zip.DataFormatException; import java.util.zip.Inflater; @@ -245,9 +247,9 @@ class BlockReader { private PersonIdent readPersonIdent() { String name = readValueString(); String email = readValueString(); - long ms = readVarint64() * 1000; - int tz = readInt16(); - return new PersonIdent(name, email, ms, tz); + long epochSeconds = readVarint64(); + ZoneOffset tz = ZoneOffset.ofTotalSeconds(readInt16() * 60); + return new PersonIdent(name, email, Instant.ofEpochSecond(epochSeconds), tz); } void readBlock(BlockSource src, long pos, int fileBlockSize) -- cgit v1.2.3 From 5c06d773158c54885c1262bd72f5e026082425b8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 00:12:47 +0100 Subject: CherryPickTest: replace deprecated PersonIdent constructor Change-Id: Id0e61babb768d29d6317cc216eeaa5054e5fc869 --- .../tst/org/eclipse/jgit/merge/CherryPickTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CherryPickTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CherryPickTest.java index ae811f830f..8865ba9ebd 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CherryPickTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/CherryPickTest.java @@ -15,6 +15,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.time.Instant; +import java.time.ZoneOffset; + import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheBuilder; import org.eclipse.jgit.junit.RepositoryTestCase; @@ -162,7 +165,8 @@ public class CherryPickTest extends RepositoryTestCase { final ObjectId[] parentIds) throws Exception { final CommitBuilder c = new CommitBuilder(); c.setTreeId(treeB.writeTree(odi)); - c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0)); + c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", + Instant.ofEpochSecond(1), ZoneOffset.UTC)); c.setCommitter(c.getAuthor()); c.setParentIds(parentIds); c.setMessage("Tree " + c.getTreeId().name()); -- cgit v1.2.3 From 0170e658ddba23bc67d81b37d47edcafb6a35246 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 00:14:27 +0100 Subject: GitLinkMergeTest: replace deprecated PersonIdent constructor Change-Id: I9a3f558ff578266a34f45ebf3026c7a093dd6f3c --- .../tst/org/eclipse/jgit/merge/GitlinkMergeTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java index f410960bec..b1998f30f8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/GitlinkMergeTest.java @@ -15,6 +15,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.IOException; +import java.time.Instant; +import java.time.ZoneOffset; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.dircache.DirCache; @@ -357,7 +359,8 @@ public class GitlinkMergeTest extends SampleDataRepositoryTestCase { ObjectId[] parentIds) throws Exception { CommitBuilder c = new CommitBuilder(); c.setTreeId(treeB.writeTree(odi)); - c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0)); + c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", + Instant.ofEpochSecond(1), ZoneOffset.UTC)); c.setCommitter(c.getAuthor()); c.setParentIds(parentIds); c.setMessage("Tree " + c.getTreeId().name()); -- cgit v1.2.3 From f8ee2ba845fcb5ae5dd6b462c182e49ddea34945 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 00:20:50 +0100 Subject: RebaseCommand: use java.time instead of java.util.Date API Change-Id: I3004d5b586b674e81cc76d0b01cef424d0b1f7f8 --- .../src/org/eclipse/jgit/api/RebaseCommand.java | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java index 858bd961cd..3ae7a6c81e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java @@ -18,6 +18,8 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.text.MessageFormat; +import java.time.Instant; +import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -1835,23 +1837,26 @@ public class RebaseCommand extends GitCommand { // the time is saved as int timeStart = 0; - if (time.startsWith("@")) //$NON-NLS-1$ + if (time.startsWith("@")) { //$NON-NLS-1$ timeStart = 1; - else + } else { timeStart = 0; - long when = Long - .parseLong(time.substring(timeStart, time.indexOf(' '))) * 1000; + } + Instant when = Instant.ofEpochSecond( + Long.parseLong(time.substring(timeStart, time.indexOf(' ')))); String tzOffsetString = time.substring(time.indexOf(' ') + 1); int multiplier = -1; - if (tzOffsetString.charAt(0) == '+') + if (tzOffsetString.charAt(0) == '+') { multiplier = 1; + } int hours = Integer.parseInt(tzOffsetString.substring(1, 3)); int minutes = Integer.parseInt(tzOffsetString.substring(3, 5)); // this is in format (+/-)HHMM (hours and minutes) - // we need to convert into minutes - int tz = (hours * 60 + minutes) * multiplier; - if (name != null && email != null) + ZoneOffset tz = ZoneOffset.ofHoursMinutes(hours * multiplier, + minutes * multiplier); + if (name != null && email != null) { return new PersonIdent(name, email, when, tz); + } return null; } -- cgit v1.2.3 From 5439648f1c0109e9841a45e9885a41f8c6d6b117 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 00:37:58 +0100 Subject: RebaseCommandTest: replace deprecated PersonIdent constructor Change-Id: Ib5e367c88662defc0471a0487a576bb4b750b778 --- .../tst/org/eclipse/jgit/api/RebaseCommandTest.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java index 02e3a2e06f..84aa4b58a8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java @@ -24,6 +24,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.InputStreamReader; +import java.time.Instant; +import java.time.ZoneOffset; import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -1603,7 +1605,7 @@ public class RebaseCommandTest extends RepositoryTestCase { public void testAuthorScriptConverter() throws Exception { // -1 h timezone offset PersonIdent ident = new PersonIdent("Author name", "a.mail@some.com", - 123456789123L, -60); + Instant.ofEpochMilli(123456789123L), ZoneOffset.ofHours(-1)); String convertedAuthor = git.rebase().toAuthorScript(ident); String[] lines = convertedAuthor.split("\n"); assertEquals("GIT_AUTHOR_NAME='Author name'", lines[0]); @@ -1615,12 +1617,14 @@ public class RebaseCommandTest extends RepositoryTestCase { assertEquals(ident.getName(), parsedIdent.getName()); assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress()); // this is rounded to the last second - assertEquals(123456789000L, parsedIdent.getWhen().getTime()); - assertEquals(ident.getTimeZoneOffset(), parsedIdent.getTimeZoneOffset()); + assertEquals(123456789000L, + parsedIdent.getWhenAsInstant().toEpochMilli()); + assertEquals(ident.getZoneId(), parsedIdent.getZoneId()); // + 9.5h timezone offset ident = new PersonIdent("Author name", "a.mail@some.com", - 123456789123L, +570); + Instant.ofEpochMilli(123456789123L), + ZoneOffset.ofHoursMinutes(9, 30)); convertedAuthor = git.rebase().toAuthorScript(ident); lines = convertedAuthor.split("\n"); assertEquals("GIT_AUTHOR_NAME='Author name'", lines[0]); @@ -1631,8 +1635,9 @@ public class RebaseCommandTest extends RepositoryTestCase { convertedAuthor.getBytes(UTF_8)); assertEquals(ident.getName(), parsedIdent.getName()); assertEquals(ident.getEmailAddress(), parsedIdent.getEmailAddress()); - assertEquals(123456789000L, parsedIdent.getWhen().getTime()); - assertEquals(ident.getTimeZoneOffset(), parsedIdent.getTimeZoneOffset()); + assertEquals(123456789000L, + parsedIdent.getWhenAsInstant().toEpochMilli()); + assertEquals(ident.getZoneId(), parsedIdent.getZoneId()); } @Test -- cgit v1.2.3 From 9e8e1fce3610ee38de4e7fbfce06357e4aac7c02 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 00:40:03 +0100 Subject: ReflogWriterTest: replace deprecated PersonIdent constructor Change-Id: I8e1b82c76403493faa00ec1a30a6d57a695d8573 --- .../tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java index 8e9b7b84bd..a8363336d9 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogWriterTest.java @@ -16,6 +16,8 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; +import java.time.Instant; +import java.time.ZoneOffset; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; @@ -32,7 +34,7 @@ public class ReflogWriterTest extends SampleDataRepositoryTestCase { ReflogWriter writer = new ReflogWriter((RefDirectory) db.getRefDatabase()); PersonIdent ident = new PersonIdent("John Doe", "john@doe.com", - 1243028200000L, 120); + Instant.ofEpochMilli(1243028200000L), ZoneOffset.ofHours(2)); ObjectId oldId = ObjectId .fromString("da85355dfc525c9f6f3927b876f379f46ccf826e"); ObjectId newId = ObjectId -- cgit v1.2.3 From 9e869d9a923997d2aa05b48f5a45f67bebbb7d45 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 00:56:39 +0100 Subject: ReftableTest: replace deprecated PersonIdent constructor Change-Id: I63c37a0fb0f6070aba3947903e79d8ebc014f52d --- .../internal/storage/reftable/ReftableTest.java | 38 +++++++++++++++------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java index ea0d92acfd..a54002bc74 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java @@ -29,6 +29,8 @@ import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.time.Instant; +import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -175,7 +177,8 @@ public class ReftableTest { @Test public void hasObjLogs() throws IOException { - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); String msg = "test"; ReftableConfig cfg = new ReftableConfig(); cfg.setIndexObjects(false); @@ -617,7 +620,8 @@ public class ReftableTest { .setMinUpdateIndex(1) .setMaxUpdateIndex(2) .begin(); - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); String msg = "test"; writer.writeLog(MASTER, 1, who, ObjectId.zeroId(), id(1), msg); @@ -633,7 +637,8 @@ public class ReftableTest { .setMinUpdateIndex(1) .setMaxUpdateIndex(1) .begin(); - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); String msg = "test"; writer.writeLog(NEXT, 1, who, ObjectId.zeroId(), id(1), msg); @@ -647,7 +652,8 @@ public class ReftableTest { public void withReflog() throws IOException { Ref master = ref(MASTER, 1); Ref next = ref(NEXT, 2); - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); String msg = "test"; ByteArrayOutputStream buffer = new ByteArrayOutputStream(); @@ -712,11 +718,14 @@ public class ReftableTest { writer.writeRef(master); writer.writeRef(next); - PersonIdent who1 = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who1 = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); writer.writeLog(MASTER, 3, who1, ObjectId.zeroId(), id(1), "1"); - PersonIdent who2 = new PersonIdent("Log", "Ger", 1500079710, -8 * 60); + PersonIdent who2 = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); writer.writeLog(MASTER, 2, who2, id(1), id(2), "2"); - PersonIdent who3 = new PersonIdent("Log", "Ger", 1500079711, -8 * 60); + PersonIdent who3 = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); writer.writeLog(MASTER, 1, who3, id(2), id(3), "3"); writer.finish(); @@ -753,7 +762,8 @@ public class ReftableTest { .setMaxUpdateIndex(1) .setConfig(cfg) .begin(); - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); // Fill out the 1st ref block. List names = new ArrayList<>(); @@ -782,7 +792,8 @@ public class ReftableTest { @Test public void reflogSeek() throws IOException { - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochSecond(1500079709), ZoneOffset.ofHours(-8)); String msg = "test"; String msgNext = "test next"; @@ -827,7 +838,8 @@ public class ReftableTest { @Test public void reflogSeekPrefix() throws IOException { - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); ByteArrayOutputStream buffer = new ByteArrayOutputStream(); ReftableWriter writer = new ReftableWriter(buffer) @@ -850,7 +862,8 @@ public class ReftableTest { @Test public void onlyReflog() throws IOException { - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); String msg = "test"; ByteArrayOutputStream buffer = new ByteArrayOutputStream(); @@ -916,7 +929,8 @@ public class ReftableTest { writer.writeRef(ref); } - PersonIdent who = new PersonIdent("Log", "Ger", 1500079709, -8 * 60); + PersonIdent who = new PersonIdent("Log", "Ger", + Instant.ofEpochMilli(1500079709), ZoneOffset.ofHours(-8)); for (Ref ref : refs) { writer.writeLog(ref.getName(), 1, who, ObjectId.zeroId(), ref.getObjectId(), -- cgit v1.2.3 From a687ca50e1300565fbf13fdbf885558dba258773 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 01:08:15 +0100 Subject: PushCertificateStoreTest: replace deprecated PersonIdent constructor Change-Id: I600538d0ea7ec4377af331341b8e4e2d51a5a51d --- .../tst/org/eclipse/jgit/transport/PushCertificateStoreTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateStoreTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateStoreTest.java index 4f01e4d445..a03222be0c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateStoreTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/PushCertificateStoreTest.java @@ -23,6 +23,8 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; +import java.time.Instant; +import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -318,8 +320,8 @@ public class PushCertificateStoreTest { } private PersonIdent newIdent() { - return new PersonIdent( - "A U. Thor", "author@example.com", ts.getAndIncrement(), 0); + return new PersonIdent("A U. Thor", "author@example.com", + Instant.ofEpochMilli(ts.getAndIncrement()), ZoneOffset.UTC); } private PushCertificateStore newStore() { -- cgit v1.2.3 From 47c9574343a4a556108e2a5a1e4af8741cb65483 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 01:19:26 +0100 Subject: RevCommitParseTest: : use java.time instead of java.util.Date API Change-Id: I6cf6ed64b4029001cb5908338b60385804eb9997 --- .../eclipse/jgit/revwalk/RevCommitParseTest.java | 25 +++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java index 2955516af0..014ff928a8 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevCommitParseTest.java @@ -23,7 +23,9 @@ import java.io.ByteArrayOutputStream; import java.io.UnsupportedEncodingException; import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.UnsupportedCharsetException; -import java.util.TimeZone; +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZoneOffset; import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.CommitBuilder; @@ -94,18 +96,17 @@ public class RevCommitParseTest extends RepositoryTestCase { assertNotNull(cAuthor); assertEquals(authorName, cAuthor.getName()); assertEquals(authorEmail, cAuthor.getEmailAddress()); - assertEquals((long) authorTime * 1000, cAuthor.getWhen().getTime()); - assertEquals(TimeZone.getTimeZone("GMT" + authorTimeZone), - cAuthor.getTimeZone()); + assertEquals(Instant.ofEpochSecond(authorTime), + cAuthor.getWhenAsInstant()); + assertEquals(ZoneId.of(authorTimeZone), cAuthor.getZoneId()); final PersonIdent cCommitter = c.getCommitterIdent(); assertNotNull(cCommitter); assertEquals(committerName, cCommitter.getName()); assertEquals(committerEmail, cCommitter.getEmailAddress()); - assertEquals((long) committerTime * 1000, - cCommitter.getWhen().getTime()); - assertEquals(TimeZone.getTimeZone("GMT" + committerTimeZone), - cCommitter.getTimeZone()); + assertEquals(Instant.ofEpochSecond(committerTime), + cCommitter.getWhenAsInstant()); + assertEquals(ZoneId.of(committerTimeZone), cCommitter.getZoneId()); } private RevCommit create(String msg) throws Exception { @@ -153,9 +154,13 @@ public class RevCommitParseTest extends RepositoryTestCase { c.parseCanonical(rw, b.toString().getBytes(UTF_8)); } assertEquals( - new PersonIdent("", "a_u_thor@example.com", 1218123387000L, 7), + new PersonIdent("", "a_u_thor@example.com", + Instant.ofEpochMilli(1218123387000L), + ZoneOffset.ofHoursMinutes(0, 7)), c.getAuthorIdent()); - assertEquals(new PersonIdent("", "", 1218123390000L, -5), + assertEquals( + new PersonIdent("", "", Instant.ofEpochMilli(1218123390000L), + ZoneOffset.ofHoursMinutes(0, -5)), c.getCommitterIdent()); } -- cgit v1.2.3 From 5fd2aa673af1f19e81b8aa4f6905fe735b917f83 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 01:21:06 +0100 Subject: SimpleMergeTest: replace deprecated PersonIdent constructor Change-Id: Ic40473aecb23e22c755a9e041592886fb3c448f9 --- .../tst/org/eclipse/jgit/merge/SimpleMergeTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java index 798aebe3b0..0016adfb66 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/SimpleMergeTest.java @@ -16,6 +16,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.io.IOException; +import java.time.Instant; +import java.time.ZoneOffset; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheBuilder; @@ -375,7 +377,8 @@ public class SimpleMergeTest extends SampleDataRepositoryTestCase { ObjectId[] parentIds) throws Exception { CommitBuilder c = new CommitBuilder(); c.setTreeId(treeB.writeTree(odi)); - c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", 1L, 0)); + c.setAuthor(new PersonIdent("A U Thor", "a.u.thor", + Instant.ofEpochMilli(1L), ZoneOffset.UTC)); c.setCommitter(c.getAuthor()); c.setParentIds(parentIds); c.setMessage("Tree " + c.getTreeId().name()); -- cgit v1.2.3 From e4fe0f0e3da0987015ff31dd3b72c702496d8410 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 29 Dec 2024 01:24:23 +0100 Subject: WriteReftable: replace deprecated PersonIdent constructor Change-Id: I70e9980bd7337f3f3e7c709fe16b91461cbbad7b --- .../src/org/eclipse/jgit/pgm/debug/WriteReftable.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteReftable.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteReftable.java index faa2bceb74..7aff2dd9cd 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteReftable.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/WriteReftable.java @@ -24,6 +24,8 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.OutputStream; +import java.time.Instant; +import java.time.ZoneOffset; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -209,14 +211,15 @@ class WriteReftable extends TextBuiltin { } String ref = m.group(1); double t = Double.parseDouble(m.group(2)); - long time = ((long) t) * 1000L; + Instant time = Instant.ofEpochSecond((long) t); long index = (long) (t * 1e6); String user = m.group(3); ObjectId oldId = parseId(m.group(4)); ObjectId newId = parseId(m.group(5)); String msg = m.group(6); String email = user + "@gerrit"; //$NON-NLS-1$ - PersonIdent who = new PersonIdent(user, email, time, -480); + PersonIdent who = new PersonIdent(user, email, time, + ZoneOffset.ofHours(-8)); log.add(new LogEntry(ref, index, who, oldId, newId, msg)); } } -- cgit v1.2.3 From d6758409ffde7fe9e43bc42f58bbbcd1015c165b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 3 Jan 2025 00:02:55 +0100 Subject: Update jna to 5.16.0 Change-Id: I1b3ac396297968174f46afda70e7292eed19210d --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index e015895592..6a069ec6d2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -122,18 +122,18 @@ maven_jar( sha1 = "c070ac920e72023ae9ab0a3f3a866bece284b470", ) -JNA_VERS = "5.15.0" +JNA_VERS = "5.16.0" maven_jar( name = "jna", artifact = "net.java.dev.jna:jna:" + JNA_VERS, - sha1 = "01ee1d80ff44f08280188f7c0e740d57207841ac", + sha1 = "ebea09f91dc9f7048099f963fb8d6f919f0a4d9c", ) maven_jar( name = "jna-platform", artifact = "net.java.dev.jna:jna-platform:" + JNA_VERS, - sha1 = "86b502cad57d45da172b5e3231c537b042e296ef", + sha1 = "b2a9065f97c166893d504b164706512338e3bbc2", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index ff4f0262f1..932b2efc80 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.15.0 + 5.16.0 jar net.java.dev.jna jna-platform - 5.15.0 + 5.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index a94fc6c9d4..35e5a01db6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.15.0 + 5.16.0 jar net.java.dev.jna jna-platform - 5.15.0 + 5.16.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index c67117ea45..2ac077a158 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -89,13 +89,13 @@ net.java.dev.jna jna - 5.15.0 + 5.16.0 jar net.java.dev.jna jna-platform - 5.15.0 + 5.16.0 jar 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 bbea833864..81c4db78a5 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 @@ -207,12 +207,12 @@ maven jna dependency { groupId = "net.java.dev.jna" artifactId = "jna" - version = "5.15.0" + version = "5.16.0" } dependency { groupId = "net.java.dev.jna" artifactId = "jna-platform" - version = "5.15.0" + version = "5.16.0" } } diff --git a/pom.xml b/pom.xml index 4fb22188d8..a048a89547 100644 --- a/pom.xml +++ b/pom.xml @@ -147,7 +147,7 @@ 2.13.0 2.2 3.27.0 - 5.15.0 + 5.16.0 1.15.11 -- cgit v1.2.3 From 4654cced58d1e54f0102626a80a55ac52f4096fc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 3 Jan 2025 00:05:11 +0100 Subject: Update org.assertj:assertj-core to 3.27.1 Change-Id: I90999c8d67adce2d510c2dc2d428090a1890c6ff --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6a069ec6d2..93bd9722d5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -216,8 +216,8 @@ maven_jar( maven_jar( name = "assertj-core", - artifact = "org.assertj:assertj-core:3.27.0", - sha1 = "a04bf3feaf3dc6ede0770c160a7dc1c214f1a2c9", + artifact = "org.assertj:assertj-core:3.27.1", + sha1 = "7b143f470d8e604e1f0dc402f56a40f94dca64b6", ) BYTE_BUDDY_VERSION = "1.15.11" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 932b2efc80..4939ea0644 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.0 + 3.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 35e5a01db6..7dfec6a7f6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.0 + 3.27.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 2ac077a158..7e4f39e83b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.0 + 3.27.1 jar 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 81c4db78a5..fdb12e48b1 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 @@ -56,7 +56,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.27.0" + version = "3.27.1" } } diff --git a/pom.xml b/pom.xml index a048a89547..2d634a4350 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 3.13.0 2.13.0 2.2 - 3.27.0 + 3.27.1 5.16.0 1.15.11 -- cgit v1.2.3 From b4b9122bb37ed5cdb0f6612bdfefb16a8170bdb5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 3 Jan 2025 20:39:20 +0100 Subject: Update mockito to 5.15.2 Change-Id: Ic0e65e2ccd5dbd7298d8fb425a67368371462be6 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 93bd9722d5..eb2736f5c5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -210,8 +210,8 @@ maven_jar( maven_jar( name = "mockito", - artifact = "org.mockito:mockito-core:5.14.2", - sha1 = "f7bf936008d7664e2002c3faf0c02071c8d10e7c", + artifact = "org.mockito:mockito-core:5.15.2", + sha1 = "87be4b1e0cc5febc07ab3197a8ff3ede56b37a79", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 4939ea0644..dff4dd08f7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.2 + 5.15.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 7dfec6a7f6..f64f1c5724 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.2 + 5.15.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 7e4f39e83b..76410bbd7c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -79,7 +79,7 @@ org.mockito mockito-core - 5.14.2 + 5.15.2 jar 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 fdb12e48b1..e82f3192a2 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 @@ -225,7 +225,7 @@ maven mockito dependency { groupId = "org.mockito" artifactId = "mockito-core" - version = "5.14.2" + version = "5.15.2" } } diff --git a/pom.xml b/pom.xml index 2d634a4350..291cf11de2 100644 --- a/pom.xml +++ b/pom.xml @@ -1007,7 +1007,7 @@ org.mockito mockito-core - 5.14.2 + 5.15.2 -- cgit v1.2.3 From 24555e570b9fe4af523de530e4a762c7cbfa8805 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 5 Jan 2025 12:17:07 +0100 Subject: Update org.assertj:assertj-core to 3.27.2 Change-Id: I8389402492f0729837f0aa2d41f1f69eb1b27334 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index eb2736f5c5..fc68fdf385 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -216,8 +216,8 @@ maven_jar( maven_jar( name = "assertj-core", - artifact = "org.assertj:assertj-core:3.27.1", - sha1 = "7b143f470d8e604e1f0dc402f56a40f94dca64b6", + artifact = "org.assertj:assertj-core:3.27.2", + sha1 = "b56956eacc9817a46b5ca5e7a4d9fb647ab06e87", ) BYTE_BUDDY_VERSION = "1.15.11" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index dff4dd08f7..541f8c5b5a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.1 + 3.27.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index f64f1c5724..3ae0f3b88f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.1 + 3.27.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 76410bbd7c..c6964e91d2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.1 + 3.27.2 jar 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 e82f3192a2..2d1678d2ae 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 @@ -56,7 +56,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.27.1" + version = "3.27.2" } } diff --git a/pom.xml b/pom.xml index 291cf11de2..af7355ffcc 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 3.13.0 2.13.0 2.2 - 3.27.1 + 3.27.2 5.16.0 1.15.11 -- cgit v1.2.3 From aadfce7e87d2f3536fdc360f562cd0c190a397cd Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 5 Jan 2025 23:06:27 +0100 Subject: Use junit TemporaryFolder to cleanup files created by tests The custom code used earlier sometimes failed to cleanup files created by tests. Hence replace it by using TemporaryFolder. Change-Id: I8c1219b01835a4a6d20498ab04555af024e4e624 --- org.eclipse.jgit.junit/.settings/.api_filters | 11 ++++ .../jgit/junit/LocalDiskRepositoryTestCase.java | 64 +++++----------------- 2 files changed, 25 insertions(+), 50 deletions(-) create mode 100644 org.eclipse.jgit.junit/.settings/.api_filters diff --git a/org.eclipse.jgit.junit/.settings/.api_filters b/org.eclipse.jgit.junit/.settings/.api_filters new file mode 100644 index 0000000000..27815301c2 --- /dev/null +++ b/org.eclipse.jgit.junit/.settings/.api_filters @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java index c15fc9921e..0d20f6488a 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java @@ -26,14 +26,13 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Random; import java.util.Set; import java.util.TreeSet; -import java.util.concurrent.ConcurrentHashMap; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.internal.storage.file.FileRepository; -import org.eclipse.jgit.internal.util.ShutdownHook; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; @@ -48,6 +47,7 @@ import org.eclipse.jgit.util.SystemReader; import org.junit.After; import org.junit.Before; import org.junit.Rule; +import org.junit.rules.TemporaryFolder; import org.junit.rules.TestName; /** @@ -85,6 +85,16 @@ public abstract class LocalDiskRepositoryTestCase { protected MockSystemReader mockSystemReader; private final Set toClose = new HashSet<>(); + + /** + * Temporary test root directory for files created by tests. + * @since 7.2 + */ + @Rule + public TemporaryFolder testRoot = new TemporaryFolder(); + + Random rand = new Random(); + private File tmp; private File homeDir; @@ -115,11 +125,8 @@ public abstract class LocalDiskRepositoryTestCase { */ @Before public void setUp() throws Exception { - tmp = File.createTempFile("jgit_" + getTestName() + '_', "_tmp"); - Cleanup.deleteOnShutdown(tmp); - if (!tmp.delete() || !tmp.mkdir()) { - throw new IOException("Cannot create " + tmp); - } + tmp = testRoot.newFolder(getTestName() + rand.nextInt()); + mockSystemReader = new MockSystemReader(); SystemReader.setInstance(mockSystemReader); @@ -220,12 +227,6 @@ public abstract class LocalDiskRepositoryTestCase { System.gc(); } FS.DETECTED.setUserHome(homeDir); - if (tmp != null) { - recursiveDelete(tmp, false, true); - } - if (tmp != null && !tmp.exists()) { - Cleanup.removed(tmp); - } SystemReader.setInstance(null); } @@ -624,41 +625,4 @@ public abstract class LocalDiskRepositoryTestCase { private static HashMap cloneEnv() { return new HashMap<>(System.getenv()); } - - private static final class Cleanup { - private static final Cleanup INSTANCE = new Cleanup(); - - static { - ShutdownHook.INSTANCE.register(() -> INSTANCE.onShutdown()); - } - - private final Set toDelete = ConcurrentHashMap.newKeySet(); - - private Cleanup() { - // empty - } - - static void deleteOnShutdown(File tmp) { - INSTANCE.toDelete.add(tmp); - } - - static void removed(File tmp) { - INSTANCE.toDelete.remove(tmp); - } - - private void onShutdown() { - // On windows accidentally open files or memory - // mapped regions may prevent files from being deleted. - // Suggesting a GC increases the likelihood that our - // test repositories actually get removed after the - // tests, even in the case of failure. - System.gc(); - synchronized (this) { - boolean silent = false; - boolean failOnError = false; - for (File tmp : toDelete) - recursiveDelete(tmp, silent, failOnError); - } - } - } } -- cgit v1.2.3 From 989abcc60f865e6c84b95378a31f13a5147a5242 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 6 Jan 2025 13:45:33 +0100 Subject: FileReftableTest: fix order of arguments when using assertEquals The expected value is the first argument and the actual value the second argument. Change-Id: I8416cfeaa7a14d0b863658bf133473535647fc57 --- .../internal/storage/file/FileReftableTest.java | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java index 32342e3563..01cbcfd20f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java @@ -87,13 +87,13 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { u.setNewObjectId(id); r = u.update(); - assertEquals(r, Result.NEW); + assertEquals(Result.NEW, r); } } } // only the first one succeeds - assertEquals(retry, 19); + assertEquals(19, retry); } } @@ -105,13 +105,13 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { RefUpdate u = db.updateRef("refs/heads/master"); u.setForceUpdate(true); u.setNewObjectId((i%2) == 0 ? c1 : c2); - assertEquals(u.update(), FORCED); + assertEquals(FORCED, u.update()); } File tableDir = new File(db.getDirectory(), Constants.REFTABLE); assertTrue(tableDir.listFiles().length > 2); ((FileReftableDatabase)db.getRefDatabase()).compactFully(); - assertEquals(tableDir.listFiles().length,2); + assertEquals(2, tableDir.listFiles().length); } @Test @@ -172,8 +172,8 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { db.convertToPackedRefs(true, false); List logs = db.getReflogReader("refs/heads/master").getReverseEntries(2); - assertEquals(logs.get(0).getComment(), "banana"); - assertEquals(logs.get(1).getComment(), "apple"); + assertEquals("banana", logs.get(0).getComment()); + assertEquals("apple", logs.get(1).getComment()); } @Test @@ -194,8 +194,8 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { .execute(rw, NullProgressMonitor.INSTANCE); } - assertEquals(rc1.getResult(), ReceiveCommand.Result.OK); - assertEquals(rc2.getResult(), ReceiveCommand.Result.OK); + assertEquals(ReceiveCommand.Result.OK, rc1.getResult()); + assertEquals(ReceiveCommand.Result.OK, rc2.getResult()); ReflogEntry e = db.getReflogReader("refs/heads/batch1").getLastEntry(); assertEquals(msg, e.getComment()); @@ -267,7 +267,7 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { RefUpdate up = db.getRefDatabase().newUpdate("refs/heads/a", false); up.setForceUpdate(true); RefUpdate.Result res = up.delete(); - assertEquals(res, FORCED); + assertEquals(FORCED, res); assertNull(db.exactRef("refs/heads/a")); } @@ -333,9 +333,9 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { ReflogReader r = db.getReflogReader("refs/heads/master"); ReflogEntry e = r.getLastEntry(); - assertEquals(e.getNewId(), pid); - assertEquals(e.getComment(), "REFLOG!: FORCED"); - assertEquals(e.getWho(), person); + assertEquals(pid, e.getNewId()); + assertEquals("REFLOG!: FORCED", e.getComment()); + assertEquals(person, e.getWho()); } @Test @@ -352,7 +352,7 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { ref = db.updateRef(newRef); ref.setNewObjectId(db.resolve(Constants.HEAD)); - assertEquals(ref.delete(), RefUpdate.Result.NO_CHANGE); + assertEquals(RefUpdate.Result.NO_CHANGE, ref.delete()); // Differs from RefupdateTest. Deleting a loose ref leaves reflog trail. ReflogReader reader = db.getReflogReader("refs/heads/abc"); @@ -431,7 +431,7 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { Ref head = db.exactRef("HEAD"); assertTrue(head.isSymbolic()); - assertEquals(head.getTarget().getName(), "refs/heads/unborn"); + assertEquals("refs/heads/unborn", head.getTarget().getName()); } /** @@ -573,10 +573,10 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { assertTrue(res == Result.NEW || res == FORCED); } - assertEquals(refDb.exactRef(refName).getObjectId(), bId); + assertEquals(bId, refDb.exactRef(refName).getObjectId()); assertTrue(randomStr.equals(refDb.getReflogReader(refName).getReverseEntry(1).getComment())); refDb.compactFully(); - assertEquals(refDb.exactRef(refName).getObjectId(), bId); + assertEquals(bId, refDb.exactRef(refName).getObjectId()); assertTrue(randomStr.equals(refDb.getReflogReader(refName).getReverseEntry(1).getComment())); } -- cgit v1.2.3 From e5e2e026987f9f5ae9abf25e9de366e3c59a5dd3 Mon Sep 17 00:00:00 2001 From: youtirsin Date: Wed, 8 Jan 2025 16:26:55 +0800 Subject: Set repositoryformatversion=0 when converting refStorage to files See https://git-scm.com/docs/repository-version#_version_1 Change-Id: Ic71e55f5dfd4dacedabe54a5881a56b72659f3bc Signed-off-by: youtirsin --- .../src/org/eclipse/jgit/internal/storage/file/FileRepository.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index c5c36565d9..207ced0314 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -743,6 +743,8 @@ public class FileRepository extends Repository { } repoConfig.unset(ConfigConstants.CONFIG_EXTENSIONS_SECTION, null, ConfigConstants.CONFIG_KEY_REF_STORAGE); + repoConfig.setLong(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_REPO_FORMAT_VERSION, 0); repoConfig.save(); } -- cgit v1.2.3 From 06d36a07c935811df02fa2a17e785e9919d3e5c9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 16 Jan 2025 14:27:44 +0100 Subject: Update Apache commons-codec to 1.17.2 Change-Id: Ibec1f2821d82855337e166bc65afd7c5b98dc5f2 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index fc68fdf385..6ed3fae196 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -138,8 +138,8 @@ maven_jar( maven_jar( name = "commons-codec", - artifact = "commons-codec:commons-codec:1.17.1", - sha1 = "973638b7149d333563584137ebf13a691bb60579", + artifact = "commons-codec:commons-codec:1.17.2", + sha1 = "cd6bb9d856db5f61871a94d5801efd0b93b7fcb2", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 541f8c5b5a..52d3628ae0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 3ae0f3b88f..c206a827a7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.1 + 1.17.2 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index c6964e91d2..43a9a50b1f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.1 + 1.17.2 jar 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 2d1678d2ae..4b7b0a9f8c 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 @@ -10,7 +10,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.17.1" + version = "1.17.2" } dependency { groupId = "org.apache.commons" diff --git a/pom.xml b/pom.xml index af7355ffcc..78a8fb3e7b 100644 --- a/pom.xml +++ b/pom.xml @@ -886,7 +886,7 @@ commons-codec commons-codec - 1.17.1 + 1.17.2 -- cgit v1.2.3 From 61a35e65581360f48684f5fd42b85fb9652c8c99 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 16 Jan 2025 22:29:51 +0100 Subject: Update bouncycastle to 1.80 Change-Id: I4bd82f562c8b7d4e9b934bc0a0519f4060c81d12 --- WORKSPACE | 14 +++++--------- .../org.eclipse.jgit.target/jgit-4.32.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.33.target | 10 +++++----- .../org.eclipse.jgit.target/jgit-4.34.target | 10 +++++----- .../org.eclipse.jgit.target/maven/dependencies.tpd | 8 ++++---- pom.xml | 2 +- 6 files changed, 25 insertions(+), 29 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6ed3fae196..c50b0d9ccb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -296,32 +296,28 @@ maven_jar( sha1 = "60225034131e3f771b40bc75c15bd9cc4952302b", ) -BOUNCYCASTLE_VER = "1.79" +BOUNCYCASTLE_VER = "1.80" maven_jar( name = "bcpg", artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "904dd8a8e1c9f7d58d1ffa7f4ca3fb00736a601f", - src_sha1 = "9e372826141edb213d5921131ee68dc276dc99ef", + sha1 = "163889a825393854dbe7dc52f1a8667e715e9859", ) maven_jar( name = "bcprov", artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "4d8e2732bcee15f1db93df266c3f5b70ce5cac21", - src_sha1 = "8647816d667ee526a8e3a456229ac5f9f96d2315", + sha1 = "e22100b41042decf09cab914a5af8d2c57b5ac4a", ) maven_jar( name = "bcutil", artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "ecfc5aef97cc7676ea0de5c53c407b9f533f0ad5", - src_sha1 = "00df03977fb0b80395da655623abca9d7d7dcb66", + sha1 = "b95726d1d49a0c65010c59a3e6640311d951bfd1", ) maven_jar( name = "bcpkix", artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER, - sha1 = "7693cec3b8779b74b35466dcaeeaac7409872954", - src_sha1 = "57a60d1d9f75320eef70a095dfae679d97ade1c2", + sha1 = "5277dfaaef2e92ce1d802499599a0ca7488f86e6", ) diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 52d3628ae0..113493bfd4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcprov-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcpkix-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcutil-jdk18on - 1.79 + 1.80 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index c206a827a7..913bf28d81 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcprov-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcpkix-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcutil-jdk18on - 1.79 + 1.80 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 43a9a50b1f..4cdae3c446 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -209,25 +209,25 @@ org.bouncycastle bcpg-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcprov-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcpkix-jdk18on - 1.79 + 1.80 jar org.bouncycastle bcutil-jdk18on - 1.79 + 1.80 jar 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 4b7b0a9f8c..b0ebe06412 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 @@ -69,22 +69,22 @@ maven bouncycastle dependency { groupId = "org.bouncycastle" artifactId = "bcpg-jdk18on" - version = "1.79" + version = "1.80" } dependency { groupId = "org.bouncycastle" artifactId = "bcprov-jdk18on" - version = "1.79" + version = "1.80" } dependency { groupId = "org.bouncycastle" artifactId = "bcpkix-jdk18on" - version = "1.79" + version = "1.80" } dependency { groupId = "org.bouncycastle" artifactId = "bcutil-jdk18on" - version = "1.79" + version = "1.80" } } diff --git a/pom.xml b/pom.xml index 78a8fb3e7b..a123305ec9 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,7 @@ 1.7.36 3.11.2 2.11.0 - 1.79 + 1.80 4.8.6.6 3.8.0 3.6.0 -- cgit v1.2.3 From 1af00e9d9b445265b2c00ce28a3927f35591afb9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Thu, 16 Jan 2025 22:37:07 +0100 Subject: Add target platform jgit-4.35 for Eclipse 2025-03 Change-Id: I4211fe2529638509865624fe69332b3b5b67bfe1 --- .../org.eclipse.jgit.target/jgit-4.35.target | 290 +++++++++++++++++++++ .../org.eclipse.jgit.target/jgit-4.35.tpd | 8 + .../org.eclipse.jgit.target/orbit/orbit-4.35.tpd | 27 ++ 3 files changed, 325 insertions(+) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target new file mode 100644 index 0000000000..415b9d4948 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -0,0 +1,290 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + org.tukaani + xz + 1.10 + jar + + + + + + + org.slf4j + slf4j-api + 1.7.36 + jar + + + org.slf4j + slf4j-simple + 1.7.36 + jar + + + + + + + org.apache.sshd + sshd-osgi + 2.14.0 + jar + + + org.apache.sshd + sshd-sftp + 2.14.0 + jar + + + + + + + org.mockito + mockito-core + 5.15.2 + jar + + + + + + + net.java.dev.jna + jna + 5.16.0 + jar + + + net.java.dev.jna + jna-platform + 5.16.0 + jar + + + + + + + org.eclipse.jetty.ee10 + jetty-ee10-servlet + 12.0.16 + jar + + + org.eclipse.jetty + jetty-http + 12.0.16 + jar + + + org.eclipse.jetty + jetty-io + 12.0.16 + jar + + + org.eclipse.jetty + jetty-security + 12.0.16 + jar + + + org.eclipse.jetty + jetty-server + 12.0.16 + jar + + + org.eclipse.jetty + jetty-session + 12.0.16 + jar + + + org.eclipse.jetty + jetty-util + 12.0.16 + jar + + + org.eclipse.jetty + jetty-util-ajax + 12.0.16 + jar + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + jar + + + + + + + com.googlecode.javaewah + JavaEWAH + 1.2.3 + jar + + + + + + + org.hamcrest + hamcrest + 2.2 + jar + + + + + + + com.google.code.gson + gson + 2.11.0 + jar + + + + + + + net.bytebuddy + byte-buddy + 1.15.11 + jar + + + net.bytebuddy + byte-buddy-agent + 1.15.11 + jar + + + + + + + org.bouncycastle + bcpg-jdk18on + 1.80 + jar + + + org.bouncycastle + bcprov-jdk18on + 1.80 + jar + + + org.bouncycastle + bcpkix-jdk18on + 1.80 + jar + + + org.bouncycastle + bcutil-jdk18on + 1.80 + jar + + + + + + + org.assertj + assertj-core + 3.27.2 + jar + + + + + + + args4j + args4j + 2.37 + jar + + + + + + + commons-codec + commons-codec + 1.17.2 + jar + + + org.apache.commons + commons-compress + 1.27.1 + jar + + + org.apache.commons + commons-lang3 + 3.17.0 + jar + + + commons-io + commons-io + 2.18.0 + jar + + + commons-logging + commons-logging + 1.3.4 + jar + + + + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.tpd new file mode 100644 index 0000000000..3c0646eb46 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.tpd @@ -0,0 +1,8 @@ +target "jgit-4.35" with source configurePhase + +include "orbit/orbit-4.35.tpd" +include "maven/dependencies.tpd" + +location "https://download.eclipse.org/staging/2025-03/" { + org.eclipse.osgi lazy +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd new file mode 100644 index 0000000000..9e47c1c0d8 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd @@ -0,0 +1,27 @@ +target "orbit-4.35" with source configurePhase +// see https://download.eclipse.org/tools/orbit/downloads/ + +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03" { + com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] + com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] + net.i2p.crypto.eddsa [0.3.0,0.3.0] + net.i2p.crypto.eddsa.source [0.3.0,0.3.0] + org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] + org.apache.httpcomponents.httpclient [4.5.14,4.5.14] + org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] + org.apache.httpcomponents.httpcore [4.4.16,4.4.16] + org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] + org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] + org.junit [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.junit.source [4.13.2.v20240929-1000,4.13.2.v20240929-1000] + org.objenesis [3.4,3.4] + org.objenesis.source [3.4,3.4] + org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] + org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] +} -- cgit v1.2.3 From 524fdd47f97cc10924b8d246267688a953f626bc Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 15 Jan 2025 15:39:34 +0100 Subject: Fix ObjectDirectoryTest#testOpenLooseObjectPropagatesIOExceptions By instrumenting "LooseObjects#open" with print statements (since debugging mocks doesn't work in Eclipse) I found that the constructor "LooseObjects(Config, File)" which defaults "core.trustFolderStat" to "true" isn't used when mocking LooseObjects. Hence "core.trustFolderStat" is in fact "false" in the mocked LooseObjects object. Make this explicit by configuring "trustFolderStat=false" in a real "LooseObjects" object and only mock its method "#getObjectLoader" using a spy. Change-Id: I2f870637db818c2e89c1c2a174bf78bd572a367a --- .../jgit/internal/storage/file/ObjectDirectoryTest.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java index d1342c0fbd..7d298ee6f1 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java @@ -49,7 +49,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import java.io.File; @@ -66,6 +68,7 @@ import java.util.concurrent.Future; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.Config; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; @@ -221,19 +224,21 @@ public class ObjectDirectoryTest extends RepositoryTestCase { verify(unpackedObjectCacheMock).remove(id); } - @Test + @Test(expected = IOException.class) public void testOpenLooseObjectPropagatesIOExceptions() throws Exception { ObjectId id = ObjectId .fromString("873fb8d667d05436d728c52b1d7a09528e6eb59b"); WindowCursor curs = new WindowCursor(db.getObjectDatabase()); - LooseObjects mock = mock(LooseObjects.class); + Config config = new Config(); + config.setString("core", null, "trustFolderStat", "false"); + LooseObjects spy = spy(new LooseObjects(config, + db.getObjectDatabase().getDirectory())); - Mockito.when(mock.getObjectLoader(any(), any(), any())) - .thenThrow(new IOException("some IO failure")); - Mockito.when(mock.open(curs, id)).thenCallRealMethod(); + doThrow(new IOException("some IO failure")).when(spy) + .getObjectLoader(any(), any(), any()); - assertThrows(IOException.class, () -> mock.open(curs, id)); + spy.open(curs, id); } @Test -- cgit v1.2.3 From dd8e92dba9f0634ac886e2bab32caae2a44f5178 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 26 Jan 2025 23:47:28 +0100 Subject: Update bytebuddy to 1.16.1 Change-Id: I3cb485de38d338735ee7856ab18789dc9f9dfb60 --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c50b0d9ccb..765df12498 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "b56956eacc9817a46b5ca5e7a4d9fb647ab06e87", ) -BYTE_BUDDY_VERSION = "1.15.11" +BYTE_BUDDY_VERSION = "1.16.1" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "f61886478e0f9ee4c21d09574736f0ff45e0a46c", + sha1 = "f95f4d5efa5e07706129048a62b38a0acb35592c", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "a38b16385e867f59a641330f0362ebe742788ed8", + sha1 = "22bb84b3bda45a329d17930809683484a5ac2db2", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 113493bfd4..d85b441516 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.11 + 1.16.1 jar net.bytebuddy byte-buddy-agent - 1.15.11 + 1.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 913bf28d81..7b5e5d1f20 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.11 + 1.16.1 jar net.bytebuddy byte-buddy-agent - 1.15.11 + 1.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 4cdae3c446..21e436192e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.11 + 1.16.1 jar net.bytebuddy byte-buddy-agent - 1.15.11 + 1.16.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 415b9d4948..2c04995323 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.15.11 + 1.16.1 jar net.bytebuddy byte-buddy-agent - 1.15.11 + 1.16.1 jar 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 b0ebe06412..e957924ec2 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.15.11" + version = "1.16.1" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.15.11" + version = "1.16.1" } } diff --git a/pom.xml b/pom.xml index a123305ec9..a4f49bc8df 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.27.2 5.16.0 - 1.15.11 + 1.16.1 jacoco -- cgit v1.2.3 From d22f306b43dbe1ba8e92cc0e0d5511dbe2029d15 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 27 Jan 2025 01:21:14 +0100 Subject: Update org.assertj:assertj-core to 3.27.3 Change-Id: I513ed40eded5abe8511494875eeb6849592c643e --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 765df12498..c0e8236998 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -216,8 +216,8 @@ maven_jar( maven_jar( name = "assertj-core", - artifact = "org.assertj:assertj-core:3.27.2", - sha1 = "b56956eacc9817a46b5ca5e7a4d9fb647ab06e87", + artifact = "org.assertj:assertj-core:3.27.3", + sha1 = "31f5d58a202bd5df4993fb10fa2cffd610c20d6f", ) BYTE_BUDDY_VERSION = "1.16.1" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index d85b441516..acb7b77ed2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.2 + 3.27.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 7b5e5d1f20..fcca388967 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.2 + 3.27.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 21e436192e..e5c93692b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.2 + 3.27.3 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 2c04995323..f9551d5368 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -237,7 +237,7 @@ org.assertj assertj-core - 3.27.2 + 3.27.3 jar 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 e957924ec2..17d4ad436c 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 @@ -56,7 +56,7 @@ maven assertj dependency { groupId = "org.assertj" artifactId = "assertj-core" - version = "3.27.2" + version = "3.27.3" } } diff --git a/pom.xml b/pom.xml index a4f49bc8df..e6ea7488f0 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 3.13.0 2.13.0 2.2 - 3.27.2 + 3.27.3 5.16.0 1.16.1 -- cgit v1.2.3 From fda44a444ed266a6bff352526fed7b2ff3169489 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 5 Jan 2025 17:58:30 +0100 Subject: Add RefDatabase#getReflogReader methods to fix broken abstraction in FileRepository#getReflogReader(String). How to get a ReflogReader depends on the chosen RefDatabase implementation, hence the #getReflogReader methods should be there. This also fixes a bug in FileRepository#getReflogReader(Ref) which didn't work if FileReftableDatabase was used as RefDatabase since it always returned the implementation only suitable for RefDirectory. Change-Id: I0859990f9390ab96596b6c344966c687dfbbf167 --- .../jgit/lib/RefDatabaseConflictingNamesTest.java | 5 +++ org.eclipse.jgit/.settings/.api_filters | 17 ++++++++++ .../internal/storage/dfs/DfsReftableDatabase.java | 6 ++++ .../storage/file/FileReftableDatabase.java | 8 ++++- .../jgit/internal/storage/file/FileRepository.java | 28 ++--------------- .../jgit/internal/storage/file/RefDirectory.java | 6 ++++ .../src/org/eclipse/jgit/lib/RefDatabase.java | 36 ++++++++++++++++++++++ .../src/org/eclipse/jgit/lib/Repository.java | 13 ++++---- 8 files changed, 86 insertions(+), 33 deletions(-) create mode 100644 org.eclipse.jgit/.settings/.api_filters diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java index b02f245865..85f9612b6a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RefDatabaseConflictingNamesTest.java @@ -70,6 +70,11 @@ public class RefDatabaseConflictingNamesTest { return null; } + @Override + public ReflogReader getReflogReader(Ref ref) throws IOException { + return null; + } + @Override public void create() throws IOException { // Not needed diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters new file mode 100644 index 0000000000..61d66582e0 --- /dev/null +++ b/org.eclipse.jgit/.settings/.api_filters @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java index 3ba74b26fc..2751cd2969 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java @@ -28,6 +28,7 @@ import org.eclipse.jgit.lib.BatchRefUpdate; import org.eclipse.jgit.lib.NullProgressMonitor; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.ReflogReader; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.util.RefList; @@ -176,6 +177,11 @@ public class DfsReftableDatabase extends DfsRefDatabase { return reftableDatabase.getRefsByPrefixWithExclusions(include, excludes); } + @Override + public ReflogReader getReflogReader(Ref ref) throws IOException { + return reftableDatabase.getReflogReader(ref.getName()); + } + @Override public Set getTipsWithSha1(ObjectId id) throws IOException { if (!getReftableConfig().isIndexObjects()) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java index 25b7583b95..81e8c0306d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java @@ -90,7 +90,13 @@ public class FileReftableDatabase extends RefDatabase { }; } - ReflogReader getReflogReader(String refname) throws IOException { + @Override + public ReflogReader getReflogReader(Ref ref) throws IOException { + return reftableDatabase.getReflogReader(ref.getName()); + } + + @Override + public ReflogReader getReflogReader(String refname) throws IOException { return reftableDatabase.getReflogReader(refname); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java index 207ced0314..bcf9f1efdf 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileRepository.java @@ -31,7 +31,6 @@ import java.util.Locale; import java.util.Objects; import java.util.Set; -import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.api.errors.JGitInternalException; @@ -542,29 +541,6 @@ public class FileRepository extends Repository { fireEvent(new IndexChangedEvent(internal)); } - @Override - public ReflogReader getReflogReader(String refName) throws IOException { - if (refs instanceof FileReftableDatabase) { - // Cannot use findRef: reftable stores log data for deleted or renamed - // branches. - return ((FileReftableDatabase)refs).getReflogReader(refName); - } - - // TODO: use exactRef here, which offers more predictable and therefore preferable - // behavior. - Ref ref = findRef(refName); - if (ref == null) { - return null; - } - return new ReflogReaderImpl(this, ref.getName()); - } - - @Override - public @NonNull ReflogReader getReflogReader(@NonNull Ref ref) - throws IOException { - return new ReflogReaderImpl(this, ref.getName()); - } - @Override public AttributesNodeProvider createAttributesNodeProvider() { return new AttributesNodeProviderImpl(this); @@ -697,8 +673,8 @@ public class FileRepository extends Repository { } if (writeLogs) { - List logs = oldDb.getReflogReader(r.getName()) - .getReverseEntries(); + ReflogReader reflogReader = oldDb.getReflogReader(r); + List logs = reflogReader.getReverseEntries(); Collections.reverse(logs); for (ReflogEntry e : logs) { logWriter.log(r.getName(), e); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 6aa1157e37..33996519f7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -76,6 +76,7 @@ import org.eclipse.jgit.lib.RefComparator; import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefWriter; +import org.eclipse.jgit.lib.ReflogReader; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.SymbolicRef; import org.eclipse.jgit.revwalk.RevObject; @@ -456,6 +457,11 @@ public class RefDirectory extends RefDatabase { return ret; } + @Override + public ReflogReader getReflogReader(Ref ref) throws IOException { + return new ReflogReaderImpl(getRepository(), ref.getName()); + } + @SuppressWarnings("unchecked") private RefList upcast(RefList loose) { return (RefList) loose; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index 09cb5a83dd..11d1732c77 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -355,6 +355,42 @@ public abstract class RefDatabase { return getRefsByPrefix(ALL); } + /** + * Get the reflog reader + * + * @param refName + * a {@link java.lang.String} object. + * @return a {@link org.eclipse.jgit.lib.ReflogReader} for the supplied + * refname, or {@code null} if the named ref does not exist. + * @throws java.io.IOException + * the ref could not be accessed. + * @since 7.2 + */ + @Nullable + public ReflogReader getReflogReader(String refName) throws IOException { + // TODO: use exactRef here, which offers more predictable and therefore + // preferable behavior. + Ref ref = findRef(refName); + if (ref == null) { + return null; + } + return getReflogReader(ref); + } + + /** + * Get the reflog reader. + * + * @param ref + * a Ref + * @return a {@link org.eclipse.jgit.lib.ReflogReader} for the supplied ref. + * @throws IOException + * if an IO error occurred + * @since 7.2 + */ + @NonNull + public abstract ReflogReader getReflogReader(@NonNull Ref ref) + throws IOException; + /** * Get a section of the reference namespace. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 0562840915..a7bba23996 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -1694,8 +1694,9 @@ public abstract class Repository implements AutoCloseable { * @since 3.0 */ @Nullable - public abstract ReflogReader getReflogReader(String refName) - throws IOException; + public ReflogReader getReflogReader(String refName) throws IOException { + return getRefDatabase().getReflogReader(refName); + } /** * Get the reflog reader. Subclasses should override this method and provide @@ -1703,15 +1704,15 @@ public abstract class Repository implements AutoCloseable { * * @param ref * a Ref - * @return a {@link org.eclipse.jgit.lib.ReflogReader} for the supplied ref, - * or {@code null} if the ref does not exist. + * @return a {@link org.eclipse.jgit.lib.ReflogReader} for the supplied ref. * @throws IOException * if an IO error occurred * @since 5.13.2 */ - public @Nullable ReflogReader getReflogReader(@NonNull Ref ref) + @NonNull + public ReflogReader getReflogReader(@NonNull Ref ref) throws IOException { - return getReflogReader(ref.getName()); + return getRefDatabase().getReflogReader(ref); } /** -- cgit v1.2.3 From e93294f013fcc76a8e20684e277833394be93c6d Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 5 Jan 2025 18:48:44 +0100 Subject: Deprecate Repository#getReflogReader methods instead use Repository.getRefDatabase().getReflogReader(). Change-Id: I5e66a512c12e11d0ec3275fffde4adb8483430f2 --- .../jgit/http/test/SmartClientSmartServerTest.java | 3 +- .../eclipse/jgit/api/CherryPickCommandTest.java | 6 +- .../tst/org/eclipse/jgit/api/CloneCommandTest.java | 3 +- .../eclipse/jgit/api/CommitAndLogCommandTest.java | 11 +- .../org/eclipse/jgit/api/CommitCommandTest.java | 19 ++- .../tst/org/eclipse/jgit/api/FetchCommandTest.java | 4 +- .../tst/org/eclipse/jgit/api/MergeCommandTest.java | 59 ++++---- .../org/eclipse/jgit/api/RebaseCommandTest.java | 49 ++++--- .../tst/org/eclipse/jgit/api/ResetCommandTest.java | 27 ++-- .../org/eclipse/jgit/api/RevertCommandTest.java | 29 ++-- .../eclipse/jgit/api/StashCreateCommandTest.java | 4 +- .../org/eclipse/jgit/api/StashDropCommandTest.java | 20 +-- .../internal/storage/file/BatchRefUpdateTest.java | 2 +- .../internal/storage/file/FileReftableTest.java | 31 +++-- .../jgit/internal/storage/file/RefUpdateTest.java | 150 +++++++++++++-------- .../internal/storage/file/ReflogReaderTest.java | 27 ++-- .../tst/org/eclipse/jgit/lib/ReflogConfigTest.java | 19 +-- .../src/org/eclipse/jgit/api/ReflogCommand.java | 2 +- .../src/org/eclipse/jgit/api/StashDropCommand.java | 3 +- .../storage/file/FileReftableDatabase.java | 5 +- .../org/eclipse/jgit/internal/storage/file/GC.java | 2 +- .../src/org/eclipse/jgit/lib/Repository.java | 4 + 22 files changed, 288 insertions(+), 191 deletions(-) diff --git a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java index 850e895790..b0d17adb3a 100644 --- a/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java +++ b/org.eclipse.jgit.http.test/tst/org/eclipse/jgit/http/test/SmartClientSmartServerTest.java @@ -1728,7 +1728,8 @@ public class SmartClientSmartServerTest extends AllProtocolsHttpTestCase { assertEquals(Q, remoteRepository.exactRef(dstName).getObjectId()); fsck(remoteRepository, Q); - final ReflogReader log = remoteRepository.getReflogReader(dstName); + final ReflogReader log = remoteRepository.getRefDatabase() + .getReflogReader(dstName); assertNotNull("has log for " + dstName, log); final ReflogEntry last = log.getLastEntry(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java index be3b33a9c5..a9bd126ff3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java @@ -34,6 +34,7 @@ import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.ReflogReader; import org.eclipse.jgit.lib.RepositoryState; import org.eclipse.jgit.merge.ContentMergeStrategy; @@ -529,10 +530,11 @@ public class CherryPickCommandTest extends RepositoryTestCase { assertEquals(RepositoryState.SAFE, db.getRepositoryState()); if (reason == null) { - ReflogReader reader = db.getReflogReader(Constants.HEAD); + RefDatabase refDb = db.getRefDatabase(); + ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("cherry-pick: ")); - reader = db.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("cherry-pick: ")); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java index db5b27c2ab..f70ada4e30 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java @@ -182,7 +182,8 @@ public class CloneCommandTest extends RepositoryTestCase { private static boolean hasRefLog(Repository repo, Ref ref) { try { - return repo.getReflogReader(ref.getName()).getLastEntry() != null; + return repo.getRefDatabase().getReflogReader(ref.getName()) + .getLastEntry() != null; } catch (IOException ioe) { throw new IllegalStateException(ioe); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java index 57e5d4958f..ced24b5928 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java @@ -26,6 +26,7 @@ import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.ReflogReader; import org.eclipse.jgit.revwalk.RevCommit; @@ -69,10 +70,11 @@ public class CommitAndLogCommandTest extends RepositoryTestCase { l--; } assertEquals(l, -1); - ReflogReader reader = db.getReflogReader(Constants.HEAD); + RefDatabase refDb = db.getRefDatabase(); + ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue( reader.getLastEntry().getComment().startsWith("commit:")); - reader = db.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getBranch()); assertTrue( reader.getLastEntry().getComment().startsWith("commit:")); } @@ -248,10 +250,11 @@ public class CommitAndLogCommandTest extends RepositoryTestCase { c++; } assertEquals(1, c); - ReflogReader reader = db.getReflogReader(Constants.HEAD); + RefDatabase refDb = db.getRefDatabase(); + ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("commit (amend):")); - reader = db.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("commit (amend):")); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java index 2cbd223ee8..d40df26690 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java @@ -435,10 +435,12 @@ public class CommitCommandTest extends RepositoryTestCase { assertEquals(1, squashedCommit.getParentCount()); assertNull(db.readSquashCommitMsg()); - assertEquals("commit: Squashed commit of the following:", db - .getReflogReader(Constants.HEAD).getLastEntry().getComment()); - assertEquals("commit: Squashed commit of the following:", db - .getReflogReader(db.getBranch()).getLastEntry().getComment()); + assertEquals("commit: Squashed commit of the following:", + db.getRefDatabase().getReflogReader(Constants.HEAD) + .getLastEntry().getComment()); + assertEquals("commit: Squashed commit of the following:", + db.getRefDatabase().getReflogReader(db.getBranch()) + .getLastEntry().getComment()); } } @@ -455,12 +457,15 @@ public class CommitCommandTest extends RepositoryTestCase { git.commit().setMessage("c3").setAll(true) .setReflogComment("testRl").call(); - db.getReflogReader(Constants.HEAD).getReverseEntries(); + db.getRefDatabase().getReflogReader(Constants.HEAD) + .getReverseEntries(); assertEquals("testRl;commit (initial): c1;", reflogComments( - db.getReflogReader(Constants.HEAD).getReverseEntries())); + db.getRefDatabase().getReflogReader(Constants.HEAD) + .getReverseEntries())); assertEquals("testRl;commit (initial): c1;", reflogComments( - db.getReflogReader(db.getBranch()).getReverseEntries())); + db.getRefDatabase().getReflogReader(db.getBranch()) + .getReverseEntries())); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/FetchCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/FetchCommandTest.java index 3ec454cfc3..3731347f11 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/FetchCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/FetchCommandTest.java @@ -92,8 +92,8 @@ public class FetchCommandTest extends RepositoryTestCase { assertTrue(remoteRef.getName().startsWith(Constants.R_REMOTES)); assertEquals(defaultBranchSha1, remoteRef.getObjectId()); - assertNotNull(git.getRepository().getReflogReader(remoteRef.getName()) - .getLastEntry()); + assertNotNull(git.getRepository().getRefDatabase() + .getReflogReader(remoteRef.getName()).getLastEntry()); } @Test diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java index 917b6c3297..ba13f8ac1f 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java @@ -33,6 +33,7 @@ import org.eclipse.jgit.junit.TestRepository; import org.eclipse.jgit.junit.TestRepository.BranchBuilder; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryState; import org.eclipse.jgit.lib.Sets; @@ -76,11 +77,10 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(MergeResult.MergeStatus.ALREADY_UP_TO_DATE, result.getMergeStatus()); } // no reflog entry written by merge - assertEquals("commit (initial): initial commit", - db + RefDatabase refDb = db.getRefDatabase(); + assertEquals("commit (initial): initial commit", refDb .getReflogReader(Constants.HEAD).getLastEntry().getComment()); - assertEquals("commit (initial): initial commit", - db + assertEquals("commit (initial): initial commit", refDb .getReflogReader(db.getBranch()).getLastEntry().getComment()); } @@ -96,9 +96,9 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(second, result.getNewHead()); } // no reflog entry written by merge - assertEquals("commit: second commit", db + assertEquals("commit: second commit", db.getRefDatabase() .getReflogReader(Constants.HEAD).getLastEntry().getComment()); - assertEquals("commit: second commit", db + assertEquals("commit: second commit", db.getRefDatabase() .getReflogReader(db.getBranch()).getLastEntry().getComment()); } @@ -117,10 +117,13 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(MergeResult.MergeStatus.FAST_FORWARD, result.getMergeStatus()); assertEquals(second, result.getNewHead()); } + RefDatabase refDb = db.getRefDatabase(); assertEquals("merge refs/heads/master: Fast-forward", - db.getReflogReader(Constants.HEAD).getLastEntry().getComment()); + refDb.getReflogReader(Constants.HEAD) + .getLastEntry().getComment()); assertEquals("merge refs/heads/master: Fast-forward", - db.getReflogReader(db.getBranch()).getLastEntry().getComment()); + refDb.getReflogReader(db.getBranch()) + .getLastEntry().getComment()); } @Test @@ -140,9 +143,10 @@ public class MergeCommandTest extends RepositoryTestCase { result.getMergeStatus()); assertEquals(second, result.getNewHead()); } - assertEquals("merge refs/heads/master: Fast-forward", db + RefDatabase refDb = db.getRefDatabase(); + assertEquals("merge refs/heads/master: Fast-forward", refDb .getReflogReader(Constants.HEAD).getLastEntry().getComment()); - assertEquals("merge refs/heads/master: Fast-forward", db + assertEquals("merge refs/heads/master: Fast-forward", refDb .getReflogReader(db.getBranch()).getLastEntry().getComment()); } @@ -171,10 +175,11 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(MergeResult.MergeStatus.FAST_FORWARD, result.getMergeStatus()); assertEquals(second, result.getNewHead()); } - assertEquals("merge refs/heads/master: Fast-forward", - db.getReflogReader(Constants.HEAD).getLastEntry().getComment()); - assertEquals("merge refs/heads/master: Fast-forward", - db.getReflogReader(db.getBranch()).getLastEntry().getComment()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals("merge refs/heads/master: Fast-forward", refDb + .getReflogReader(Constants.HEAD).getLastEntry().getComment()); + assertEquals("merge refs/heads/master: Fast-forward", refDb + .getReflogReader(db.getBranch()).getLastEntry().getComment()); } @Test @@ -229,14 +234,17 @@ public class MergeCommandTest extends RepositoryTestCase { .include(db.exactRef(R_HEADS + MASTER)).call(); assertEquals(MergeStatus.MERGED, result.getMergeStatus()); } + RefDatabase refDb = db.getRefDatabase(); assertEquals( "merge refs/heads/master: Merge made by " + mergeStrategy.getName() + ".", - db.getReflogReader(Constants.HEAD).getLastEntry().getComment()); + refDb.getReflogReader(Constants.HEAD).getLastEntry() + .getComment()); assertEquals( "merge refs/heads/master: Merge made by " + mergeStrategy.getName() + ".", - db.getReflogReader(db.getBranch()).getLastEntry().getComment()); + refDb.getReflogReader(db.getBranch()).getLastEntry() + .getComment()); } @Theory @@ -662,14 +670,17 @@ public class MergeCommandTest extends RepositoryTestCase { .setStrategy(MergeStrategy.RESOLVE).call(); assertEquals(MergeStatus.MERGED, result.getMergeStatus()); assertEquals("1\nb(1)\n3\n", read(new File(db.getWorkTree(), "b"))); - assertEquals("merge " + secondCommit.getId().getName() - + ": Merge made by resolve.", db - .getReflogReader(Constants.HEAD) - .getLastEntry().getComment()); - assertEquals("merge " + secondCommit.getId().getName() - + ": Merge made by resolve.", db - .getReflogReader(db.getBranch()) - .getLastEntry().getComment()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals( + "merge " + secondCommit.getId().getName() + + ": Merge made by resolve.", + refDb.getReflogReader(Constants.HEAD).getLastEntry() + .getComment()); + assertEquals( + "merge " + secondCommit.getId().getName() + + ": Merge made by resolve.", + refDb.getReflogReader(db.getBranch()).getLastEntry() + .getComment()); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java index 84aa4b58a8..4c8cf06a67 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RebaseCommandTest.java @@ -57,6 +57,7 @@ import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.RebaseTodoLine; import org.eclipse.jgit.lib.RebaseTodoLine.Action; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.ReflogEntry; import org.eclipse.jgit.lib.RepositoryState; @@ -133,11 +134,12 @@ public class RebaseCommandTest extends RepositoryTestCase { checkFile(file2, "file2"); assertEquals(Status.FAST_FORWARD, res.getStatus()); - List headLog = db.getReflogReader(Constants.HEAD) + RefDatabase refDb = db.getRefDatabase(); + List headLog = refDb.getReflogReader(Constants.HEAD) .getReverseEntries(); - List topicLog = db.getReflogReader("refs/heads/topic") + List topicLog = refDb.getReflogReader("refs/heads/topic") .getReverseEntries(); - List masterLog = db.getReflogReader("refs/heads/master") + List masterLog = refDb.getReflogReader("refs/heads/master") .getReverseEntries(); assertEquals("rebase finished: returning to refs/heads/topic", headLog .get(0).getComment()); @@ -179,11 +181,12 @@ public class RebaseCommandTest extends RepositoryTestCase { checkFile(file2, "file2 new content"); assertEquals(Status.FAST_FORWARD, res.getStatus()); - List headLog = db.getReflogReader(Constants.HEAD) + RefDatabase refDb = db.getRefDatabase(); + List headLog = refDb.getReflogReader(Constants.HEAD) .getReverseEntries(); - List topicLog = db.getReflogReader("refs/heads/topic") + List topicLog = refDb.getReflogReader("refs/heads/topic") .getReverseEntries(); - List masterLog = db.getReflogReader("refs/heads/master") + List masterLog = refDb.getReflogReader("refs/heads/master") .getReverseEntries(); assertEquals("rebase finished: returning to refs/heads/topic", headLog .get(0).getComment()); @@ -447,13 +450,14 @@ public class RebaseCommandTest extends RepositoryTestCase { assertEquals(a, rw.next()); } - List headLog = db.getReflogReader(Constants.HEAD) + RefDatabase refDb = db.getRefDatabase(); + List headLog = refDb.getReflogReader(Constants.HEAD) .getReverseEntries(); - List sideLog = db.getReflogReader("refs/heads/side") + List sideLog = refDb.getReflogReader("refs/heads/side") .getReverseEntries(); - List topicLog = db.getReflogReader("refs/heads/topic") + List topicLog = refDb.getReflogReader("refs/heads/topic") .getReverseEntries(); - List masterLog = db.getReflogReader("refs/heads/master") + List masterLog = refDb.getReflogReader("refs/heads/master") .getReverseEntries(); assertEquals("rebase finished: returning to refs/heads/topic", headLog .get(0).getComment()); @@ -768,9 +772,10 @@ public class RebaseCommandTest extends RepositoryTestCase { RebaseResult result = git.rebase().setUpstream(parent).call(); assertEquals(Status.UP_TO_DATE, result.getStatus()); - assertEquals(2, db.getReflogReader(Constants.HEAD).getReverseEntries() - .size()); - assertEquals(2, db.getReflogReader("refs/heads/master") + RefDatabase refDb = db.getRefDatabase(); + assertEquals(2, refDb.getReflogReader(Constants.HEAD) + .getReverseEntries().size()); + assertEquals(2, refDb.getReflogReader("refs/heads/master") .getReverseEntries().size()); } @@ -786,9 +791,10 @@ public class RebaseCommandTest extends RepositoryTestCase { RebaseResult res = git.rebase().setUpstream(first).call(); assertEquals(Status.UP_TO_DATE, res.getStatus()); - assertEquals(1, db.getReflogReader(Constants.HEAD).getReverseEntries() - .size()); - assertEquals(1, db.getReflogReader("refs/heads/master") + RefDatabase refDb = db.getRefDatabase(); + assertEquals(1, refDb.getReflogReader(Constants.HEAD) + .getReverseEntries().size()); + assertEquals(1, refDb.getReflogReader("refs/heads/master") .getReverseEntries().size()); } @@ -846,11 +852,12 @@ public class RebaseCommandTest extends RepositoryTestCase { db.resolve(Constants.HEAD)).getParent(0)); } assertEquals(origHead, db.readOrigHead()); - List headLog = db.getReflogReader(Constants.HEAD) + RefDatabase refDb = db.getRefDatabase(); + List headLog = refDb.getReflogReader(Constants.HEAD) .getReverseEntries(); - List topicLog = db.getReflogReader("refs/heads/topic") + List topicLog = refDb.getReflogReader("refs/heads/topic") .getReverseEntries(); - List masterLog = db.getReflogReader("refs/heads/master") + List masterLog = refDb.getReflogReader("refs/heads/master") .getReverseEntries(); assertEquals(2, masterLog.size()); assertEquals(3, topicLog.size()); @@ -898,8 +905,8 @@ public class RebaseCommandTest extends RepositoryTestCase { db.resolve(Constants.HEAD)).getParent(0)); } - List headLog = db.getReflogReader(Constants.HEAD) - .getReverseEntries(); + List headLog = db.getRefDatabase() + .getReflogReader(Constants.HEAD).getReverseEntries(); assertEquals(8, headLog.size()); assertEquals("rebase: change file1 in topic", headLog.get(0) .getComment()); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java index 8a479a0ca0..4265806078 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java @@ -36,6 +36,7 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; @@ -557,43 +558,45 @@ public class ResetCommandTest extends RepositoryTestCase { private void assertReflog(ObjectId prevHead, ObjectId head) throws IOException { // Check the reflog for HEAD - String actualHeadMessage = db.getReflogReader(Constants.HEAD) + RefDatabase refDb = db.getRefDatabase(); + String actualHeadMessage = refDb.getReflogReader(Constants.HEAD) .getLastEntry().getComment(); String expectedHeadMessage = head.getName() + ": updating HEAD"; assertEquals(expectedHeadMessage, actualHeadMessage); - assertEquals(head.getName(), db.getReflogReader(Constants.HEAD) + assertEquals(head.getName(), refDb.getReflogReader(Constants.HEAD) .getLastEntry().getNewId().getName()); - assertEquals(prevHead.getName(), db.getReflogReader(Constants.HEAD) + assertEquals(prevHead.getName(), refDb.getReflogReader(Constants.HEAD) .getLastEntry().getOldId().getName()); // The reflog for master contains the same as the one for HEAD - String actualMasterMessage = db.getReflogReader("refs/heads/master") + String actualMasterMessage = refDb.getReflogReader("refs/heads/master") .getLastEntry().getComment(); String expectedMasterMessage = head.getName() + ": updating HEAD"; // yes! assertEquals(expectedMasterMessage, actualMasterMessage); - assertEquals(head.getName(), db.getReflogReader(Constants.HEAD) + assertEquals(head.getName(), refDb.getReflogReader(Constants.HEAD) .getLastEntry().getNewId().getName()); - assertEquals(prevHead.getName(), db - .getReflogReader("refs/heads/master").getLastEntry().getOldId() - .getName()); + assertEquals(prevHead.getName(), + refDb.getReflogReader("refs/heads/master").getLastEntry() + .getOldId().getName()); } private void assertReflogDisabled(ObjectId head) throws IOException { + RefDatabase refDb = db.getRefDatabase(); // Check the reflog for HEAD - String actualHeadMessage = db.getReflogReader(Constants.HEAD) + String actualHeadMessage = refDb.getReflogReader(Constants.HEAD) .getLastEntry().getComment(); String expectedHeadMessage = "commit: adding a.txt and dir/b.txt"; assertEquals(expectedHeadMessage, actualHeadMessage); - assertEquals(head.getName(), db.getReflogReader(Constants.HEAD) + assertEquals(head.getName(), refDb.getReflogReader(Constants.HEAD) .getLastEntry().getOldId().getName()); // The reflog for master contains the same as the one for HEAD - String actualMasterMessage = db.getReflogReader("refs/heads/master") + String actualMasterMessage = refDb.getReflogReader("refs/heads/master") .getLastEntry().getComment(); String expectedMasterMessage = "commit: adding a.txt and dir/b.txt"; assertEquals(expectedMasterMessage, actualMasterMessage); - assertEquals(head.getName(), db.getReflogReader(Constants.HEAD) + assertEquals(head.getName(), refDb.getReflogReader(Constants.HEAD) .getLastEntry().getOldId().getName()); } /** diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java index afd6708d21..e4d0eb76f7 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java @@ -29,6 +29,7 @@ import org.eclipse.jgit.junit.RepositoryTestCase; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.ReflogReader; import org.eclipse.jgit.lib.RepositoryState; import org.eclipse.jgit.merge.ResolveMerger.MergeFailureReason; @@ -87,10 +88,11 @@ public class RevertCommandTest extends RepositoryTestCase { assertEquals("create a", history.next().getFullMessage()); assertFalse(history.hasNext()); - ReflogReader reader = db.getReflogReader(Constants.HEAD); + RefDatabase refDb = db.getRefDatabase(); + ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); - reader = db.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); } @@ -170,10 +172,11 @@ public class RevertCommandTest extends RepositoryTestCase { assertEquals("add first", history.next().getFullMessage()); assertFalse(history.hasNext()); - ReflogReader reader = db.getReflogReader(Constants.HEAD); + RefDatabase refDb = db.getRefDatabase(); + ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); - reader = db.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); } @@ -223,10 +226,11 @@ public class RevertCommandTest extends RepositoryTestCase { assertEquals("add first", history.next().getFullMessage()); assertFalse(history.hasNext()); - ReflogReader reader = db.getReflogReader(Constants.HEAD); + RefDatabase refDb = db.getRefDatabase(); + ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); - reader = db.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); } @@ -431,12 +435,13 @@ public class RevertCommandTest extends RepositoryTestCase { assertEquals(RepositoryState.SAFE, db.getRepositoryState()); if (reason == null) { - ReflogReader reader = db.getReflogReader(Constants.HEAD); - assertTrue(reader.getLastEntry().getComment() - .startsWith("revert: ")); - reader = db.getReflogReader(db.getBranch()); - assertTrue(reader.getLastEntry().getComment() - .startsWith("revert: ")); + RefDatabase refDb = db.getRefDatabase(); + ReflogReader reader = refDb.getReflogReader(Constants.HEAD); + assertTrue( + reader.getLastEntry().getComment().startsWith("revert: ")); + reader = refDb.getReflogReader(db.getBranch()); + assertTrue( + reader.getLastEntry().getComment().startsWith("revert: ")); } } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashCreateCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashCreateCommandTest.java index 5d0ab05174..18cd21a5d7 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashCreateCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashCreateCommandTest.java @@ -409,8 +409,8 @@ public class StashCreateCommandTest extends RepositoryTestCase { assertEquals("content", read(committedFile)); validateStashedCommit(stashed); - ReflogReader reader = git.getRepository().getReflogReader( - Constants.R_STASH); + ReflogReader reader = git.getRepository().getRefDatabase() + .getReflogReader(Constants.R_STASH); ReflogEntry entry = reader.getLastEntry(); assertNotNull(entry); assertEquals(ObjectId.zeroId(), entry.getOldId()); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashDropCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashDropCommandTest.java index c81731d746..d937579283 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashDropCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/StashDropCommandTest.java @@ -92,8 +92,8 @@ public class StashDropCommandTest extends RepositoryTestCase { stashRef = git.getRepository().exactRef(Constants.R_STASH); assertNull(stashRef); - ReflogReader reader = git.getRepository().getReflogReader( - Constants.R_STASH); + ReflogReader reader = git.getRepository().getRefDatabase() + .getReflogReader(Constants.R_STASH); assertNull(reader); } @@ -120,8 +120,8 @@ public class StashDropCommandTest extends RepositoryTestCase { assertNull(git.stashDrop().setAll(true).call()); assertNull(git.getRepository().exactRef(Constants.R_STASH)); - ReflogReader reader = git.getRepository().getReflogReader( - Constants.R_STASH); + ReflogReader reader = git.getRepository().getRefDatabase() + .getReflogReader(Constants.R_STASH); assertNull(reader); } @@ -150,8 +150,8 @@ public class StashDropCommandTest extends RepositoryTestCase { assertNotNull(stashRef); assertEquals(firstStash, stashRef.getObjectId()); - ReflogReader reader = git.getRepository().getReflogReader( - Constants.R_STASH); + ReflogReader reader = git.getRepository().getRefDatabase() + .getReflogReader(Constants.R_STASH); List entries = reader.getReverseEntries(); assertEquals(1, entries.size()); assertEquals(ObjectId.zeroId(), entries.get(0).getOldId()); @@ -192,8 +192,8 @@ public class StashDropCommandTest extends RepositoryTestCase { assertNotNull(stashRef); assertEquals(thirdStash, stashRef.getObjectId()); - ReflogReader reader = git.getRepository().getReflogReader( - Constants.R_STASH); + ReflogReader reader = git.getRepository().getRefDatabase() + .getReflogReader(Constants.R_STASH); List entries = reader.getReverseEntries(); assertEquals(2, entries.size()); assertEquals(ObjectId.zeroId(), entries.get(1).getOldId()); @@ -250,8 +250,8 @@ public class StashDropCommandTest extends RepositoryTestCase { assertNotNull(stashRef); assertEquals(thirdStash, stashRef.getObjectId()); - ReflogReader reader = git.getRepository().getReflogReader( - Constants.R_STASH); + ReflogReader reader = git.getRepository().getRefDatabase() + .getReflogReader(Constants.R_STASH); List entries = reader.getReverseEntries(); assertEquals(2, entries.size()); assertEquals(ObjectId.zeroId(), entries.get(1).getOldId()); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java index 1af42cb229..a0afc3ef13 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/BatchRefUpdateTest.java @@ -1263,7 +1263,7 @@ public class BatchRefUpdateTest extends LocalDiskRepositoryTestCase { } private ReflogEntry getLastReflog(String name) throws IOException { - ReflogReader r = diskRepo.getReflogReader(name); + ReflogReader r = diskRepo.getRefDatabase().getReflogReader(name); if (r == null) { return null; } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java index 01cbcfd20f..758ee93c30 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java @@ -171,7 +171,8 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { v.update(); db.convertToPackedRefs(true, false); - List logs = db.getReflogReader("refs/heads/master").getReverseEntries(2); + List logs = db.getRefDatabase() + .getReflogReader("refs/heads/master").getReverseEntries(2); assertEquals("banana", logs.get(0).getComment()); assertEquals("apple", logs.get(1).getComment()); } @@ -185,8 +186,9 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { ReceiveCommand rc1 = new ReceiveCommand(ObjectId.zeroId(), cur, "refs/heads/batch1"); ReceiveCommand rc2 = new ReceiveCommand(ObjectId.zeroId(), prev, "refs/heads/batch2"); String msg = "message"; + RefDatabase refDb = db.getRefDatabase(); try (RevWalk rw = new RevWalk(db)) { - db.getRefDatabase().newBatchUpdate() + refDb.newBatchUpdate() .addCommand(rc1, rc2) .setAtomic(true) .setRefLogIdent(person) @@ -197,12 +199,14 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { assertEquals(ReceiveCommand.Result.OK, rc1.getResult()); assertEquals(ReceiveCommand.Result.OK, rc2.getResult()); - ReflogEntry e = db.getReflogReader("refs/heads/batch1").getLastEntry(); + ReflogEntry e = refDb.getReflogReader("refs/heads/batch1") + .getLastEntry(); assertEquals(msg, e.getComment()); assertEquals(person, e.getWho()); assertEquals(cur, e.getNewId()); - e = db.getReflogReader("refs/heads/batch2").getLastEntry(); + e = refDb.getReflogReader("refs/heads/batch2") + .getLastEntry(); assertEquals(msg, e.getComment()); assertEquals(person, e.getWho()); assertEquals(prev, e.getNewId()); @@ -309,7 +313,7 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { // the branch HEAD referred to is left untouched assertEquals(pid, db.resolve("refs/heads/master")); - ReflogReader reflogReader = db.getReflogReader("HEAD"); + ReflogReader reflogReader = db.getRefDatabase().getReflogReader("HEAD"); ReflogEntry e = reflogReader.getReverseEntries().get(0); assertEquals(ppid, e.getNewId()); assertEquals("GIT_COMMITTER_EMAIL", e.getWho().getEmailAddress()); @@ -330,7 +334,8 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { updateRef.setForceUpdate(true); RefUpdate.Result update = updateRef.update(); assertEquals(FORCED, update); // internal - ReflogReader r = db.getReflogReader("refs/heads/master"); + ReflogReader r = db.getRefDatabase() + .getReflogReader("refs/heads/master"); ReflogEntry e = r.getLastEntry(); assertEquals(pid, e.getNewId()); @@ -355,7 +360,8 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { assertEquals(RefUpdate.Result.NO_CHANGE, ref.delete()); // Differs from RefupdateTest. Deleting a loose ref leaves reflog trail. - ReflogReader reader = db.getReflogReader("refs/heads/abc"); + ReflogReader reader = db.getRefDatabase() + .getReflogReader("refs/heads/abc"); assertEquals(ObjectId.zeroId(), reader.getReverseEntry(1).getOldId()); assertEquals(nonZero, reader.getReverseEntry(1).getNewId()); assertEquals(nonZero, reader.getReverseEntry(0).getOldId()); @@ -382,8 +388,9 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { assertNotSame(newid, r.getObjectId()); assertSame(ObjectId.class, r.getObjectId().getClass()); assertEquals(newid, r.getObjectId()); - List reverseEntries1 = db.getReflogReader("refs/heads/abc") - .getReverseEntries(); + RefDatabase refDb = db.getRefDatabase(); + List reverseEntries1 = refDb + .getReflogReader("refs/heads/abc").getReverseEntries(); ReflogEntry entry1 = reverseEntries1.get(0); assertEquals(1, reverseEntries1.size()); assertEquals(ObjectId.zeroId(), entry1.getOldId()); @@ -392,7 +399,7 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { assertEquals(new PersonIdent(db).toString(), entry1.getWho().toString()); assertEquals("", entry1.getComment()); - List reverseEntries2 = db.getReflogReader("HEAD") + List reverseEntries2 = refDb.getReflogReader("HEAD") .getReverseEntries(); assertEquals(0, reverseEntries2.size()); } @@ -455,7 +462,7 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { // the branch HEAD referred to is left untouched assertNull(db.resolve("refs/heads/unborn")); - ReflogReader reflogReader = db.getReflogReader("HEAD"); + ReflogReader reflogReader = db.getRefDatabase().getReflogReader("HEAD"); ReflogEntry e = reflogReader.getReverseEntries().get(0); assertEquals(ObjectId.zeroId(), e.getOldId()); assertEquals(ppid, e.getNewId()); @@ -499,7 +506,7 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { names.add("refs/heads/new/name"); for (String nm : names) { - ReflogReader rd = db.getReflogReader(nm); + ReflogReader rd = db.getRefDatabase().getReflogReader(nm); assertNotNull(rd); ReflogEntry last = rd.getLastEntry(); ObjectId id = last.getNewId(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java index cb977bd601..0a9aa40d04 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java @@ -40,6 +40,7 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectInserter; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.RefRename; import org.eclipse.jgit.lib.RefUpdate; import org.eclipse.jgit.lib.RefUpdate.Result; @@ -111,16 +112,17 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertNotSame(newid, r.getObjectId()); assertSame(ObjectId.class, r.getObjectId().getClass()); assertEquals(newid, r.getObjectId()); - List reverseEntries1 = db + List reverseEntries1 = db.getRefDatabase() .getReflogReader("refs/heads/abc").getReverseEntries(); ReflogEntry entry1 = reverseEntries1.get(0); assertEquals(1, reverseEntries1.size()); assertEquals(ObjectId.zeroId(), entry1.getOldId()); assertEquals(r.getObjectId(), entry1.getNewId()); - assertEquals(new PersonIdent(db).toString(), entry1.getWho().toString()); + assertEquals(new PersonIdent(db).toString(), + entry1.getWho().toString()); assertEquals("", entry1.getComment()); - List reverseEntries2 = db.getReflogReader("HEAD") - .getReverseEntries(); + List reverseEntries2 = db.getRefDatabase() + .getReflogReader("HEAD").getReverseEntries(); assertEquals(0, reverseEntries2.size()); } @@ -136,8 +138,11 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { final RefUpdate ru2 = updateRef(newRef2); Result update2 = ru2.update(); assertEquals(Result.LOCK_FAILURE, update2); - assertEquals(1, db.getReflogReader("refs/heads/z").getReverseEntries().size()); - assertEquals(0, db.getReflogReader("HEAD").getReverseEntries().size()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals(1, refDb.getReflogReader("refs/heads/z") + .getReverseEntries().size()); + assertEquals(0, + refDb.getReflogReader("HEAD").getReverseEntries().size()); } @Test @@ -147,8 +152,10 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { final RefUpdate ru = updateRef(newRef); Result update = ru.update(); assertEquals(Result.LOCK_FAILURE, update); - assertNull(db.getReflogReader("refs/heads/master/x")); - assertEquals(0, db.getReflogReader("HEAD").getReverseEntries().size()); + RefDatabase refDb = db.getRefDatabase(); + assertNull(refDb.getReflogReader("refs/heads/master/x")); + assertEquals(0, + refDb.getReflogReader("HEAD").getReverseEntries().size()); } @Test @@ -163,9 +170,12 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { final RefUpdate ru2 = updateRef(newRef2); Result update2 = ru2.update(); assertEquals(Result.LOCK_FAILURE, update2); - assertEquals(1, db.getReflogReader("refs/heads/z/a").getReverseEntries().size()); - assertNull(db.getReflogReader("refs/heads/z")); - assertEquals(0, db.getReflogReader("HEAD").getReverseEntries().size()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals(1, refDb.getReflogReader("refs/heads/z/a") + .getReverseEntries().size()); + assertNull(refDb.getReflogReader("refs/heads/z")); + assertEquals(0, + refDb.getReflogReader("HEAD").getReverseEntries().size()); } @Test @@ -175,8 +185,10 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { final RefUpdate ru = updateRef(newRef); Result update = ru.update(); assertEquals(Result.LOCK_FAILURE, update); - assertNull(db.getReflogReader("refs/heads/prefix")); - assertEquals(0, db.getReflogReader("HEAD").getReverseEntries().size()); + RefDatabase refDb = db.getRefDatabase(); + assertNull(refDb.getReflogReader("refs/heads/prefix")); + assertEquals(0, + refDb.getReflogReader("HEAD").getReverseEntries().size()); } /** @@ -197,8 +209,11 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { Result delete = updateRef2.delete(); assertEquals(Result.REJECTED_CURRENT_BRANCH, delete); assertEquals(pid, db.resolve("refs/heads/master")); - assertEquals(1,db.getReflogReader("refs/heads/master").getReverseEntries().size()); - assertEquals(0,db.getReflogReader("HEAD").getReverseEntries().size()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals(1, refDb.getReflogReader("refs/heads/master") + .getReverseEntries().size()); + assertEquals(0, + refDb.getReflogReader("HEAD").getReverseEntries().size()); } @Test @@ -209,7 +224,8 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { updateRef.setForceUpdate(true); Result update = updateRef.update(); assertEquals(Result.FORCED, update); - assertEquals(1,db.getReflogReader("refs/heads/master").getReverseEntries().size()); + assertEquals(1, db.getRefDatabase().getReflogReader("refs/heads/master") + .getReverseEntries().size()); } @Test @@ -219,15 +235,18 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { ref.update(); // create loose ref ref = updateRef(newRef); // refresh delete(ref, Result.NO_CHANGE); - assertNull(db.getReflogReader("refs/heads/abc")); + assertNull(db.getRefDatabase().getReflogReader("refs/heads/abc")); } @Test public void testDeleteHead() throws IOException { final RefUpdate ref = updateRef(Constants.HEAD); delete(ref, Result.REJECTED_CURRENT_BRANCH, true, false); - assertEquals(0, db.getReflogReader("refs/heads/master").getReverseEntries().size()); - assertEquals(0, db.getReflogReader("HEAD").getReverseEntries().size()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals(0, refDb.getReflogReader("refs/heads/master") + .getReverseEntries().size()); + assertEquals(0, + refDb.getReflogReader("HEAD").getReverseEntries().size()); } @Test @@ -423,7 +442,7 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { // the branch HEAD referred to is left untouched assertEquals(pid, db.resolve("refs/heads/master")); - ReflogReader reflogReader = db.getReflogReader("HEAD"); + ReflogReader reflogReader = db.getRefDatabase().getReflogReader("HEAD"); ReflogEntry e = reflogReader.getReverseEntries().get(0); assertEquals(pid, e.getOldId()); assertEquals(ppid, e.getNewId()); @@ -453,7 +472,7 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { // the branch HEAD referred to is left untouched assertNull(db.resolve("refs/heads/unborn")); - ReflogReader reflogReader = db.getReflogReader("HEAD"); + ReflogReader reflogReader = db.getRefDatabase().getReflogReader("HEAD"); ReflogEntry e = reflogReader.getReverseEntries().get(0); assertEquals(ObjectId.zeroId(), e.getOldId()); assertEquals(ppid, e.getNewId()); @@ -691,9 +710,11 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertEquals(Result.RENAMED, result); assertEquals(rb, db.resolve("refs/heads/new/name")); assertNull(db.resolve("refs/heads/b")); - assertEquals(1, db.getReflogReader("new/name").getReverseEntries().size()); - assertEquals("Branch: renamed b to new/name", db.getReflogReader("new/name") - .getLastEntry().getComment()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals(1, + refDb.getReflogReader("new/name").getReverseEntries().size()); + assertEquals("Branch: renamed b to new/name", + refDb.getReflogReader("new/name").getLastEntry().getComment()); assertFalse(new File(db.getDirectory(), "logs/refs/heads/b").exists()); assertEquals(oldHead, db.resolve(Constants.HEAD)); // unchanged } @@ -713,10 +734,12 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertEquals(Result.RENAMED, result); assertEquals(rb, db.resolve("refs/heads/new/name")); assertNull(db.resolve("refs/heads/b")); - assertEquals(2, db.getReflogReader("new/name").getReverseEntries().size()); - assertEquals("Branch: renamed b to new/name", db.getReflogReader("new/name") - .getLastEntry().getComment()); - assertEquals("Just a message", db.getReflogReader("new/name") + RefDatabase refDb = db.getRefDatabase(); + assertEquals(2, + refDb.getReflogReader("new/name").getReverseEntries().size()); + assertEquals("Branch: renamed b to new/name", + refDb.getReflogReader("new/name").getLastEntry().getComment()); + assertEquals("Just a message", refDb.getReflogReader("new/name") .getReverseEntries().get(1).getComment()); assertFalse(new File(db.getDirectory(), "logs/refs/heads/b").exists()); assertEquals(oldHead, db.resolve(Constants.HEAD)); // unchanged @@ -737,13 +760,18 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertEquals(Result.RENAMED, result); assertEquals(rb, db.resolve("refs/heads/new/name")); assertNull(db.resolve("refs/heads/b")); - assertEquals("Branch: renamed b to new/name", db.getReflogReader( - "new/name").getLastEntry().getComment()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals("Branch: renamed b to new/name", + refDb.getReflogReader("new/name").getLastEntry().getComment()); assertFalse(new File(db.getDirectory(), "logs/refs/heads/b").exists()); assertEquals(rb, db.resolve(Constants.HEAD)); - assertEquals(2, db.getReflogReader("new/name").getReverseEntries().size()); - assertEquals("Branch: renamed b to new/name", db.getReflogReader("new/name").getReverseEntries().get(0).getComment()); - assertEquals("Just a message", db.getReflogReader("new/name").getReverseEntries().get(1).getComment()); + assertEquals(2, + refDb.getReflogReader("new/name").getReverseEntries().size()); + assertEquals("Branch: renamed b to new/name", + refDb.getReflogReader("new/name").getReverseEntries().get(0) + .getComment()); + assertEquals("Just a message", refDb.getReflogReader("new/name") + .getReverseEntries().get(1).getComment()); } @Test @@ -766,11 +794,16 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertEquals(Result.RENAMED, result); assertEquals(rb2, db.resolve("refs/heads/new/name")); assertNull(db.resolve("refs/heads/b")); - assertEquals("Branch: renamed b to new/name", db.getReflogReader( - "new/name").getLastEntry().getComment()); - assertEquals(3, db.getReflogReader("refs/heads/new/name").getReverseEntries().size()); - assertEquals("Branch: renamed b to new/name", db.getReflogReader("refs/heads/new/name").getReverseEntries().get(0).getComment()); - assertEquals(0, db.getReflogReader("HEAD").getReverseEntries().size()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals("Branch: renamed b to new/name", + refDb.getReflogReader("new/name").getLastEntry().getComment()); + assertEquals(3, refDb.getReflogReader("refs/heads/new/name") + .getReverseEntries().size()); + assertEquals("Branch: renamed b to new/name", + refDb.getReflogReader("refs/heads/new/name").getReverseEntries() + .get(0).getComment()); + assertEquals(0, + refDb.getReflogReader("HEAD").getReverseEntries().size()); // make sure b's log file is gone too. assertFalse(new File(db.getDirectory(), "logs/refs/heads/b").exists()); @@ -789,9 +822,10 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { ObjectId oldfromId = db.resolve(fromName); ObjectId oldHeadId = db.resolve(Constants.HEAD); writeReflog(db, oldfromId, "Just a message", fromName); - List oldFromLog = db + RefDatabase refDb = db.getRefDatabase(); + List oldFromLog = refDb .getReflogReader(fromName).getReverseEntries(); - List oldHeadLog = oldHeadId != null ? db + List oldHeadLog = oldHeadId != null ? refDb .getReflogReader(Constants.HEAD).getReverseEntries() : null; assertTrue("internal check, we have a log", new File(db.getDirectory(), @@ -818,10 +852,10 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertEquals(oldHeadId, db.resolve(Constants.HEAD)); assertEquals(oldfromId, db.resolve(fromName)); assertNull(db.resolve(toName)); - assertEquals(oldFromLog.toString(), db.getReflogReader(fromName) + assertEquals(oldFromLog.toString(), refDb.getReflogReader(fromName) .getReverseEntries().toString()); if (oldHeadId != null && oldHeadLog != null) - assertEquals(oldHeadLog.toString(), db.getReflogReader( + assertEquals(oldHeadLog.toString(), refDb.getReflogReader( Constants.HEAD).getReverseEntries().toString()); } finally { lockFile.unlock(); @@ -942,15 +976,17 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertEquals(Result.RENAMED, result); assertNull(db.resolve("refs/heads/a")); assertEquals(rb, db.resolve("refs/heads/a/b")); - assertEquals(3, db.getReflogReader("a/b").getReverseEntries().size()); - assertEquals("Branch: renamed a to a/b", db.getReflogReader("a/b") + RefDatabase refDb = db.getRefDatabase(); + assertEquals(3, + refDb.getReflogReader("a/b").getReverseEntries().size()); + assertEquals("Branch: renamed a to a/b", refDb.getReflogReader("a/b") .getReverseEntries().get(0).getComment()); - assertEquals("Just a message", db.getReflogReader("a/b") + assertEquals("Just a message", refDb.getReflogReader("a/b") .getReverseEntries().get(1).getComment()); - assertEquals("Setup", db.getReflogReader("a/b").getReverseEntries() + assertEquals("Setup", refDb.getReflogReader("a/b").getReverseEntries() .get(2).getComment()); // same thing was logged to HEAD - assertEquals("Branch: renamed a to a/b", db.getReflogReader("HEAD") + assertEquals("Branch: renamed a to a/b", refDb.getReflogReader("HEAD") .getReverseEntries().get(0).getComment()); } @@ -978,15 +1014,19 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertNull(db.resolve("refs/heads/prefix/a")); assertEquals(rb, db.resolve("refs/heads/prefix")); - assertEquals(3, db.getReflogReader("prefix").getReverseEntries().size()); - assertEquals("Branch: renamed prefix/a to prefix", db.getReflogReader( - "prefix").getReverseEntries().get(0).getComment()); - assertEquals("Just a message", db.getReflogReader("prefix") + RefDatabase refDb = db.getRefDatabase(); + assertEquals(3, + refDb.getReflogReader("prefix").getReverseEntries().size()); + assertEquals("Branch: renamed prefix/a to prefix", + refDb.getReflogReader("prefix").getReverseEntries().get(0) + .getComment()); + assertEquals("Just a message", refDb.getReflogReader("prefix") .getReverseEntries().get(1).getComment()); - assertEquals("Setup", db.getReflogReader("prefix").getReverseEntries() - .get(2).getComment()); - assertEquals("Branch: renamed prefix/a to prefix", db.getReflogReader( - "HEAD").getReverseEntries().get(0).getComment()); + assertEquals("Setup", refDb.getReflogReader("prefix") + .getReverseEntries().get(2).getComment()); + assertEquals("Branch: renamed prefix/a to prefix", + refDb.getReflogReader("HEAD").getReverseEntries().get(0) + .getComment()); } @Test diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java index eb521ff9eb..23c279eabe 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java @@ -27,6 +27,7 @@ import org.eclipse.jgit.lib.CheckoutEntry; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.PersonIdent; +import org.eclipse.jgit.lib.RefDatabase; import org.eclipse.jgit.lib.ReflogEntry; import org.eclipse.jgit.lib.ReflogReader; import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; @@ -154,18 +155,20 @@ public class ReflogReaderTest extends SampleDataRepositoryTestCase { setupReflog("logs/refs/heads/a", aLine); setupReflog("logs/refs/heads/master", masterLine); setupReflog("logs/HEAD", headLine); - assertEquals("branch: change to master", db.getReflogReader("master") - .getLastEntry().getComment()); - assertEquals("branch: change to a", db.getReflogReader("a") - .getLastEntry().getComment()); - assertEquals("branch: change to HEAD", db.getReflogReader("HEAD") - .getLastEntry().getComment()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals("branch: change to master", + refDb.getReflogReader("master").getLastEntry().getComment()); + assertEquals("branch: change to a", + refDb.getReflogReader("a").getLastEntry().getComment()); + assertEquals("branch: change to HEAD", + refDb.getReflogReader("HEAD").getLastEntry().getComment()); } @Test public void testReadLineWithMissingComment() throws Exception { setupReflog("logs/refs/heads/master", oneLineWithoutComment); - final ReflogReader reader = db.getReflogReader("master"); + final ReflogReader reader = db.getRefDatabase() + .getReflogReader("master"); ReflogEntry e = reader.getLastEntry(); assertEquals(ObjectId .fromString("da85355dfc525c9f6f3927b876f379f46ccf826e"), e @@ -183,15 +186,17 @@ public class ReflogReaderTest extends SampleDataRepositoryTestCase { @Test public void testNoLog() throws Exception { - assertEquals(0, db.getReflogReader("master").getReverseEntries().size()); - assertNull(db.getReflogReader("master").getLastEntry()); + RefDatabase refDb = db.getRefDatabase(); + assertEquals(0, + refDb.getReflogReader("master").getReverseEntries().size()); + assertNull(refDb.getReflogReader("master").getLastEntry()); } @Test public void testCheckout() throws Exception { setupReflog("logs/HEAD", switchBranch); - List entries = db.getReflogReader(Constants.HEAD) - .getReverseEntries(); + List entries = db.getRefDatabase() + .getReflogReader(Constants.HEAD).getReverseEntries(); assertEquals(1, entries.size()); ReflogEntry entry = entries.get(0); CheckoutEntry checkout = entry.parseCheckout(); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java index ad47cef0f4..a93937eeea 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ReflogConfigTest.java @@ -32,7 +32,8 @@ public class ReflogConfigTest extends RepositoryTestCase { // check that there are no entries in the reflog and turn off writing // reflogs - assertTrue(db.getReflogReader(Constants.HEAD).getReverseEntries() + RefDatabase refDb = db.getRefDatabase(); + assertTrue(refDb.getReflogReader(Constants.HEAD).getReverseEntries() .isEmpty()); FileBasedConfig cfg = db.getConfig(); cfg.setBoolean("core", null, "logallrefupdates", false); @@ -42,7 +43,7 @@ public class ReflogConfigTest extends RepositoryTestCase { // written commit("A Commit\n", commitTime, tz); commitTime = commitTime.plus(Duration.ofMinutes(1)); - assertTrue("Reflog for HEAD still contain no entry", db + assertTrue("Reflog for HEAD still contain no entry", refDb .getReflogReader(Constants.HEAD).getReverseEntries().isEmpty()); // set the logAllRefUpdates parameter to true and check it @@ -56,9 +57,9 @@ public class ReflogConfigTest extends RepositoryTestCase { // do one commit and check that reflog size is increased to 1 commit("A Commit\n", commitTime, tz); commitTime = commitTime.plus(Duration.ofMinutes(1)); - assertTrue( - "Reflog for HEAD should contain one entry", - db.getReflogReader(Constants.HEAD).getReverseEntries().size() == 1); + assertTrue("Reflog for HEAD should contain one entry", + refDb.getReflogReader(Constants.HEAD).getReverseEntries() + .size() == 1); // set the logAllRefUpdates parameter to false and check it cfg.setBoolean("core", null, "logallrefupdates", false); @@ -71,9 +72,9 @@ public class ReflogConfigTest extends RepositoryTestCase { // do one commit and check that reflog size is 2 commit("A Commit\n", commitTime, tz); commitTime = commitTime.plus(Duration.ofMinutes(1)); - assertTrue( - "Reflog for HEAD should contain two entries", - db.getReflogReader(Constants.HEAD).getReverseEntries().size() == 2); + assertTrue("Reflog for HEAD should contain two entries", + refDb.getReflogReader(Constants.HEAD).getReverseEntries() + .size() == 2); // set the logAllRefUpdates parameter to false and check it cfg.setEnum("core", null, "logallrefupdates", @@ -87,7 +88,7 @@ public class ReflogConfigTest extends RepositoryTestCase { // do one commit and check that reflog size is 3 commit("A Commit\n", commitTime, tz); assertTrue("Reflog for HEAD should contain three entries", - db.getReflogReader(Constants.HEAD).getReverseEntries() + refDb.getReflogReader(Constants.HEAD).getReverseEntries() .size() == 3); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java index dead2749b7..a149649004 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ReflogCommand.java @@ -68,7 +68,7 @@ public class ReflogCommand extends GitCommand> { checkCallable(); try { - ReflogReader reader = repo.getReflogReader(ref); + ReflogReader reader = repo.getRefDatabase().getReflogReader(ref); if (reader == null) throw new RefNotFoundException(MessageFormat.format( JGitText.get().refNotResolved, ref)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashDropCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashDropCommand.java index 23fbe0197f..2dba0ef0f2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/StashDropCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/StashDropCommand.java @@ -165,7 +165,8 @@ public class StashDropCommand extends GitCommand { List entries; try { - ReflogReader reader = repo.getReflogReader(R_STASH); + ReflogReader reader = repo.getRefDatabase() + .getReflogReader(R_STASH); if (reader == null) { throw new RefNotFoundException(MessageFormat .format(JGitText.get().refNotResolved, stashRef)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java index 81e8c0306d..3b09d3a82f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java @@ -563,9 +563,10 @@ public class FileReftableDatabase extends RefDatabase { boolean writeLogs) throws IOException { int size = 0; List refs = repo.getRefDatabase().getRefs(); + RefDatabase refDb = repo.getRefDatabase(); if (writeLogs) { for (Ref r : refs) { - ReflogReader rlr = repo.getReflogReader(r.getName()); + ReflogReader rlr = refDb.getReflogReader(r.getName()); if (rlr != null) { size = Math.max(rlr.getReverseEntries().size(), size); } @@ -588,7 +589,7 @@ public class FileReftableDatabase extends RefDatabase { if (writeLogs) { for (Ref r : refs) { long idx = size; - ReflogReader reader = repo.getReflogReader(r.getName()); + ReflogReader reader = refDb.getReflogReader(r.getName()); if (reader == null) { continue; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 09cf35a0cf..15679aa64e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1157,7 +1157,7 @@ public class GC { * if an IO error occurred */ private Set listRefLogObjects(Ref ref, long minTime) throws IOException { - ReflogReader reflogReader = repo.getReflogReader(ref); + ReflogReader reflogReader = repo.getRefDatabase().getReflogReader(ref); List rlEntries = reflogReader .getReverseEntries(); if (rlEntries == null || rlEntries.isEmpty()) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index a7bba23996..757473878b 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -1692,7 +1692,9 @@ public abstract class Repository implements AutoCloseable { * @throws java.io.IOException * the ref could not be accessed. * @since 3.0 + * @deprecated use {@code #getRefDatabase().getReflogReader(String)} instead */ + @Deprecated(since = "7.2") @Nullable public ReflogReader getReflogReader(String refName) throws IOException { return getRefDatabase().getReflogReader(refName); @@ -1708,7 +1710,9 @@ public abstract class Repository implements AutoCloseable { * @throws IOException * if an IO error occurred * @since 5.13.2 + * @deprecated use {@code #getRefDatabase().getReflogReader(Ref)} instead */ + @Deprecated(since = "7.2") @NonNull public ReflogReader getReflogReader(@NonNull Ref ref) throws IOException { -- cgit v1.2.3 From 7b8ddc2ce46500d1ee6e4a8b325dbf54262a88bb Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Sun, 5 Jan 2025 22:02:33 +0100 Subject: RefDatabase#getReflogReader(String): use #exactRef to resolve refName Don't accept short ref names anymore which is more predictable. Change-Id: I5e7323c610c68b25facd6f2286456716d8e6cf1a --- .../eclipse/jgit/api/CherryPickCommandTest.java | 2 +- .../tst/org/eclipse/jgit/api/CloneCommandTest.java | 2 +- .../eclipse/jgit/api/CommitAndLogCommandTest.java | 4 +- .../org/eclipse/jgit/api/CommitCommandTest.java | 4 +- .../tst/org/eclipse/jgit/api/MergeCommandTest.java | 18 +++--- .../org/eclipse/jgit/api/RevertCommandTest.java | 8 +-- .../jgit/internal/storage/file/RefUpdateTest.java | 68 ++++++++++++---------- .../internal/storage/file/ReflogReaderTest.java | 13 +++-- .../storage/file/FileReftableDatabase.java | 7 +-- .../src/org/eclipse/jgit/lib/RefDatabase.java | 4 +- 10 files changed, 70 insertions(+), 60 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java index a9bd126ff3..3f5c5da55a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java @@ -534,7 +534,7 @@ public class CherryPickCommandTest extends RepositoryTestCase { ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("cherry-pick: ")); - reader = refDb.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getFullBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("cherry-pick: ")); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java index f70ada4e30..f5fd73ba38 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java @@ -182,7 +182,7 @@ public class CloneCommandTest extends RepositoryTestCase { private static boolean hasRefLog(Repository repo, Ref ref) { try { - return repo.getRefDatabase().getReflogReader(ref.getName()) + return repo.getRefDatabase().getReflogReader(ref) .getLastEntry() != null; } catch (IOException ioe) { throw new IllegalStateException(ioe); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java index ced24b5928..4e5f44e5a6 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitAndLogCommandTest.java @@ -74,7 +74,7 @@ public class CommitAndLogCommandTest extends RepositoryTestCase { ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue( reader.getLastEntry().getComment().startsWith("commit:")); - reader = refDb.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getFullBranch()); assertTrue( reader.getLastEntry().getComment().startsWith("commit:")); } @@ -254,7 +254,7 @@ public class CommitAndLogCommandTest extends RepositoryTestCase { ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("commit (amend):")); - reader = refDb.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getFullBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("commit (amend):")); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java index d40df26690..21cfcc4e34 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CommitCommandTest.java @@ -439,7 +439,7 @@ public class CommitCommandTest extends RepositoryTestCase { db.getRefDatabase().getReflogReader(Constants.HEAD) .getLastEntry().getComment()); assertEquals("commit: Squashed commit of the following:", - db.getRefDatabase().getReflogReader(db.getBranch()) + db.getRefDatabase().getReflogReader(db.getFullBranch()) .getLastEntry().getComment()); } } @@ -464,7 +464,7 @@ public class CommitCommandTest extends RepositoryTestCase { db.getRefDatabase().getReflogReader(Constants.HEAD) .getReverseEntries())); assertEquals("testRl;commit (initial): c1;", reflogComments( - db.getRefDatabase().getReflogReader(db.getBranch()) + db.getRefDatabase().getReflogReader(db.getFullBranch()) .getReverseEntries())); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java index ba13f8ac1f..503fef9916 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java @@ -81,7 +81,8 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals("commit (initial): initial commit", refDb .getReflogReader(Constants.HEAD).getLastEntry().getComment()); assertEquals("commit (initial): initial commit", refDb - .getReflogReader(db.getBranch()).getLastEntry().getComment()); + .getReflogReader(db.getFullBranch()).getLastEntry() + .getComment()); } @Test @@ -99,7 +100,8 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals("commit: second commit", db.getRefDatabase() .getReflogReader(Constants.HEAD).getLastEntry().getComment()); assertEquals("commit: second commit", db.getRefDatabase() - .getReflogReader(db.getBranch()).getLastEntry().getComment()); + .getReflogReader(db.getFullBranch()).getLastEntry() + .getComment()); } @Test @@ -122,7 +124,7 @@ public class MergeCommandTest extends RepositoryTestCase { refDb.getReflogReader(Constants.HEAD) .getLastEntry().getComment()); assertEquals("merge refs/heads/master: Fast-forward", - refDb.getReflogReader(db.getBranch()) + refDb.getReflogReader(db.getFullBranch()) .getLastEntry().getComment()); } @@ -147,7 +149,8 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals("merge refs/heads/master: Fast-forward", refDb .getReflogReader(Constants.HEAD).getLastEntry().getComment()); assertEquals("merge refs/heads/master: Fast-forward", refDb - .getReflogReader(db.getBranch()).getLastEntry().getComment()); + .getReflogReader(db.getFullBranch()).getLastEntry() + .getComment()); } @Test @@ -179,7 +182,8 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals("merge refs/heads/master: Fast-forward", refDb .getReflogReader(Constants.HEAD).getLastEntry().getComment()); assertEquals("merge refs/heads/master: Fast-forward", refDb - .getReflogReader(db.getBranch()).getLastEntry().getComment()); + .getReflogReader(db.getFullBranch()).getLastEntry() + .getComment()); } @Test @@ -243,7 +247,7 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals( "merge refs/heads/master: Merge made by " + mergeStrategy.getName() + ".", - refDb.getReflogReader(db.getBranch()).getLastEntry() + refDb.getReflogReader(db.getFullBranch()).getLastEntry() .getComment()); } @@ -679,7 +683,7 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals( "merge " + secondCommit.getId().getName() + ": Merge made by resolve.", - refDb.getReflogReader(db.getBranch()).getLastEntry() + refDb.getReflogReader(db.getFullBranch()).getLastEntry() .getComment()); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java index e4d0eb76f7..89fdb32220 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RevertCommandTest.java @@ -92,7 +92,7 @@ public class RevertCommandTest extends RepositoryTestCase { ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); - reader = refDb.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getFullBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); } @@ -176,7 +176,7 @@ public class RevertCommandTest extends RepositoryTestCase { ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); - reader = refDb.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getFullBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); } @@ -230,7 +230,7 @@ public class RevertCommandTest extends RepositoryTestCase { ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); - reader = refDb.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getFullBranch()); assertTrue(reader.getLastEntry().getComment() .startsWith("revert: Revert \"")); } @@ -439,7 +439,7 @@ public class RevertCommandTest extends RepositoryTestCase { ReflogReader reader = refDb.getReflogReader(Constants.HEAD); assertTrue( reader.getLastEntry().getComment().startsWith("revert: ")); - reader = refDb.getReflogReader(db.getBranch()); + reader = refDb.getReflogReader(db.getFullBranch()); assertTrue( reader.getLastEntry().getComment().startsWith("revert: ")); } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java index 0a9aa40d04..acc36d76f4 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/RefUpdateTest.java @@ -711,10 +711,11 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertEquals(rb, db.resolve("refs/heads/new/name")); assertNull(db.resolve("refs/heads/b")); RefDatabase refDb = db.getRefDatabase(); - assertEquals(1, - refDb.getReflogReader("new/name").getReverseEntries().size()); + assertEquals(1, refDb.getReflogReader("refs/heads/new/name") + .getReverseEntries().size()); assertEquals("Branch: renamed b to new/name", - refDb.getReflogReader("new/name").getLastEntry().getComment()); + refDb.getReflogReader("refs/heads/new/name").getLastEntry() + .getComment()); assertFalse(new File(db.getDirectory(), "logs/refs/heads/b").exists()); assertEquals(oldHead, db.resolve(Constants.HEAD)); // unchanged } @@ -735,12 +736,14 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertEquals(rb, db.resolve("refs/heads/new/name")); assertNull(db.resolve("refs/heads/b")); RefDatabase refDb = db.getRefDatabase(); - assertEquals(2, - refDb.getReflogReader("new/name").getReverseEntries().size()); + assertEquals(2, refDb.getReflogReader("refs/heads/new/name") + .getReverseEntries().size()); assertEquals("Branch: renamed b to new/name", - refDb.getReflogReader("new/name").getLastEntry().getComment()); - assertEquals("Just a message", refDb.getReflogReader("new/name") - .getReverseEntries().get(1).getComment()); + refDb.getReflogReader("refs/heads/new/name").getLastEntry() + .getComment()); + assertEquals("Just a message", + refDb.getReflogReader("refs/heads/new/name").getReverseEntries() + .get(1).getComment()); assertFalse(new File(db.getDirectory(), "logs/refs/heads/b").exists()); assertEquals(oldHead, db.resolve(Constants.HEAD)); // unchanged } @@ -762,16 +765,18 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertNull(db.resolve("refs/heads/b")); RefDatabase refDb = db.getRefDatabase(); assertEquals("Branch: renamed b to new/name", - refDb.getReflogReader("new/name").getLastEntry().getComment()); + refDb.getReflogReader("refs/heads/new/name").getLastEntry() + .getComment()); assertFalse(new File(db.getDirectory(), "logs/refs/heads/b").exists()); assertEquals(rb, db.resolve(Constants.HEAD)); - assertEquals(2, - refDb.getReflogReader("new/name").getReverseEntries().size()); + assertEquals(2, refDb.getReflogReader("refs/heads/new/name") + .getReverseEntries().size()); assertEquals("Branch: renamed b to new/name", - refDb.getReflogReader("new/name").getReverseEntries().get(0) - .getComment()); - assertEquals("Just a message", refDb.getReflogReader("new/name") - .getReverseEntries().get(1).getComment()); + refDb.getReflogReader("refs/heads/new/name").getReverseEntries() + .get(0).getComment()); + assertEquals("Just a message", + refDb.getReflogReader("refs/heads/new/name").getReverseEntries() + .get(1).getComment()); } @Test @@ -796,7 +801,8 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertNull(db.resolve("refs/heads/b")); RefDatabase refDb = db.getRefDatabase(); assertEquals("Branch: renamed b to new/name", - refDb.getReflogReader("new/name").getLastEntry().getComment()); + refDb.getReflogReader("refs/heads/new/name").getLastEntry() + .getComment()); assertEquals(3, refDb.getReflogReader("refs/heads/new/name") .getReverseEntries().size()); assertEquals("Branch: renamed b to new/name", @@ -977,14 +983,15 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertNull(db.resolve("refs/heads/a")); assertEquals(rb, db.resolve("refs/heads/a/b")); RefDatabase refDb = db.getRefDatabase(); - assertEquals(3, - refDb.getReflogReader("a/b").getReverseEntries().size()); - assertEquals("Branch: renamed a to a/b", refDb.getReflogReader("a/b") - .getReverseEntries().get(0).getComment()); - assertEquals("Just a message", refDb.getReflogReader("a/b") + assertEquals(3, refDb.getReflogReader("refs/heads/a/b") + .getReverseEntries().size()); + assertEquals("Branch: renamed a to a/b", + refDb.getReflogReader("refs/heads/a/b").getReverseEntries() + .get(0).getComment()); + assertEquals("Just a message", refDb.getReflogReader("refs/heads/a/b") .getReverseEntries().get(1).getComment()); - assertEquals("Setup", refDb.getReflogReader("a/b").getReverseEntries() - .get(2).getComment()); + assertEquals("Setup", refDb.getReflogReader("refs/heads/a/b") + .getReverseEntries().get(2).getComment()); // same thing was logged to HEAD assertEquals("Branch: renamed a to a/b", refDb.getReflogReader("HEAD") .getReverseEntries().get(0).getComment()); @@ -1015,14 +1022,15 @@ public class RefUpdateTest extends SampleDataRepositoryTestCase { assertNull(db.resolve("refs/heads/prefix/a")); assertEquals(rb, db.resolve("refs/heads/prefix")); RefDatabase refDb = db.getRefDatabase(); - assertEquals(3, - refDb.getReflogReader("prefix").getReverseEntries().size()); + assertEquals(3, refDb.getReflogReader("refs/heads/prefix") + .getReverseEntries().size()); assertEquals("Branch: renamed prefix/a to prefix", - refDb.getReflogReader("prefix").getReverseEntries().get(0) - .getComment()); - assertEquals("Just a message", refDb.getReflogReader("prefix") - .getReverseEntries().get(1).getComment()); - assertEquals("Setup", refDb.getReflogReader("prefix") + refDb.getReflogReader("refs/heads/prefix").getReverseEntries() + .get(0).getComment()); + assertEquals("Just a message", + refDb.getReflogReader("refs/heads/prefix").getReverseEntries() + .get(1).getComment()); + assertEquals("Setup", refDb.getReflogReader("refs/heads/prefix") .getReverseEntries().get(2).getComment()); assertEquals("Branch: renamed prefix/a to prefix", refDb.getReflogReader("HEAD").getReverseEntries().get(0) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java index 23c279eabe..16645cbcd7 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ReflogReaderTest.java @@ -157,9 +157,11 @@ public class ReflogReaderTest extends SampleDataRepositoryTestCase { setupReflog("logs/HEAD", headLine); RefDatabase refDb = db.getRefDatabase(); assertEquals("branch: change to master", - refDb.getReflogReader("master").getLastEntry().getComment()); + refDb.getReflogReader("refs/heads/master").getLastEntry() + .getComment()); assertEquals("branch: change to a", - refDb.getReflogReader("a").getLastEntry().getComment()); + refDb.getReflogReader("refs/heads/a").getLastEntry() + .getComment()); assertEquals("branch: change to HEAD", refDb.getReflogReader("HEAD").getLastEntry().getComment()); } @@ -168,7 +170,7 @@ public class ReflogReaderTest extends SampleDataRepositoryTestCase { public void testReadLineWithMissingComment() throws Exception { setupReflog("logs/refs/heads/master", oneLineWithoutComment); final ReflogReader reader = db.getRefDatabase() - .getReflogReader("master"); + .getReflogReader("refs/heads/master"); ReflogEntry e = reader.getLastEntry(); assertEquals(ObjectId .fromString("da85355dfc525c9f6f3927b876f379f46ccf826e"), e @@ -188,8 +190,9 @@ public class ReflogReaderTest extends SampleDataRepositoryTestCase { public void testNoLog() throws Exception { RefDatabase refDb = db.getRefDatabase(); assertEquals(0, - refDb.getReflogReader("master").getReverseEntries().size()); - assertNull(refDb.getReflogReader("master").getLastEntry()); + refDb.getReflogReader("refs/heads/master").getReverseEntries() + .size()); + assertNull(refDb.getReflogReader("refs/heads/master").getLastEntry()); } @Test diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java index 3b09d3a82f..6040ad554d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java @@ -566,7 +566,7 @@ public class FileReftableDatabase extends RefDatabase { RefDatabase refDb = repo.getRefDatabase(); if (writeLogs) { for (Ref r : refs) { - ReflogReader rlr = refDb.getReflogReader(r.getName()); + ReflogReader rlr = refDb.getReflogReader(r); if (rlr != null) { size = Math.max(rlr.getReverseEntries().size(), size); } @@ -589,10 +589,7 @@ public class FileReftableDatabase extends RefDatabase { if (writeLogs) { for (Ref r : refs) { long idx = size; - ReflogReader reader = refDb.getReflogReader(r.getName()); - if (reader == null) { - continue; - } + ReflogReader reader = refDb.getReflogReader(r); for (ReflogEntry e : reader.getReverseEntries()) { w.writeLog(r.getName(), idx, e.getWho(), e.getOldId(), e.getNewId(), e.getComment()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java index 11d1732c77..49d5224325 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefDatabase.java @@ -368,9 +368,7 @@ public abstract class RefDatabase { */ @Nullable public ReflogReader getReflogReader(String refName) throws IOException { - // TODO: use exactRef here, which offers more predictable and therefore - // preferable behavior. - Ref ref = findRef(refName); + Ref ref = exactRef(refName); if (ref == null) { return null; } -- cgit v1.2.3 From 1aa1e85062565e148a2385f2f3e4ade7beb7c94b Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 22 Jan 2025 14:25:18 -0800 Subject: junit.FakeIndexFactory: Easy fake indexes for tests Utility to create fake indexes. This simplify unit testing code that requires an index. Change-Id: I30f60cbd37ad5b48f4d919be265bfbf9a7fe57c4 --- .../org/eclipse/jgit/junit/FakeIndexFactory.java | 243 +++++++++++++++++++++ 1 file changed, 243 insertions(+) create mode 100644 org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/FakeIndexFactory.java diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/FakeIndexFactory.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/FakeIndexFactory.java new file mode 100644 index 0000000000..eb23bec584 --- /dev/null +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/FakeIndexFactory.java @@ -0,0 +1,243 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.junit; + +import static java.util.function.Function.identity; +import static java.util.stream.Collectors.toMap; +import static java.util.stream.Collectors.toUnmodifiableList; + +import java.io.IOException; +import java.util.Comparator; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.eclipse.jgit.errors.CorruptObjectException; +import org.eclipse.jgit.errors.MissingObjectException; +import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.internal.storage.file.PackIndex.EntriesIterator; +import org.eclipse.jgit.internal.storage.file.PackReverseIndex; +import org.eclipse.jgit.lib.AbbreviatedObjectId; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.ObjectId; + +/** + * Create indexes with predefined data + * + * @since 7.2 + */ +public class FakeIndexFactory { + + /** + * An object for the fake index + * + * @param name + * a sha1 + * @param offset + * the (fake) position of the object in the pack + */ + public record IndexObject(String name, long offset) { + /** + * Name (sha1) as an objectId + * + * @return name (a sha1) as an objectId. + */ + public ObjectId getObjectId() { + return ObjectId.fromString(name); + } + } + + /** + * Return an index populated with these objects + * + * @param objs + * objects to be indexed + * @return a PackIndex implementation + */ + public static PackIndex indexOf(List objs) { + return new FakePackIndex(objs); + } + + /** + * Return a reverse pack index with these objects + * + * @param objs + * objects to be indexed + * @return a PackReverseIndex implementation + */ + public static PackReverseIndex reverseIndexOf(List objs) { + return new FakeReverseIndex(objs); + } + + private FakeIndexFactory() { + } + + private static class FakePackIndex implements PackIndex { + private static final Comparator SHA1_COMPARATOR = (o1, + o2) -> String.CASE_INSENSITIVE_ORDER.compare(o1.name(), + o2.name()); + + private final Map idx; + + private final List sha1Ordered; + + private final long offset64count; + + FakePackIndex(List objs) { + sha1Ordered = objs.stream().sorted(SHA1_COMPARATOR) + .collect(toUnmodifiableList()); + idx = objs.stream().collect(toMap(IndexObject::name, identity())); + offset64count = objs.stream() + .filter(o -> o.offset > Integer.MAX_VALUE).count(); + } + + @Override + public Iterator iterator() { + return new FakeEntriesIterator(sha1Ordered); + } + + @Override + public long getObjectCount() { + return sha1Ordered.size(); + } + + @Override + public long getOffset64Count() { + return offset64count; + } + + @Override + public ObjectId getObjectId(long nthPosition) { + return ObjectId + .fromString(sha1Ordered.get((int) nthPosition).name()); + } + + @Override + public long getOffset(long nthPosition) { + return sha1Ordered.get((int) nthPosition).offset(); + } + + @Override + public long findOffset(AnyObjectId objId) { + IndexObject o = idx.get(objId.name()); + if (o == null) { + return -1; + } + return o.offset(); + } + + @Override + public int findPosition(AnyObjectId objId) { + IndexObject o = idx.get(objId.name()); + if (o == null) { + return -1; + } + return sha1Ordered.indexOf(o); + } + + @Override + public long findCRC32(AnyObjectId objId) throws MissingObjectException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean hasCRC32Support() { + return false; + } + + @Override + public void resolve(Set matches, AbbreviatedObjectId id, + int matchLimit) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + public byte[] getChecksum() { + return new byte[0]; + } + } + + private static class FakeReverseIndex implements PackReverseIndex { + private static final Comparator OFFSET_COMPARATOR = Comparator + .comparingLong(IndexObject::offset); + + private final List byOffset; + + private final Map ridx; + + FakeReverseIndex(List objs) { + byOffset = objs.stream().sorted(OFFSET_COMPARATOR) + .collect(toUnmodifiableList()); + ridx = byOffset.stream() + .collect(toMap(IndexObject::offset, identity())); + } + + @Override + public void verifyPackChecksum(String packFilePath) { + // Do nothing + } + + @Override + public ObjectId findObject(long offset) { + IndexObject indexObject = ridx.get(offset); + if (indexObject == null) { + return null; + } + return ObjectId.fromString(indexObject.name()); + } + + @Override + public long findNextOffset(long offset, long maxOffset) + throws CorruptObjectException { + IndexObject o = ridx.get(offset); + if (o == null) { + throw new CorruptObjectException("Invalid offset"); //$NON-NLS-1$ + } + int pos = byOffset.indexOf(o); + if (pos == byOffset.size() - 1) { + return maxOffset; + } + return byOffset.get(pos + 1).offset(); + } + + @Override + public int findPosition(long offset) { + IndexObject indexObject = ridx.get(offset); + return byOffset.indexOf(indexObject); + } + + @Override + public ObjectId findObjectByPosition(int nthPosition) { + return byOffset.get(nthPosition).getObjectId(); + } + } + + private static class FakeEntriesIterator extends EntriesIterator { + + private static final byte[] buffer = new byte[Constants.OBJECT_ID_LENGTH]; + + private final Iterator it; + + FakeEntriesIterator(List objs) { + super(objs.size()); + it = objs.iterator(); + } + + @Override + protected void readNext() { + IndexObject next = it.next(); + next.getObjectId().copyRawTo(buffer, 0); + setIdBuffer(buffer, 0); + setOffset(next.offset()); + } + } +} -- cgit v1.2.3 From 517a7b210fba00661bf42e3d4bc473cc1428c93b Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Wed, 25 Dec 2024 17:24:48 +0100 Subject: [ssh signing] AllowedSigners: fix validity check Not all SSH key types start with "ssh-" (for instance ECDSA keys). Don't test for this; instead test that the string we want to use as base64-encoded key starts with "AAAA". Change-Id: Ia0e24d63c69c98813ac7419f4a688f3d15139a10 --- .../jgit/internal/signing/ssh/AllowedSignersParseTest.java | 10 ++++++++++ .../org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java | 9 ++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AllowedSignersParseTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AllowedSignersParseTest.java index 90fde3fb28..84d8179a3d 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AllowedSignersParseTest.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/signing/ssh/AllowedSignersParseTest.java @@ -168,6 +168,14 @@ public class AllowedSignersParseTest { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO"), AllowedSigners.parseLine( "*@a.com,*@b.a.com cert-authority namespaces=\"git\" valid-after=\"20240901\" valid-before=\"202409011200Z\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertEquals(new AllowedSigners.AllowedEntry( + new String[] { "foo@a.com" }, + false, new String[] { "git" }, + Instant.parse("2024-09-01T03:30:00.00Z"), + Instant.parse("2024-09-01T12:00:00.00Z"), + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGxkz2AUld8eitmyIYlVV+Sot4jT3CigyBmvFRff0q4cSsKLx4x2TxGQeKKVueJEawtsUC2GNRV9FxXsTCUGcZU="), + AllowedSigners.parseLine( + "foo@a.com namespaces=\"git\" valid-after=\"20240901\" valid-before=\"202409011200Z\" ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGxkz2AUld8eitmyIYlVV+Sot4jT3CigyBmvFRff0q4cSsKLx4x2TxGQeKKVueJEawtsUC2GNRV9FxXsTCUGcZU=")); } @Test @@ -182,6 +190,8 @@ public class AllowedSignersParseTest { "valid-before=\"20240901\" ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); assertThrows(Exception.class, () -> AllowedSigners.parseLine( "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); + assertThrows(Exception.class, () -> AllowedSigners.parseLine( + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO foo@bar.com")); assertThrows(Exception.class, () -> AllowedSigners.parseLine( "AAAAC3NzaC1lZDI1NTE5AAAAIGATOZ8PcOKdY978fzIstnZ0+FuefIWKp7wRZynQLdzO")); assertThrows(Exception.class, () -> AllowedSigners.parseLine( diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java index e31ed64ed9..80b171f216 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/signing/ssh/AllowedSigners.java @@ -63,8 +63,6 @@ final class AllowedSigners extends ModifiableFileWatcher { private static final String VALID_BEFORE = "valid-before="; //$NON-NLS-1$ - private static final String SSH_KEY_PREFIX = "ssh-"; //$NON-NLS-1$ - private static final DateTimeFormatter SSH_DATE_FORMAT = new DateTimeFormatterBuilder() .appendValue(ChronoField.YEAR, 4) .appendValue(ChronoField.MONTH_OF_YEAR, 2) @@ -322,8 +320,7 @@ final class AllowedSigners extends ModifiableFileWatcher { && Character.isWhitespace(line.charAt(CERT_AUTHORITY.length()))) || matches(line, NAMESPACES, 0) || matches(line, VALID_AFTER, 0) - || matches(line, VALID_BEFORE, 0) - || matches(line, SSH_KEY_PREFIX, 0)) { + || matches(line, VALID_BEFORE, 0)) { throw new StreamCorruptedException( SshdText.get().signAllowedSignersNoIdentities); } @@ -448,7 +445,9 @@ final class AllowedSigners extends ModifiableFileWatcher { s.substring(start))); } String keyType = s.substring(start, endOfKeyType); - if (!keyType.startsWith(SSH_KEY_PREFIX)) { + String key = s.substring(startOfKey, i); + if (!key.startsWith("AAAA")) { //$NON-NLS-1$ + // base64 encoded SSH keys always start with four 'A's. throw new StreamCorruptedException(MessageFormat.format( SshdText.get().signAllowedSignersPublicKeyParsing, s.substring(start))); -- cgit v1.2.3 From 32b9a9523c2a8100f9ac22b251a10c3afb7d1144 Mon Sep 17 00:00:00 2001 From: Simon Eder Date: Wed, 9 Oct 2024 17:16:57 +0200 Subject: Submodules: Update submodule with deleted worktree The current implementation throws an exception when a submodule is updated for which the 'gitdir' still exists but the 'worktree' is missing. The current implementation tries to clone the submodule but fails as the 'gitdir' is not empty. The commit adds: - a check if the 'gitdir' is empty - if the 'gitdir' is not empty: - create a new '.git' file linking to the existing 'gitdir' - fetch the submodule - checkout the submodule unconditionally (ignore any configured update mode) - if the submodule is cloned checkout the submodule unconditionally (ignore any configured update mode) This change mimics the behavior of cgit. Bug: jgit-79 Change-Id: Iffc8659d2a04d866a43815c78c7760c0f3d82640 --- .../jgit/submodule/SubmoduleUpdateTest.java | 210 +++++++++++++++++---- .../eclipse/jgit/api/SubmoduleUpdateCommand.java | 91 +++++++-- .../src/org/eclipse/jgit/lib/ConfigConstants.java | 7 + 3 files changed, 253 insertions(+), 55 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java index c5e9c2deaa..d54117005d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/submodule/SubmoduleUpdateTest.java @@ -17,21 +17,25 @@ import java.io.File; import java.io.IOException; import java.util.Collection; +import org.eclipse.jgit.api.CheckoutCommand; import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.api.InitCommand; +import org.eclipse.jgit.api.SubmoduleAddCommand; import org.eclipse.jgit.api.SubmoduleUpdateCommand; import org.eclipse.jgit.api.errors.GitAPIException; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheEditor; import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit; import org.eclipse.jgit.dircache.DirCacheEntry; +import org.eclipse.jgit.junit.JGitTestUtil; import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.StoredConfig; -import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.storage.file.FileBasedConfig; import org.junit.Test; @@ -40,6 +44,91 @@ import org.junit.Test; */ public class SubmoduleUpdateTest extends RepositoryTestCase { + private Repository submoduleRepo; + + private Git git; + + private AnyObjectId subRepoCommit2; + + private void createSubmoduleRepo() throws IOException, GitAPIException { + File directory = createTempDirectory("submodule_repo"); + InitCommand init = Git.init(); + init.setDirectory(directory); + init.call(); + submoduleRepo = Git.open(directory).getRepository(); + try (Git sub = Git.wrap(submoduleRepo)) { + // commit something + JGitTestUtil.writeTrashFile(submoduleRepo, "commit1.txt", + "commit 1"); + sub.add().addFilepattern("commit1.txt").call(); + sub.commit().setMessage("commit 1").call().getId(); + + JGitTestUtil.writeTrashFile(submoduleRepo, "commit2.txt", + "commit 2"); + sub.add().addFilepattern("commit2.txt").call(); + subRepoCommit2 = sub.commit().setMessage("commit 2").call().getId(); + } + } + + private void addSubmodule(String path) throws GitAPIException { + SubmoduleAddCommand command = new SubmoduleAddCommand(db); + command.setPath(path); + String uri = submoduleRepo.getDirectory().toURI().toString(); + command.setURI(uri); + try (Repository repo = command.call()) { + assertNotNull(repo); + } + git.add().addFilepattern(path).addFilepattern(Constants.DOT_GIT_MODULES) + .call(); + git.commit().setMessage("adding submodule").call(); + recursiveDelete(new File(git.getRepository().getWorkTree(), path)); + recursiveDelete( + new File(new File(git.getRepository().getCommonDirectory(), + Constants.MODULES), path)); + } + + @Override + public void setUp() throws Exception { + super.setUp(); + createSubmoduleRepo(); + + git = Git.wrap(db); + // commit something + writeTrashFile("initial.txt", "initial"); + git.add().addFilepattern("initial.txt").call(); + git.commit().setMessage("initial commit").call(); + } + + public void updateModeClonedRestoredSubmoduleTemplate(String mode) + throws Exception { + String path = "sub"; + addSubmodule(path); + + StoredConfig cfg = git.getRepository().getConfig(); + if (mode != null) { + cfg.load(); + cfg.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, + ConfigConstants.CONFIG_KEY_UPDATE, mode); + cfg.save(); + } + SubmoduleUpdateCommand update = new SubmoduleUpdateCommand(db); + update.call(); + try (Git subGit = Git.open(new File(db.getWorkTree(), path))) { + update.call(); + assertEquals(subRepoCommit2.getName(), + subGit.getRepository().getBranch()); + } + + recursiveDelete(new File(db.getWorkTree(), path)); + + update.call(); + try (Git subGit = Git.open(new File(db.getWorkTree(), path))) { + update.call(); + assertEquals(subRepoCommit2.getName(), + subGit.getRepository().getBranch()); + } + } + @Test public void repositoryWithNoSubmodules() throws GitAPIException { SubmoduleUpdateCommand command = new SubmoduleUpdateCommand(db); @@ -50,35 +139,9 @@ public class SubmoduleUpdateTest extends RepositoryTestCase { @Test public void repositoryWithSubmodule() throws Exception { - writeTrashFile("file.txt", "content"); - Git git = Git.wrap(db); - git.add().addFilepattern("file.txt").call(); - final RevCommit commit = git.commit().setMessage("create file").call(); final String path = "sub"; - DirCache cache = db.lockDirCache(); - DirCacheEditor editor = cache.editor(); - editor.add(new PathEdit(path) { - - @Override - public void apply(DirCacheEntry ent) { - ent.setFileMode(FileMode.GITLINK); - ent.setObjectId(commit); - } - }); - editor.commit(); - - StoredConfig config = db.getConfig(); - config.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, - ConfigConstants.CONFIG_KEY_URL, db.getDirectory().toURI() - .toString()); - config.save(); - - FileBasedConfig modulesConfig = new FileBasedConfig(new File( - db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); - modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, - ConfigConstants.CONFIG_KEY_PATH, path); - modulesConfig.save(); + addSubmodule(path); SubmoduleUpdateCommand command = new SubmoduleUpdateCommand(db); Collection updated = command.call(); @@ -90,7 +153,7 @@ public class SubmoduleUpdateTest extends RepositoryTestCase { assertTrue(generator.next()); try (Repository subRepo = generator.getRepository()) { assertNotNull(subRepo); - assertEquals(commit, subRepo.resolve(Constants.HEAD)); + assertEquals(subRepoCommit2, subRepo.resolve(Constants.HEAD)); String worktreeDir = subRepo.getConfig().getString( ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_WORKTREE); @@ -104,8 +167,8 @@ public class SubmoduleUpdateTest extends RepositoryTestCase { } @Test - public void repositoryWithUnconfiguredSubmodule() throws IOException, - GitAPIException { + public void repositoryWithUnconfiguredSubmodule() + throws IOException, GitAPIException { final ObjectId id = ObjectId .fromString("abcd1234abcd1234abcd1234abcd1234abcd1234"); final String path = "sub"; @@ -121,16 +184,14 @@ public class SubmoduleUpdateTest extends RepositoryTestCase { }); editor.commit(); - FileBasedConfig modulesConfig = new FileBasedConfig(new File( - db.getWorkTree(), Constants.DOT_GIT_MODULES), db.getFS()); + FileBasedConfig modulesConfig = new FileBasedConfig( + new File(db.getWorkTree(), Constants.DOT_GIT_MODULES), + db.getFS()); modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, ConfigConstants.CONFIG_KEY_PATH, path); String url = "git://server/repo.git"; modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, ConfigConstants.CONFIG_KEY_URL, url); - String update = "rebase"; - modulesConfig.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, - ConfigConstants.CONFIG_KEY_UPDATE, update); modulesConfig.save(); SubmoduleUpdateCommand command = new SubmoduleUpdateCommand(db); @@ -140,8 +201,8 @@ public class SubmoduleUpdateTest extends RepositoryTestCase { } @Test - public void repositoryWithInitializedSubmodule() throws IOException, - GitAPIException { + public void repositoryWithInitializedSubmodule() + throws IOException, GitAPIException { final ObjectId id = ObjectId .fromString("abcd1234abcd1234abcd1234abcd1234abcd1234"); final String path = "sub"; @@ -168,4 +229,77 @@ public class SubmoduleUpdateTest extends RepositoryTestCase { assertNotNull(updated); assertTrue(updated.isEmpty()); } + + @Test + public void updateModeMergeClonedRestoredSubmodule() throws Exception { + updateModeClonedRestoredSubmoduleTemplate( + ConfigConstants.CONFIG_KEY_MERGE); + } + + @Test + public void updateModeRebaseClonedRestoredSubmodule() throws Exception { + updateModeClonedRestoredSubmoduleTemplate( + ConfigConstants.CONFIG_KEY_REBASE); + } + + @Test + public void updateModeCheckoutClonedRestoredSubmodule() throws Exception { + updateModeClonedRestoredSubmoduleTemplate( + ConfigConstants.CONFIG_KEY_CHECKOUT); + } + + @Test + public void updateModeMissingClonedRestoredSubmodule() throws Exception { + updateModeClonedRestoredSubmoduleTemplate(null); + } + + @Test + public void updateMode() throws Exception { + String path = "sub"; + addSubmodule(path); + + StoredConfig cfg = git.getRepository().getConfig(); + cfg.load(); + cfg.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, + ConfigConstants.CONFIG_KEY_UPDATE, + ConfigConstants.CONFIG_KEY_REBASE); + cfg.save(); + + SubmoduleUpdateCommand update = new SubmoduleUpdateCommand(db); + update.call(); + try (Git subGit = Git.open(new File(db.getWorkTree(), path))) { + CheckoutCommand checkout = subGit.checkout(); + checkout.setName("master"); + checkout.call(); + update.call(); + assertEquals("master", subGit.getRepository().getBranch()); + } + + cfg.load(); + cfg.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, + ConfigConstants.CONFIG_KEY_UPDATE, + ConfigConstants.CONFIG_KEY_CHECKOUT); + cfg.save(); + + update.call(); + try (Git subGit = Git.open(new File(db.getWorkTree(), path))) { + assertEquals(subRepoCommit2.getName(), + subGit.getRepository().getBranch()); + } + + cfg.load(); + cfg.setString(ConfigConstants.CONFIG_SUBMODULE_SECTION, path, + ConfigConstants.CONFIG_KEY_UPDATE, + ConfigConstants.CONFIG_KEY_MERGE); + cfg.save(); + + update.call(); + try (Git subGit = Git.open(new File(db.getWorkTree(), path))) { + CheckoutCommand checkout = subGit.checkout(); + checkout.setName("master"); + checkout.call(); + update.call(); + assertEquals("master", subGit.getRepository().getBranch()); + } + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java index 3524984347..5e4b2ee0b7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/SubmoduleUpdateCommand.java @@ -28,6 +28,7 @@ import org.eclipse.jgit.api.errors.RefNotFoundException; import org.eclipse.jgit.api.errors.WrongRepositoryStateException; import org.eclipse.jgit.dircache.DirCacheCheckout; import org.eclipse.jgit.errors.ConfigInvalidException; +import org.eclipse.jgit.internal.storage.file.LockFile; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; @@ -39,6 +40,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.submodule.SubmoduleWalk; import org.eclipse.jgit.treewalk.filter.PathFilterGroup; +import org.eclipse.jgit.util.FileUtils; /** * A class used to execute a submodule update command. @@ -62,6 +64,8 @@ public class SubmoduleUpdateCommand extends private boolean fetch = false; + private boolean clonedRestored; + /** *

* Constructor for SubmoduleUpdateCommand. @@ -116,26 +120,77 @@ public class SubmoduleUpdateCommand extends return this; } + private static boolean submoduleExists(File gitDir) { + if (gitDir != null && gitDir.isDirectory()) { + File[] files = gitDir.listFiles(); + return files != null && files.length != 0; + } + return false; + } + + private static void restoreSubmodule(File gitDir, File workingTree) + throws IOException { + LockFile dotGitLock = new LockFile( + new File(workingTree, Constants.DOT_GIT)); + if (dotGitLock.lock()) { + String content = Constants.GITDIR + + getRelativePath(gitDir, workingTree); + dotGitLock.write(Constants.encode(content)); + dotGitLock.commit(); + } + } + + private static String getRelativePath(File gitDir, File workingTree) { + File relPath; + try { + relPath = workingTree.toPath().relativize(gitDir.toPath()) + .toFile(); + } catch (IllegalArgumentException e) { + relPath = gitDir; + } + return FileUtils.pathToString(relPath); + } + + private String determineUpdateMode(String mode) { + if (clonedRestored) { + return ConfigConstants.CONFIG_KEY_CHECKOUT; + } + return mode; + } + private Repository getOrCloneSubmodule(SubmoduleWalk generator, String url) throws IOException, GitAPIException { Repository repository = generator.getRepository(); + boolean restored = false; + boolean cloned = false; if (repository == null) { - if (callback != null) { - callback.cloningSubmodule(generator.getPath()); - } - CloneCommand clone = Git.cloneRepository(); - configure(clone); - clone.setURI(url); - clone.setDirectory(generator.getDirectory()); - clone.setGitDir(new File( + File gitDir = new File( new File(repo.getCommonDirectory(), Constants.MODULES), - generator.getPath())); - clone.setRelativePaths(true); - if (monitor != null) { - clone.setProgressMonitor(monitor); + generator.getPath()); + if (submoduleExists(gitDir)) { + restoreSubmodule(gitDir, generator.getDirectory()); + restored = true; + clonedRestored = true; + repository = generator.getRepository(); + } else { + if (callback != null) { + callback.cloningSubmodule(generator.getPath()); + } + CloneCommand clone = Git.cloneRepository(); + configure(clone); + clone.setURI(url); + clone.setDirectory(generator.getDirectory()); + clone.setGitDir(gitDir); + clone.setRelativePaths(true); + if (monitor != null) { + clone.setProgressMonitor(monitor); + } + repository = clone.call().getRepository(); + cloned = true; + clonedRestored = true; } - repository = clone.call().getRepository(); - } else if (this.fetch) { + } + if ((this.fetch || restored) && !cloned) { if (fetchCallback != null) { fetchCallback.fetchingSubmodule(generator.getPath()); } @@ -172,15 +227,17 @@ public class SubmoduleUpdateCommand extends continue; // Skip submodules not registered in parent repository's config String url = generator.getConfigUrl(); - if (url == null) + if (url == null) { continue; - + } + clonedRestored = false; try (Repository submoduleRepo = getOrCloneSubmodule(generator, url); RevWalk walk = new RevWalk(submoduleRepo)) { RevCommit commit = walk .parseCommit(generator.getObjectId()); - String update = generator.getConfigUpdate(); + String update = determineUpdateMode( + generator.getConfigUpdate()); if (ConfigConstants.CONFIG_KEY_MERGE.equals(update)) { MergeCommand merge = new MergeCommand(submoduleRepo); merge.include(commit); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index a57f1b714a..5068a6cce0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -446,6 +446,13 @@ public final class ConfigConstants { /** The "rebase" key */ public static final String CONFIG_KEY_REBASE = "rebase"; + /** + * The "checkout" key + * + * @since 7.2 + */ + public static final String CONFIG_KEY_CHECKOUT = "checkout"; + /** The "url" key */ public static final String CONFIG_KEY_URL = "url"; -- cgit v1.2.3 From 0a3d13508aa9ef4dc6f5ad97014f2f0ea5568195 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 27 Jan 2025 22:49:09 +0100 Subject: LooseObjects: convert while loop into for loop to simplify the implementation and shorten variable names. Change-Id: I84c038e65263b7d0c38c4e90817ab8b07ad5c2da --- .../org/eclipse/jgit/internal/storage/file/LooseObjects.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java index b4bb2a9293..ce565308be 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java @@ -49,7 +49,7 @@ class LooseObjects { * Maximum number of attempts to read a loose object for which a stale file * handle exception is thrown */ - private final static int MAX_LOOSE_OBJECT_STALE_READ_ATTEMPTS = 5; + private final static int MAX_STALE_READ_RETRIES = 5; private final File directory; @@ -163,9 +163,7 @@ class LooseObjects { } ObjectLoader open(WindowCursor curs, AnyObjectId id) throws IOException { - int readAttempts = 0; - while (readAttempts < MAX_LOOSE_OBJECT_STALE_READ_ATTEMPTS) { - readAttempts++; + for (int retries = 0; retries < MAX_STALE_READ_RETRIES; retries++) { File path = fileFor(id); if (trustFolderStat && !path.exists()) { break; @@ -184,8 +182,8 @@ class LooseObjects { if (LOG.isDebugEnabled()) { LOG.debug(MessageFormat.format( JGitText.get().looseObjectHandleIsStale, id.name(), - Integer.valueOf(readAttempts), Integer.valueOf( - MAX_LOOSE_OBJECT_STALE_READ_ATTEMPTS))); + Integer.valueOf(retries), Integer.valueOf( + MAX_STALE_READ_RETRIES))); } } } -- cgit v1.2.3 From 12b89ab6dbc897123089492741270a762911a8f3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 27 Jan 2025 23:23:49 +0100 Subject: LooseObjects: compute loose object path before retry loop It's unnecessary to recompute this for retries. Change-Id: I383ecfa25d795ba177dd5ce14d12b318e38daf9b --- .../src/org/eclipse/jgit/internal/storage/file/LooseObjects.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java index ce565308be..74ef6e139c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java @@ -163,8 +163,8 @@ class LooseObjects { } ObjectLoader open(WindowCursor curs, AnyObjectId id) throws IOException { + File path = fileFor(id); for (int retries = 0; retries < MAX_STALE_READ_RETRIES; retries++) { - File path = fileFor(id); if (trustFolderStat && !path.exists()) { break; } -- cgit v1.2.3 From d5ad21c98fc9964fda6dd1091594df0f7c706dc9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 Jan 2025 14:19:24 +0100 Subject: JGit v7.2.0.202501291320-m2 Signed-off-by: Matthias Sohn Change-Id: I4e4e203c0f6a2463adefd28d3965eaf44bd2e620 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0069b09467..c5bb954175 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c6c81648ae..0ddd8af264 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 3af82e4759..84ae30c130 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 89d05be73b..02bb1f057a 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 11806f15c6..ee694f83a6 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index b142a66a8c..50d99096b7 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 3ca6590f02..fa82742569 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 27a2bba5a2..67c7f7ce80 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index c92fa9f156..1988e9b0a4 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 9493c07dbc..efff78505a 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.test - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 35294256e1..85890a64e3 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 245ba7e127..9399371eaa 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 2120439e51..dac4be3fb4 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 532e749cb2..64b77b5c81 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f94e2b27b1..cb639c3e67 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 7d23d53614..c9f875611e 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 679252de34..2408af79cd 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index c390d8f5ee..fcaef70216 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 39dc2ef42a..0ea042abab 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.2.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index e7940bd358..6d74a6538e 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 3f79f8b82d..a9630d018d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 3550501dba..ec2bc08d6d 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 2f25191fee..d4725425cb 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 4ba595901b..f93f7b1569 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 5abd7d6d51..4415b082a8 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ea38ae31ba..0cf70263a9 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index bcd9fbfc81..19a1aa4654 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index b8f22cea5d..0b36c62f7c 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index f937748212..19b3f32c4c 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 6488a887fb..df526a631c 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 9d494cb2e0..164249deb1 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9f43ced73b..3598533d89 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 77749c8d89..ccd55694e2 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 98e63b0f1e..aa7e058832 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 1973b26477..d6e8f27828 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 73f5cab59d..c4b60db745 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 0dd0786050..a682e9df9a 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index f27377447c..83c50ecd3f 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index eff7e0b7eb..6125c9e9dc 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index fb211cc89c..c8577b5838 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.2.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 4ca03a3f72..7cdeac9e47 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 329740085e..cd48b1082d 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 43980f06ae..ecabc60c7d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 59345e75f9..fe95e783af 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index ae91bd5405..41541d84ff 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index aa88700423..e671ed8b9d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 57d7d8dd69..bac983fe20 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 2038cfd58c..329729dee3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index d9a9db307d..a42064310a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index d98990c532..cf53fef443 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8f0c532a4a..8e573c6106 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 7e1b0c8226..8e4663bda2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 78867c96c0..cc80a7fb4e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 02435b6c08..cf6abc51f0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index d3773f54f3..e776e1c11b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index b8f402e4f0..e196381c5d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 4eee8255cc..2cc4f95fed 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 811beafca6..01b2ec5faa 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 025844c6b0..f222f1d394 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index a0cd57bcbb..4fd0c52a58 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 81c9651fd9..3489a04d85 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 5bc67b458e..a01aab4140 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 60a60bb51d..b639f1b952 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 9195a369e7..43a8d9dc02 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index fbcab95354..0508143d3a 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 0101464c82..2f82a3316e 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 81efa44cc6..5492d85138 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 6eeb24d6b4..856b016968 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 30437f25ee..add9896239 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index feec706a25..5c9d93d36b 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index f266ce106a..0390cf735d 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2df07f7ea1..35491453cd 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index b6b528cec4..8a3593c4f2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index c19e0aa253..f747347f3b 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index a002290378..3ba93e8954 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 9cf812ce3b..cb4ed20b77 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e84ac4d574..7abd222145 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index ed6115b046..b4ae76572d 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 4e8da25752..1d2f57347b 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index fdc5ffb8b3..32dc1ad6c5 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 5a5dd88587..8f47595e75 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index c936b09fd7..3674a182eb 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 423d22b748..8efc4a052a 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.2.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 12363f802e..83bf7c662a 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index ada06ed656..ab83ebfd7f 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 659ad8549f..53893f7ca7 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202501291320-m2 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 0f9ec1fb22..50d3e73fdf 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202501291320-m2 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202501291320-m2";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index df7ae83647..bf94175fc4 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index e6ea7488f0..19b7cff6ff 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0-SNAPSHOT + 7.2.0.202501291320-m2 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 772ee0e5fb9fbfb4a82ceb872e187abf62a4b453 Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Wed, 29 Jan 2025 10:17:17 +0000 Subject: Log pruned packfiles as debug and not warn logs In the regular lifecycle of a Git repository, the packfiles are constantly created and removed as part of repacking and pruning. Lower the logging of disappearing packfiles to debug level to reduce the SPAMing on logfile with warnings that should be ignored as part of the normal repository life. Change-Id: I57b24ffb0b32f7a64810cab47b5009f2bf89a6b8 --- .../src/org/eclipse/jgit/internal/storage/file/PackDirectory.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index e31126f027..706dbd6281 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -314,6 +314,7 @@ class PackDirectory { private void handlePackError(IOException e, Pack p) { String warnTmpl = null; + String debugTmpl = null; int transientErrorCount = 0; String errTmpl = JGitText.get().exceptionWhileReadingPack; if ((e instanceof CorruptObjectException) @@ -328,7 +329,7 @@ class PackDirectory { errTmpl = JGitText.get().packInaccessible; transientErrorCount = p.incrementTransientErrorCount(); } else { - warnTmpl = JGitText.get().packWasDeleted; + debugTmpl = JGitText.get().packWasDeleted; remove(p); } } else if (FileUtils.isStaleFileHandleInCausalChain(e)) { @@ -340,6 +341,9 @@ class PackDirectory { if (warnTmpl != null) { LOG.warn(MessageFormat.format(warnTmpl, p.getPackFile().getAbsolutePath()), e); + } else if (debugTmpl != null) { + LOG.debug(MessageFormat.format(debugTmpl, + p.getPackFile().getAbsolutePath()), e); } else { if (doLogExponentialBackoff(transientErrorCount)) { // Don't remove the pack from the list, as the error may be -- cgit v1.2.3 From 63c886834aa8c1934b4db00c751bff620c0f5729 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 29 Jan 2025 22:37:13 +0100 Subject: Prepare 7.2.0-SNAPSHOT builds Change-Id: I646edcba7809ab91d8e0a933796b4b5c81736232 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index c5bb954175..0069b09467 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 0ddd8af264..c6c81648ae 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 84ae30c130..3af82e4759 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 02bb1f057a..89d05be73b 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index ee694f83a6..11806f15c6 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 50d99096b7..b142a66a8c 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index fa82742569..3ca6590f02 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 67c7f7ce80..27a2bba5a2 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 1988e9b0a4..c92fa9f156 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index efff78505a..9493c07dbc 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 85890a64e3..35294256e1 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 9399371eaa..245ba7e127 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index dac4be3fb4..2120439e51 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 64b77b5c81..532e749cb2 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index cb639c3e67..f94e2b27b1 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index c9f875611e..7d23d53614 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 2408af79cd..679252de34 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index fcaef70216..c390d8f5ee 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 0ea042abab..39dc2ef42a 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.2.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 6d74a6538e..e7940bd358 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index a9630d018d..3f79f8b82d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index ec2bc08d6d..3550501dba 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index d4725425cb..2f25191fee 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index f93f7b1569..4ba595901b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 4415b082a8..5abd7d6d51 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 0cf70263a9..ea38ae31ba 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 19a1aa4654..bcd9fbfc81 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 0b36c62f7c..b8f22cea5d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 19b3f32c4c..f937748212 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index df526a631c..6488a887fb 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 164249deb1..9d494cb2e0 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 3598533d89..9f43ced73b 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index ccd55694e2..77749c8d89 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index aa7e058832..98e63b0f1e 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index d6e8f27828..1973b26477 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index c4b60db745..73f5cab59d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index a682e9df9a..0dd0786050 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 83c50ecd3f..f27377447c 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 6125c9e9dc..eff7e0b7eb 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index c8577b5838..fb211cc89c 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.2.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 7cdeac9e47..4ca03a3f72 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index cd48b1082d..329740085e 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index ecabc60c7d..43980f06ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index fe95e783af..59345e75f9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 41541d84ff..ae91bd5405 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index e671ed8b9d..aa88700423 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index bac983fe20..57d7d8dd69 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 329729dee3..2038cfd58c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index a42064310a..d9a9db307d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index cf53fef443..d98990c532 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8e573c6106..8f0c532a4a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 8e4663bda2..7e1b0c8226 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index cc80a7fb4e..78867c96c0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index cf6abc51f0..02435b6c08 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index e776e1c11b..d3773f54f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index e196381c5d..b8f402e4f0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 2cc4f95fed..4eee8255cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 01b2ec5faa..811beafca6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index f222f1d394..025844c6b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 4fd0c52a58..a0cd57bcbb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 3489a04d85..81c9651fd9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index a01aab4140..5bc67b458e 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index b639f1b952..60a60bb51d 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 43a8d9dc02..9195a369e7 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 0508143d3a..fbcab95354 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 2f82a3316e..0101464c82 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 5492d85138..81efa44cc6 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 856b016968..6eeb24d6b4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index add9896239..30437f25ee 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 5c9d93d36b..feec706a25 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 0390cf735d..f266ce106a 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 35491453cd..2df07f7ea1 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 8a3593c4f2..b6b528cec4 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-internal:=true; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index f747347f3b..c19e0aa253 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 3ba93e8954..a002290378 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index cb4ed20b77..9cf812ce3b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 7abd222145..e84ac4d574 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index b4ae76572d..ed6115b046 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 1d2f57347b..4e8da25752 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 32dc1ad6c5..fdc5ffb8b3 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 8f47595e75..5a5dd88587 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 3674a182eb..c936b09fd7 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 8efc4a052a..423d22b748 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.2.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 83bf7c662a..12363f802e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index ab83ebfd7f..ada06ed656 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 53893f7ca7..659ad8549f 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.202501291320-m2 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 50d3e73fdf..0f9ec1fb22 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202501291320-m2 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202501291320-m2";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index bf94175fc4..df7ae83647 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 19b7cff6ff..e6ea7488f0 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0.202501291320-m2 + 7.2.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From c3c7f680c6bee238617f25f6aa85d0b565fc8ecb Mon Sep 17 00:00:00 2001 From: Luca Milanesio Date: Thu, 30 Jan 2025 18:20:02 +0000 Subject: PackDirectory: make template variables names more readable Follow-up of I57b24ffb0b3 addressing a readability issue on the variable names of the PackDirectory.handlePackError() method. Change-Id: I877a45328e9b7026e66f300c363ea5c1625af157 --- .../jgit/internal/storage/file/PackDirectory.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index 706dbd6281..1ce14b3a18 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -313,42 +313,42 @@ class PackDirectory { } private void handlePackError(IOException e, Pack p) { - String warnTmpl = null; - String debugTmpl = null; + String warnTemplate = null; + String debugTemplate = null; int transientErrorCount = 0; - String errTmpl = JGitText.get().exceptionWhileReadingPack; + String errorTemplate = JGitText.get().exceptionWhileReadingPack; if ((e instanceof CorruptObjectException) || (e instanceof PackInvalidException)) { - warnTmpl = JGitText.get().corruptPack; - LOG.warn(MessageFormat.format(warnTmpl, + warnTemplate = JGitText.get().corruptPack; + LOG.warn(MessageFormat.format(warnTemplate, p.getPackFile().getAbsolutePath()), e); // Assume the pack is corrupted, and remove it from the list. remove(p); } else if (e instanceof FileNotFoundException) { if (p.getPackFile().exists()) { - errTmpl = JGitText.get().packInaccessible; + errorTemplate = JGitText.get().packInaccessible; transientErrorCount = p.incrementTransientErrorCount(); } else { - debugTmpl = JGitText.get().packWasDeleted; + debugTemplate = JGitText.get().packWasDeleted; remove(p); } } else if (FileUtils.isStaleFileHandleInCausalChain(e)) { - warnTmpl = JGitText.get().packHandleIsStale; + warnTemplate = JGitText.get().packHandleIsStale; remove(p); } else { transientErrorCount = p.incrementTransientErrorCount(); } - if (warnTmpl != null) { - LOG.warn(MessageFormat.format(warnTmpl, + if (warnTemplate != null) { + LOG.warn(MessageFormat.format(warnTemplate, p.getPackFile().getAbsolutePath()), e); - } else if (debugTmpl != null) { - LOG.debug(MessageFormat.format(debugTmpl, + } else if (debugTemplate != null) { + LOG.debug(MessageFormat.format(debugTemplate, p.getPackFile().getAbsolutePath()), e); } else { if (doLogExponentialBackoff(transientErrorCount)) { // Don't remove the pack from the list, as the error may be // transient. - LOG.error(MessageFormat.format(errTmpl, + LOG.error(MessageFormat.format(errorTemplate, p.getPackFile().getAbsolutePath(), Integer.valueOf(transientErrorCount)), e); } -- cgit v1.2.3 From a8efd046fa5f47351f91b5dddd13becb83b9bdc8 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Wed, 29 Jan 2025 09:47:01 -0800 Subject: RevWalk: Add an isMergedIntoAnyCommit() method RevWalk had a bulk isMergedIntoAny() method, however it worked only for Refs. Add a similar method which works for RevCommits instead. Unfortunately isMergedIntoAny() cannot be overloaded since java does not include the generic types in Collections of method signatures, so the method name needs to be more complicated to differentiate it from the existing method. Change-Id: I4f8f3a83058a186fafe3b37726e21c5074a6b8e1 Signed-off-by: Martin Fick --- .../jgit/revwalk/RevWalkUtilsReachableTest.java | 3 +- org.eclipse.jgit/.settings/.api_filters | 8 ++++ .../src/org/eclipse/jgit/revwalk/RevWalk.java | 56 ++++++++++++++++++---- 3 files changed, 58 insertions(+), 9 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkUtilsReachableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkUtilsReachableTest.java index 0a045c917b..ffc7c96f69 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkUtilsReachableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkUtilsReachableTest.java @@ -14,6 +14,7 @@ import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import java.util.Collection; +import java.util.HashSet; import java.util.List; import org.eclipse.jgit.api.Git; @@ -121,7 +122,7 @@ public class RevWalkUtilsReachableTest extends RevWalkTestCase { Collection sortedRefs = RefComparator.sort(allRefs); List actual = RevWalkUtils.findBranchesReachableFrom(commit, rw, sortedRefs); - assertEquals(refsThatShouldContainCommit, actual); + assertEquals(new HashSet<>(refsThatShouldContainCommit), new HashSet<>(actual)); } } diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 94adb25f78..4d7d7d07b7 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -80,6 +80,14 @@ + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java index 76c14e9c26..9714fab325 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevWalk.java @@ -19,9 +19,14 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Optional; +import java.util.Map; +import java.util. +Optional; +import java.util.Set; import org.eclipse.jgit.annotations.NonNull; import org.eclipse.jgit.annotations.Nullable; @@ -539,6 +544,27 @@ public class RevWalk implements Iterable, AutoCloseable { NullProgressMonitor.INSTANCE).size() > 0; } + /** + * Determine if a commit is merged into any of the given + * revs. + * + * @param commit + * commit the caller thinks is reachable from revs. + * @param revs + * commits to start iteration from, and which is most likely a + * descendant (child) of commit. + * @return true if commit is merged into any of the revs; false otherwise. + * @throws java.io.IOException + * a pack file or loose object could not be read. + * @since 6.10.1 + */ + public boolean isMergedIntoAnyCommit(RevCommit commit, Collection revs) + throws IOException { + return getCommitsMergedInto(commit, revs, + GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND, + NullProgressMonitor.INSTANCE).size() > 0; + } + /** * Determine if a commit is merged into all of the given * refs. @@ -562,7 +588,26 @@ public class RevWalk implements Iterable, AutoCloseable { private List getMergedInto(RevCommit needle, Collection haystacks, Enum returnStrategy, ProgressMonitor monitor) throws IOException { + Map> refsByCommit = new HashMap<>(); + for (Ref r : haystacks) { + RevObject o = peel(parseAny(r.getObjectId())); + if (!(o instanceof RevCommit)) { + continue; + } + refsByCommit.computeIfAbsent((RevCommit) o, c -> new ArrayList<>()).add(r); + } + monitor.update(1); List result = new ArrayList<>(); + for (RevCommit c : getCommitsMergedInto(needle, refsByCommit.keySet(), + returnStrategy, monitor)) { + result.addAll(refsByCommit.get(c)); + } + return result; + } + + private Set getCommitsMergedInto(RevCommit needle, Collection haystacks, + Enum returnStrategy, ProgressMonitor monitor) throws IOException { + Set result = new HashSet<>(); List uninteresting = new ArrayList<>(); List marked = new ArrayList<>(); RevFilter oldRF = filter; @@ -578,16 +623,11 @@ public class RevWalk implements Iterable, AutoCloseable { needle.parseHeaders(this); } int cutoff = needle.getGeneration(); - for (Ref r : haystacks) { + for (RevCommit c : haystacks) { if (monitor.isCancelled()) { return result; } monitor.update(1); - RevObject o = peel(parseAny(r.getObjectId())); - if (!(o instanceof RevCommit)) { - continue; - } - RevCommit c = (RevCommit) o; reset(UNINTERESTING | TEMP_MARK); markStart(c); boolean commitFound = false; @@ -599,7 +639,7 @@ public class RevWalk implements Iterable, AutoCloseable { } if (References.isSameObject(next, needle) || (next.flags & TEMP_MARK) != 0) { - result.add(r); + result.add(c); if (returnStrategy == GetMergedIntoStrategy.RETURN_ON_FIRST_FOUND) { return result; } -- cgit v1.2.3 From ccef9d428c219d92a6300ec91af4f8245dc32cd4 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 30 Jan 2025 13:38:02 -0800 Subject: PackIndex.MutableEntry: new methods to copy its contents To build the multipack index, we will iterate over N indexes merging the results in sha1 order. With the current MutableEntry API, we need to create an instance of ObjectId to either compare and/or copy the selected entry to the multi index iterator. Allow MutableEntries to compare to each other without creating any new object, and copy their object id directly to another MutableObjectId. This allows to build other iterators with mutable entries that copy the required memory (few ints) instead of creating short-lived instances of ObjectId. Change-Id: I0c0091420d7c0847c03afdc9e73b566bb4eeba40 --- .../internal/storage/file/PackIndexTestCase.java | 83 +++++++++++++++------- .../jgit/internal/storage/file/PackIndex.java | 36 ++++++++-- 2 files changed, 91 insertions(+), 28 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java index 24bdc4a97a..1f934acced 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/PackIndexTestCase.java @@ -13,6 +13,7 @@ package org.eclipse.jgit.internal.storage.file; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; @@ -25,6 +26,7 @@ import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.internal.storage.file.PackIndex.MutableEntry; import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.MutableObjectId; import org.eclipse.jgit.lib.ObjectId; import org.junit.Test; @@ -99,6 +101,39 @@ public abstract class PackIndexTestCase extends RepositoryTestCase { } } + @Test + public void testIteratorMutableEntryCompareTo() { + Iterator iterA = smallIdx.iterator(); + Iterator iterB = smallIdx.iterator(); + + MutableEntry aEntry = iterA.next(); + iterB.next(); + MutableEntry bEntry = iterB.next(); + // b is one ahead + assertTrue(aEntry.compareBySha1To(bEntry) < 0); + assertTrue(bEntry.compareBySha1To(aEntry) > 0); + + // advance a, now should be equal + assertEquals(0, iterA.next().compareBySha1To(bEntry)); + } + + @Test + public void testIteratorMutableEntryCopyTo() { + Iterator it = smallIdx.iterator(); + + MutableObjectId firstOidCopy = new MutableObjectId(); + MutableEntry next = it.next(); + next.copyOidTo(firstOidCopy); + ObjectId firstImmutable = next.toObjectId(); + + MutableEntry second = it.next(); + + // The copy has the right value after "next" + assertTrue(firstImmutable.equals(firstOidCopy)); + assertFalse("iterator has moved", + second.toObjectId().equals(firstImmutable)); + } + /** * Test results of iterator comparing to content of well-known (prepared) * small index. @@ -106,22 +141,22 @@ public abstract class PackIndexTestCase extends RepositoryTestCase { @Test public void testIteratorReturnedValues1() { Iterator iter = smallIdx.iterator(); - assertEquals("4b825dc642cb6eb9a060e54bf8d69288fbee4904", iter.next() - .name()); - assertEquals("540a36d136cf413e4b064c2b0e0a4db60f77feab", iter.next() - .name()); - assertEquals("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259", iter.next() - .name()); - assertEquals("6ff87c4664981e4397625791c8ea3bbb5f2279a3", iter.next() - .name()); - assertEquals("82c6b885ff600be425b4ea96dee75dca255b69e7", iter.next() - .name()); - assertEquals("902d5476fa249b7abc9d84c611577a81381f0327", iter.next() - .name()); - assertEquals("aabf2ffaec9b497f0950352b3e582d73035c2035", iter.next() - .name()); - assertEquals("c59759f143fb1fe21c197981df75a7ee00290799", iter.next() - .name()); + assertEquals("4b825dc642cb6eb9a060e54bf8d69288fbee4904", + iter.next().name()); + assertEquals("540a36d136cf413e4b064c2b0e0a4db60f77feab", + iter.next().name()); + assertEquals("5b6e7c66c276e7610d4a73c70ec1a1f7c1003259", + iter.next().name()); + assertEquals("6ff87c4664981e4397625791c8ea3bbb5f2279a3", + iter.next().name()); + assertEquals("82c6b885ff600be425b4ea96dee75dca255b69e7", + iter.next().name()); + assertEquals("902d5476fa249b7abc9d84c611577a81381f0327", + iter.next().name()); + assertEquals("aabf2ffaec9b497f0950352b3e582d73035c2035", + iter.next().name()); + assertEquals("c59759f143fb1fe21c197981df75a7ee00290799", + iter.next().name()); assertFalse(iter.hasNext()); } @@ -198,16 +233,16 @@ public abstract class PackIndexTestCase extends RepositoryTestCase { @Test public void testIteratorReturnedValues2() { Iterator iter = denseIdx.iterator(); - while (!iter.next().name().equals( - "0a3d7772488b6b106fb62813c4d6d627918d9181")) { + while (!iter.next().name() + .equals("0a3d7772488b6b106fb62813c4d6d627918d9181")) { // just iterating } - assertEquals("1004d0d7ac26fbf63050a234c9b88a46075719d3", iter.next() - .name()); // same level-1 - assertEquals("10da5895682013006950e7da534b705252b03be6", iter.next() - .name()); // same level-1 - assertEquals("1203b03dc816ccbb67773f28b3c19318654b0bc8", iter.next() - .name()); + assertEquals("1004d0d7ac26fbf63050a234c9b88a46075719d3", + iter.next().name()); // same level-1 + assertEquals("10da5895682013006950e7da534b705252b03be6", + iter.next().name()); // same level-1 + assertEquals("1203b03dc816ccbb67773f28b3c19318654b0bc8", + iter.next().name()); } @Test diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java index 7189ce20a6..b3e4efb4fc 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackIndex.java @@ -286,7 +286,7 @@ public interface PackIndex * the index cannot be read. */ void resolve(Set matches, AbbreviatedObjectId id, - int matchLimit) throws IOException; + int matchLimit) throws IOException; /** * Get pack checksum @@ -304,6 +304,7 @@ public interface PackIndex class MutableEntry { /** Buffer of the ObjectId visited by the EntriesIterator. */ final MutableObjectId idBuffer = new MutableObjectId(); + /** Offset into the packfile of the current object. */ long offset; @@ -345,6 +346,34 @@ public interface PackIndex r.offset = offset; return r; } + + /** + * Similar to {@link Comparable#compareTo(Object)}, using only the + * object id in the entry. + * + * @param other + * Another mutable entry (probably from another index) + * + * @return a negative integer, zero, or a positive integer as this + * object is less than, equal to, or greater than the specified + * object. + */ + public int compareBySha1To(MutableEntry other) { + return idBuffer.compareTo(other.idBuffer); + } + + /** + * Copy the current ObjectId to dest + *

+ * Like {@link #toObjectId()}, but reusing the destination instead of + * creating a new ObjectId instance. + * + * @param dest + * destination for the object id + */ + public void copyOidTo(MutableObjectId dest) { + dest.fromObjectId(idBuffer); + } } /** @@ -368,7 +397,6 @@ public interface PackIndex this.objectCount = objectCount; } - @Override public boolean hasNext() { return returnedNumber < objectCount; @@ -393,7 +421,6 @@ public interface PackIndex */ protected abstract void readNext(); - /** * Copies to the entry an {@link ObjectId} from the int buffer and * position idx @@ -423,7 +450,8 @@ public interface PackIndex /** * Sets the {@code offset} to the entry * - * @param offset the offset in the pack file + * @param offset + * the offset in the pack file */ protected void setOffset(long offset) { entry.offset = offset; -- cgit v1.2.3 From 29e014aad0399fe8ede7c101d01b6e440ac9966b Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 23 Jan 2025 15:33:37 -0800 Subject: midx.PackIndexMerger: Helper to iterate over n-indexes The multipack index can be build merging the individual pack indexes and handling correctly the duplicates. PackIndexMerger is a utility function that gathers n-indexes and allows to iterate as one with the correct sha1 order. It also precalculates some of the needed metadata (as count of objects without duplicates, or if offsets go over 32 bits). Change-Id: I515b70fffff4489d83834488daf975f85726ea96 --- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 1 + .../internal/storage/midx/PackIndexMergerTest.java | 239 +++++++++++++++ .../storage/midx/PackIndexPeekIteratorTest.java | 71 +++++ org.eclipse.jgit/META-INF/MANIFEST.MF | 1 + .../internal/storage/midx/PackIndexMerger.java | 337 +++++++++++++++++++++ 5 files changed, 649 insertions(+) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexPeekIteratorTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 5a5dd88587..af5fd1c53a 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -48,6 +48,7 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.io;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.memory;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.transport.connectivity;version="[7.2.0,7.3.0)", diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java new file mode 100644 index 0000000000..1d8bde0f44 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexMergerTest.java @@ -0,0 +1,239 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import java.util.Iterator; +import java.util.Map; + +import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.junit.FakeIndexFactory; +import org.eclipse.jgit.junit.FakeIndexFactory.IndexObject; +import org.junit.Test; + +public class PackIndexMergerTest { + + @Test + public void rawIterator_noDuplicates() { + PackIndex idxOne = indexOf( + oidOffset("0000000000000000000000000000000000000001", 500), + oidOffset("0000000000000000000000000000000000000005", 12), + oidOffset("0000000000000000000000000000000000000010", 1500)); + PackIndex idxTwo = indexOf( + oidOffset("0000000000000000000000000000000000000002", 501), + oidOffset("0000000000000000000000000000000000000003", 13), + oidOffset("0000000000000000000000000000000000000015", 1501)); + PackIndex idxThree = indexOf( + oidOffset("0000000000000000000000000000000000000004", 502), + oidOffset("0000000000000000000000000000000000000007", 14), + oidOffset("0000000000000000000000000000000000000012", 1502)); + PackIndexMerger merger = new PackIndexMerger( + Map.of("p1", idxOne, "p2", idxTwo, "p3", idxThree)); + assertEquals(9, merger.getUniqueObjectCount()); + assertEquals(3, merger.getPackCount()); + assertFalse(merger.needsLargeOffsetsChunk()); + Iterator it = merger.rawIterator(); + assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); + assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501); + assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13); + assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 502); + assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12); + assertNextEntry(it, "0000000000000000000000000000000000000007", 2, 14); + assertNextEntry(it, "0000000000000000000000000000000000000010", 0, + 1500); + assertNextEntry(it, "0000000000000000000000000000000000000012", 2, + 1502); + assertNextEntry(it, "0000000000000000000000000000000000000015", 1, + 1501); + assertFalse(it.hasNext()); + } + + @Test + public void rawIterator_allDuplicates() { + PackIndex idxOne = indexOf( + oidOffset("0000000000000000000000000000000000000001", 500), + oidOffset("0000000000000000000000000000000000000005", 12), + oidOffset("0000000000000000000000000000000000000010", 1500)); + PackIndexMerger merger = new PackIndexMerger( + Map.of("p1", idxOne, "p2", idxOne, "p3", idxOne)); + assertEquals(3, merger.getUniqueObjectCount()); + assertEquals(3, merger.getPackCount()); + assertFalse(merger.needsLargeOffsetsChunk()); + Iterator it = merger.rawIterator(); + assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); + assertNextEntry(it, "0000000000000000000000000000000000000001", 1, 500); + assertNextEntry(it, "0000000000000000000000000000000000000001", 2, 500); + assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12); + assertNextEntry(it, "0000000000000000000000000000000000000005", 1, 12); + assertNextEntry(it, "0000000000000000000000000000000000000005", 2, 12); + assertNextEntry(it, "0000000000000000000000000000000000000010", 0, + 1500); + assertNextEntry(it, "0000000000000000000000000000000000000010", 1, + 1500); + assertNextEntry(it, "0000000000000000000000000000000000000010", 2, + 1500); + assertFalse(it.hasNext()); + } + + @Test + public void bySha1Iterator_noDuplicates() { + PackIndex idxOne = indexOf( + oidOffset("0000000000000000000000000000000000000001", 500), + oidOffset("0000000000000000000000000000000000000005", 12), + oidOffset("0000000000000000000000000000000000000010", 1500)); + PackIndex idxTwo = indexOf( + oidOffset("0000000000000000000000000000000000000002", 501), + oidOffset("0000000000000000000000000000000000000003", 13), + oidOffset("0000000000000000000000000000000000000015", 1501)); + PackIndex idxThree = indexOf( + oidOffset("0000000000000000000000000000000000000004", 502), + oidOffset("0000000000000000000000000000000000000007", 14), + oidOffset("0000000000000000000000000000000000000012", 1502)); + PackIndexMerger merger = new PackIndexMerger( + Map.of("p1", idxOne, "p2", idxTwo, "p3", idxThree)); + assertEquals(9, merger.getUniqueObjectCount()); + assertEquals(3, merger.getPackCount()); + assertFalse(merger.needsLargeOffsetsChunk()); + Iterator it = merger.bySha1Iterator(); + assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); + assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 501); + assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 13); + assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 502); + assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12); + assertNextEntry(it, "0000000000000000000000000000000000000007", 2, 14); + assertNextEntry(it, "0000000000000000000000000000000000000010", 0, + 1500); + assertNextEntry(it, "0000000000000000000000000000000000000012", 2, + 1502); + assertNextEntry(it, "0000000000000000000000000000000000000015", 1, + 1501); + assertFalse(it.hasNext()); + } + + @Test + public void bySha1Iterator_allDuplicates() { + PackIndex idxOne = indexOf( + oidOffset("0000000000000000000000000000000000000001", 500), + oidOffset("0000000000000000000000000000000000000005", 12), + oidOffset("0000000000000000000000000000000000000010", 1500)); + PackIndexMerger merger = new PackIndexMerger( + Map.of("p1", idxOne, "p2", idxOne, "p3", idxOne)); + assertEquals(3, merger.getUniqueObjectCount()); + assertEquals(3, merger.getPackCount()); + assertFalse(merger.needsLargeOffsetsChunk()); + Iterator it = merger.bySha1Iterator(); + assertNextEntry(it, "0000000000000000000000000000000000000001", 0, 500); + assertNextEntry(it, "0000000000000000000000000000000000000005", 0, 12); + assertNextEntry(it, "0000000000000000000000000000000000000010", 0, + 1500); + assertFalse(it.hasNext()); + } + + @Test + public void bySha1Iterator_differentIndexSizes() { + PackIndex idxOne = indexOf( + oidOffset("0000000000000000000000000000000000000010", 1500)); + PackIndex idxTwo = indexOf( + oidOffset("0000000000000000000000000000000000000002", 500), + oidOffset("0000000000000000000000000000000000000003", 12)); + PackIndex idxThree = indexOf( + oidOffset("0000000000000000000000000000000000000004", 500), + oidOffset("0000000000000000000000000000000000000007", 12), + oidOffset("0000000000000000000000000000000000000012", 1500)); + PackIndexMerger merger = new PackIndexMerger( + Map.of("p1", idxOne, "p2", idxTwo, "p3", idxThree)); + assertEquals(6, merger.getUniqueObjectCount()); + assertEquals(3, merger.getPackCount()); + assertFalse(merger.needsLargeOffsetsChunk()); + Iterator it = merger.bySha1Iterator(); + assertNextEntry(it, "0000000000000000000000000000000000000002", 1, 500); + assertNextEntry(it, "0000000000000000000000000000000000000003", 1, 12); + assertNextEntry(it, "0000000000000000000000000000000000000004", 2, 500); + assertNextEntry(it, "0000000000000000000000000000000000000007", 2, 12); + assertNextEntry(it, "0000000000000000000000000000000000000010", 0, + 1500); + assertNextEntry(it, "0000000000000000000000000000000000000012", 2, + 1500); + assertFalse(it.hasNext()); + } + + @Test + public void merger_noIndexes() { + PackIndexMerger merger = new PackIndexMerger(Map.of()); + assertEquals(0, merger.getUniqueObjectCount()); + assertFalse(merger.needsLargeOffsetsChunk()); + assertTrue(merger.getPackNames().isEmpty()); + assertEquals(0, merger.getPackCount()); + assertFalse(merger.bySha1Iterator().hasNext()); + } + + @Test + public void merger_emptyIndexes() { + PackIndexMerger merger = new PackIndexMerger( + Map.of("p1", indexOf(), "p2", indexOf())); + assertEquals(0, merger.getUniqueObjectCount()); + assertFalse(merger.needsLargeOffsetsChunk()); + assertEquals(2, merger.getPackNames().size()); + assertEquals(2, merger.getPackCount()); + assertFalse(merger.bySha1Iterator().hasNext()); + } + + @Test + public void bySha1Iterator_largeOffsets_needsChunk() { + PackIndex idx1 = indexOf( + oidOffset("0000000000000000000000000000000000000002", 1L << 32), + oidOffset("0000000000000000000000000000000000000004", 12)); + PackIndex idx2 = indexOf(oidOffset( + "0000000000000000000000000000000000000003", (1L << 31) + 10)); + PackIndexMerger merger = new PackIndexMerger( + Map.of("p1", idx1, "p2", idx2)); + assertTrue(merger.needsLargeOffsetsChunk()); + assertEquals(2, merger.getOffsetsOver31BitsCount()); + assertEquals(3, merger.getUniqueObjectCount()); + } + + @Test + public void bySha1Iterator_largeOffsets_noChunk() { + // If no value is over 2^32-1, then we don't need large offset + PackIndex idx1 = indexOf( + oidOffset("0000000000000000000000000000000000000002", + (1L << 31) + 15), + oidOffset("0000000000000000000000000000000000000004", 12)); + PackIndex idx2 = indexOf(oidOffset( + "0000000000000000000000000000000000000003", (1L << 31) + 10)); + PackIndexMerger merger = new PackIndexMerger( + Map.of("p1", idx1, "p2", idx2)); + assertFalse(merger.needsLargeOffsetsChunk()); + assertEquals(2, merger.getOffsetsOver31BitsCount()); + assertEquals(3, merger.getUniqueObjectCount()); + } + + private static void assertNextEntry( + Iterator it, String oid, + int packId, long offset) { + assertTrue(it.hasNext()); + PackIndexMerger.MidxMutableEntry e = it.next(); + assertEquals(oid, e.getObjectId().name()); + assertEquals(packId, e.getPackId()); + assertEquals(offset, e.getOffset()); + } + + private static IndexObject oidOffset(String oid, long offset) { + return new IndexObject(oid, offset); + } + + private static PackIndex indexOf(IndexObject... objs) { + return FakeIndexFactory.indexOf(Arrays.asList(objs)); + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexPeekIteratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexPeekIteratorTest.java new file mode 100644 index 0000000000..917288a899 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/PackIndexPeekIteratorTest.java @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.util.Arrays; + +import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.junit.FakeIndexFactory; +import org.junit.Test; + +public class PackIndexPeekIteratorTest { + @Test + public void next() { + PackIndex index1 = indexOf( + object("0000000000000000000000000000000000000001", 500), + object("0000000000000000000000000000000000000003", 1500), + object("0000000000000000000000000000000000000005", 3000)); + PackIndexMerger.PackIndexPeekIterator it = new PackIndexMerger.PackIndexPeekIterator(0, index1); + assertEquals("0000000000000000000000000000000000000001", it.next().name()); + assertEquals("0000000000000000000000000000000000000003", it.next().name()); + assertEquals("0000000000000000000000000000000000000005", it.next().name()); + assertNull(it.next()); + } + + @Test + public void peek_doesNotAdvance() { + PackIndex index1 = indexOf( + object("0000000000000000000000000000000000000001", 500), + object("0000000000000000000000000000000000000003", 1500), + object("0000000000000000000000000000000000000005", 3000)); + PackIndexMerger.PackIndexPeekIterator it = new PackIndexMerger.PackIndexPeekIterator(0, index1); + it.next(); + assertEquals("0000000000000000000000000000000000000001", it.peek().name()); + assertEquals("0000000000000000000000000000000000000001", it.peek().name()); + it.next(); + assertEquals("0000000000000000000000000000000000000003", it.peek().name()); + assertEquals("0000000000000000000000000000000000000003", it.peek().name()); + it.next(); + assertEquals("0000000000000000000000000000000000000005", it.peek().name()); + assertEquals("0000000000000000000000000000000000000005", it.peek().name()); + it.next(); + assertNull(it.peek()); + assertNull(it.peek()); + } + + @Test + public void empty() { + PackIndex index1 = indexOf(); + PackIndexMerger.PackIndexPeekIterator it = new PackIndexMerger.PackIndexPeekIterator(0, index1); + assertNull(it.next()); + assertNull(it.peek()); + } + + private static PackIndex indexOf(FakeIndexFactory.IndexObject... objs) { + return FakeIndexFactory.indexOf(Arrays.asList(objs)); + } + + private static FakeIndexFactory.IndexObject object(String name, long offset) { + return new FakeIndexFactory.IndexObject(name, offset); + } +} \ No newline at end of file diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 659ad8549f..f5cc16cfe2 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -105,6 +105,7 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.pgm", org.eclipse.jgit.internal.storage.memory;version="7.2.0"; x-friends:="org.eclipse.jgit.test", + org.eclipse.jgit.internal.storage.midx;version="7.2.0", org.eclipse.jgit.internal.storage.pack;version="7.2.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java new file mode 100644 index 0000000000..89814af107 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/PackIndexMerger.java @@ -0,0 +1,337 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; +import java.util.stream.Collectors; + +import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.MutableObjectId; + +/** + * Collect the stats and offers an iterator over the union of n-pack indexes. + *

+ * The multipack index is a list of (sha1, packid, offset) ordered by sha1. We + * can build it from the individual pack indexes (sha1, offset) ordered by sha1, + * with a simple merge ignoring duplicates. + *

+ * This class encapsulates the merging logic and precalculates the stats that + * the index needs (like total count of objects). To limit memory consumption, + * it does the merge as it goes during the iteration and iterators use mutable + * entries. The stats of the combined index are calculated in an iteration at + * construction time. + */ +class PackIndexMerger { + + private static final int LIMIT_31_BITS = (1 << 31) - 1; + + private static final long LIMIT_32_BITS = (1L << 32) - 1; + + /** + * Object returned by the iterator. + *

+ * The iterator returns (on each next()) the same instance with different + * values, to avoid allocating many short-lived objects. Callers should not + * keep a reference to that returned value. + */ + static class MidxMutableEntry { + // The object id + private final MutableObjectId oid = new MutableObjectId(); + + // Position of the pack in the ordered list of pack in this merger + private int packId; + + // Offset in its pack + private long offset; + + public AnyObjectId getObjectId() { + return oid; + } + + public int getPackId() { + return packId; + } + + public long getOffset() { + return offset; + } + + /** + * Copy values from another mutable entry + * + * @param packId + * packId + * @param other + * another mutable entry + */ + private void fill(int packId, PackIndex.MutableEntry other) { + other.copyOidTo(oid); + this.packId = packId; + this.offset = other.getOffset(); + } + } + + private final List packNames; + + private final List indexes; + + private final boolean needsLargeOffsetsChunk; + + private final int offsetsOver31BitsCount; + + private final int uniqueObjectCount; + + PackIndexMerger(Map packs) { + this.packNames = packs.keySet().stream().sorted() + .collect(Collectors.toUnmodifiableList()); + + this.indexes = packNames.stream().map(packs::get) + .collect(Collectors.toUnmodifiableList()); + + // Iterate for duplicates + int objectCount = 0; + boolean hasLargeOffsets = false; + int over31bits = 0; + MutableObjectId lastSeen = new MutableObjectId(); + MultiIndexIterator it = new MultiIndexIterator(indexes); + while (it.hasNext()) { + MidxMutableEntry entry = it.next(); + if (lastSeen.equals(entry.oid)) { + continue; + } + // If there is at least one offset value larger than 2^32-1, then + // the large offset chunk must exist, and offsets larger than + // 2^31-1 must be stored in it instead + if (entry.offset > LIMIT_32_BITS) { + hasLargeOffsets = true; + } + if (entry.offset > LIMIT_31_BITS) { + over31bits++; + } + + lastSeen.fromObjectId(entry.oid); + objectCount++; + } + uniqueObjectCount = objectCount; + offsetsOver31BitsCount = over31bits; + needsLargeOffsetsChunk = hasLargeOffsets; + } + + /** + * Object count of the merged index (i.e. without duplicates) + * + * @return object count of the merged index + */ + int getUniqueObjectCount() { + return uniqueObjectCount; + } + + /** + * If any object in any of the indexes has an offset over 2^32-1 + * + * @return true if there is any object with offset > 2^32 -1 + */ + boolean needsLargeOffsetsChunk() { + return needsLargeOffsetsChunk; + } + + /** + * How many object have offsets over 2^31-1 + *

+ * Per multipack index spec, IF there is large offset chunk, all this + * offsets should be there. + * + * @return number of objects with offsets over 2^31-1 + */ + int getOffsetsOver31BitsCount() { + return offsetsOver31BitsCount; + } + + /** + * List of pack names in alphabetical order. + *

+ * Order matters: In case of duplicates, the multipack index prefers the + * first package with it. This is in the same order we are using to + * prioritize duplicates. + * + * @return List of pack names, in the order used by the merge. + */ + List getPackNames() { + return packNames; + } + + /** + * How many packs are being merged + * + * @return count of packs merged + */ + int getPackCount() { + return packNames.size(); + } + + /** + * Iterator over the merged indexes in sha1 order without duplicates + *

+ * The returned entry in the iterator is mutable, callers should NOT keep a + * reference to it. + * + * @return an iterator in sha1 order without duplicates. + */ + Iterator bySha1Iterator() { + return new DedupMultiIndexIterator(new MultiIndexIterator(indexes), + getUniqueObjectCount()); + } + + /** + * For testing. Iterate all entries, not skipping duplicates (stable order) + * + * @return an iterator of all objects in sha1 order, including duplicates. + */ + Iterator rawIterator() { + return new MultiIndexIterator(indexes); + } + + /** + * Iterator over n-indexes in ObjectId order. + *

+ * It returns duplicates if the same object id is in different indexes. Wrap + * it with {@link DedupMultiIndexIterator (Iterator, int)} to avoid + * duplicates. + */ + private static final class MultiIndexIterator + implements Iterator { + + private final List indexIterators; + + private final MidxMutableEntry mutableEntry = new MidxMutableEntry(); + + MultiIndexIterator(List indexes) { + this.indexIterators = new ArrayList<>(indexes.size()); + for (int i = 0; i < indexes.size(); i++) { + PackIndexPeekIterator it = new PackIndexPeekIterator(i, + indexes.get(i)); + // Position in the first element + if (it.next() != null) { + indexIterators.add(it); + } + } + } + + @Override + public boolean hasNext() { + return !indexIterators.isEmpty(); + } + + @Override + public MidxMutableEntry next() { + PackIndexPeekIterator winner = null; + for (int index = 0; index < indexIterators.size(); index++) { + PackIndexPeekIterator current = indexIterators.get(index); + if (winner == null + || current.peek().compareBySha1To(winner.peek()) < 0) { + winner = current; + } + } + + if (winner == null) { + throw new NoSuchElementException(); + } + + mutableEntry.fill(winner.getPackId(), winner.peek()); + if (winner.next() == null) { + indexIterators.remove(winner); + }; + return mutableEntry; + } + } + + private static class DedupMultiIndexIterator + implements Iterator { + private final MultiIndexIterator src; + + private int remaining; + + private final MutableObjectId lastOid = new MutableObjectId(); + + DedupMultiIndexIterator(MultiIndexIterator src, int totalCount) { + this.src = src; + this.remaining = totalCount; + } + + @Override + public boolean hasNext() { + return remaining > 0; + } + + @Override + public MidxMutableEntry next() { + MidxMutableEntry next = src.next(); + while (next != null && lastOid.equals(next.oid)) { + next = src.next(); + } + + if (next == null) { + throw new NoSuchElementException(); + } + + lastOid.fromObjectId(next.oid); + remaining--; + return next; + } + } + + /** + * Convenience around the PackIndex iterator to read the current value + * multiple times without consuming it. + *

+ * This is used to merge indexes in the multipack index, where we need to + * compare the current value between indexes multiple times to find the + * next. + *

+ * We could also implement this keeping the position (int) and + * MutableEntry#getObjectId, but that would create an ObjectId per entry. + * This implementation reuses the MutableEntry and avoid instantiations. + */ + // Visible for testing + static class PackIndexPeekIterator { + private final Iterator it; + + private final int packId; + + PackIndex.MutableEntry current; + + PackIndexPeekIterator(int packId, PackIndex index) { + it = index.iterator(); + this.packId = packId; + } + + PackIndex.MutableEntry next() { + if (it.hasNext()) { + current = it.next(); + } else { + current = null; + } + return current; + } + + PackIndex.MutableEntry peek() { + return current; + } + + int getPackId() { + return packId; + } + } +} -- cgit v1.2.3 From 2d676271b9965f0a499bfe8de42c5fbb9c0eb346 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 4 Feb 2025 10:35:18 -0800 Subject: test.BUILD: add rule for "external tests" In exttst/ (external tests?) we have tests that compare results with cgit, but they are not in any bazel rule. Create bazel rules for the tests under exttst/ with a tag "ext". By default, disable that tag when running tests, as these can be slow/problematic due to their dependence to an external tool. bazel test //org.eclipse.jgit.test:all runs the same tests than before.. bazel test --test_tag_filter=ext //org.eclipse.jgit.test:all runs only these external tests. Change-Id: I9231fad11ab5ef550bba2d5aaaef60f1bf2094fe --- .bazelrc | 1 + org.eclipse.jgit.test/BUILD | 5 +++++ org.eclipse.jgit.test/tests.bzl | 6 ++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.bazelrc b/.bazelrc index 74601dc7d0..70322ddfcf 100644 --- a/.bazelrc +++ b/.bazelrc @@ -37,5 +37,6 @@ build:remote21 --config=remote test --build_tests_only test --test_output=errors test --flaky_test_attempts=3 +test --test_tag_filters=-ext import %workspace%/tools/remote-bazelrc diff --git a/org.eclipse.jgit.test/BUILD b/org.eclipse.jgit.test/BUILD index 29f5b36149..7755df0499 100644 --- a/org.eclipse.jgit.test/BUILD +++ b/org.eclipse.jgit.test/BUILD @@ -53,6 +53,11 @@ tests(tests = glob( exclude = HELPERS + DATA + EXCLUDED, )) + +tests(tests = glob(["exttst/**/*.java"]), + srcprefix = "exttst/", + extra_tags = ["ext"]) + # Non abstract base classes used for tests by other test classes BASE = [ PKG + "internal/storage/file/FileRepositoryBuilderTest.java", diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl index 170bf0c460..bae3b4fa2b 100644 --- a/org.eclipse.jgit.test/tests.bzl +++ b/org.eclipse.jgit.test/tests.bzl @@ -3,9 +3,9 @@ load( "junit_tests", ) -def tests(tests): +def tests(tests, srcprefix="tst/", extra_tags=[]): for src in tests: - name = src[len("tst/"):len(src) - len(".java")].replace("/", "_") + name = src[len(srcprefix):len(src) - len(".java")].replace("/", "_") labels = [] timeout = "moderate" if name.startswith("org_eclipse_jgit_"): @@ -20,6 +20,8 @@ def tests(tests): if "lib" not in labels: labels.append("lib") + labels.extend(extra_tags) + # TODO(http://eclip.se/534285): Make this test pass reliably # and remove the flaky attribute. flaky = src.endswith("CrissCrossMergeTest.java") -- cgit v1.2.3 From deae89f9e7ddda2b44492c47e9d6d027ed4e2cda Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 5 Feb 2025 23:55:14 +0100 Subject: CommitConfig: fix potential NPE The local variable `comment` is null if the option core.commentChar is unset. Change-Id: I907dabff395f75b3a6367446389df395b28f027a --- org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java index f701a41d67..b1ba5dfa28 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CommitConfig.java @@ -119,7 +119,7 @@ public class CommitConfig { if (!StringUtils.isEmptyOrNull(comment)) { if ("auto".equalsIgnoreCase(comment)) { //$NON-NLS-1$ autoCommentChar = true; - } else { + } else if (comment != null) { char first = comment.charAt(0); if (first > ' ' && first < 127) { commentCharacter = first; -- cgit v1.2.3 From a86e2a7d74fbbbdaa57f21e48ea16019771bcbe9 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Feb 2025 11:10:39 +0100 Subject: Config: add getters for primitive types without default value which return null if the option is not configured. Change-Id: I0d444b396458f49712e35ef32427dc45ee3f8ec8 --- .../tst/org/eclipse/jgit/lib/ConfigTest.java | 41 ++++ org.eclipse.jgit/.settings/.api_filters | 46 ++++ .../src/org/eclipse/jgit/lib/Config.java | 265 ++++++++++++++++++--- .../eclipse/jgit/lib/DefaultTypedConfigGetter.java | 79 ++++-- .../org/eclipse/jgit/lib/TypedConfigGetter.java | 140 ++++++++++- 5 files changed, 527 insertions(+), 44 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java index 31940a16f7..06fee8ea71 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/ConfigTest.java @@ -1636,6 +1636,47 @@ public class ConfigTest { assertFalse(config.get(CoreConfig.KEY).enableCommitGraph()); } + @Test + public void testGetNoDefaultBoolean() { + Config config = new Config(); + assertNull(config.getBoolean("foo", "bar")); + assertNull(config.getBoolean("foo", "bar", "baz")); + } + + @Test + public void testGetNoDefaultEnum() { + Config config = new Config(); + assertNull(config.getEnum(new TestEnum[] { TestEnum.ONE_TWO }, "foo", + "bar", "baz")); + } + + @Test + public void testGetNoDefaultInt() { + Config config = new Config(); + assertNull(config.getInt("foo", "bar")); + assertNull(config.getInt("foo", "bar", "baz")); + } + @Test + public void testGetNoDefaultIntInRange() { + Config config = new Config(); + assertNull(config.getIntInRange("foo", "bar", 1, 5)); + assertNull(config.getIntInRange("foo", "bar", "baz", 1, 5)); + } + + @Test + public void testGetNoDefaultLong() { + Config config = new Config(); + assertNull(config.getLong("foo", "bar")); + assertNull(config.getLong("foo", "bar", "baz")); + } + + @Test + public void testGetNoDefaultTimeUnit() { + Config config = new Config(); + assertNull(config.getTimeUnit("foo", "bar", "baz", + TimeUnit.SECONDS)); + } + private static void assertValueRoundTrip(String value) throws ConfigInvalidException { assertValueRoundTrip(value, value); diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters index 61d66582e0..877a488a73 100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@ -14,4 +14,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java index 07c5fa4500..345cb22f80 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Config.java @@ -34,6 +34,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.errors.ConfigInvalidException; import org.eclipse.jgit.events.ConfigChangedEvent; import org.eclipse.jgit.events.ConfigChangedListener; @@ -254,11 +255,27 @@ public class Config { * default value to return if no value was present. * @return an integer value from the configuration, or defaultValue. */ - public int getInt(final String section, final String name, - final int defaultValue) { - return typedGetter.getInt(this, section, null, name, defaultValue); + public int getInt(String section, String name, int defaultValue) { + return getInt(section, null, name, defaultValue); } + /** + * Obtain an integer value from the configuration. + * + * @param section + * section the key is grouped within. + * @param name + * name of the key to get. + * @return an integer value from the configuration, or {@code null} if not + * set. + * @since 7.2 + */ + @Nullable + public Integer getInt(String section, String name) { + return getInt(section, null, name); + } + + /** * Obtain an integer value from the configuration. * @@ -272,10 +289,30 @@ public class Config { * default value to return if no value was present. * @return an integer value from the configuration, or defaultValue. */ - public int getInt(final String section, String subsection, - final String name, final int defaultValue) { + public int getInt(String section, String subsection, String name, + int defaultValue) { + Integer v = typedGetter.getInt(this, section, subsection, name, + Integer.valueOf(defaultValue)); + return v == null ? defaultValue : v.intValue(); + } + + /** + * Obtain an integer value from the configuration. + * + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @return an integer value from the configuration, or {@code null} if not + * set. + * @since 7.2 + */ + @Nullable + public Integer getInt(String section, String subsection, String name) { return typedGetter.getInt(this, section, subsection, name, - defaultValue); + null); } /** @@ -297,8 +334,30 @@ public class Config { */ public int getIntInRange(String section, String name, int minValue, int maxValue, int defaultValue) { - return typedGetter.getIntInRange(this, section, null, name, minValue, - maxValue, defaultValue); + return getIntInRange(section, null, name, + minValue, maxValue, defaultValue); + } + + /** + * Obtain an integer value from the configuration which must be inside given + * range. + * + * @param section + * section the key is grouped within. + * @param name + * name of the key to get. + * @param minValue + * minimum value + * @param maxValue + * maximum value + * @return an integer value from the configuration, or {@code null} if not + * set. + * @since 7.2 + */ + @Nullable + public Integer getIntInRange(String section, String name, int minValue, + int maxValue) { + return getIntInRange(section, null, name, minValue, maxValue); } /** @@ -322,8 +381,34 @@ public class Config { */ public int getIntInRange(String section, String subsection, String name, int minValue, int maxValue, int defaultValue) { + Integer v = typedGetter.getIntInRange(this, section, subsection, name, + minValue, maxValue, Integer.valueOf(defaultValue)); + return v == null ? defaultValue : v.intValue(); + } + + /** + * Obtain an integer value from the configuration which must be inside given + * range. + * + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @param minValue + * minimum value + * @param maxValue + * maximum value + * @return an integer value from the configuration, or {@code null} if not + * set. + * @since 7.2 + */ + @Nullable + public Integer getIntInRange(String section, String subsection, String name, + int minValue, int maxValue) { return typedGetter.getIntInRange(this, section, subsection, name, - minValue, maxValue, defaultValue); + minValue, maxValue, null); } /** @@ -338,7 +423,23 @@ public class Config { * @return an integer value from the configuration, or defaultValue. */ public long getLong(String section, String name, long defaultValue) { - return typedGetter.getLong(this, section, null, name, defaultValue); + return getLong(section, null, name, defaultValue); + } + + /** + * Obtain an integer value from the configuration. + * + * @param section + * section the key is grouped within. + * @param name + * name of the key to get. + * @return an integer value from the configuration, or {@code null} if not + * set. + * @since 7.2 + */ + @Nullable + public Long getLong(String section, String name) { + return getLong(section, null, name); } /** @@ -355,9 +456,28 @@ public class Config { * @return an integer value from the configuration, or defaultValue. */ public long getLong(final String section, String subsection, - final String name, final long defaultValue) { - return typedGetter.getLong(this, section, subsection, name, - defaultValue); + String name, long defaultValue) { + Long v = typedGetter.getLong(this, section, subsection, name, + Long.valueOf(defaultValue)); + return v == null ? defaultValue : v.longValue(); + } + + /** + * Obtain an integer value from the configuration. + * + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @return an integer value from the configuration, or {@code null} if not + * set. + * @since 7.2 + */ + @Nullable + public Long getLong(String section, String subsection, String name) { + return typedGetter.getLong(this, section, subsection, name, null); } /** @@ -372,9 +492,26 @@ public class Config { * @return true if any value or defaultValue is true, false for missing or * explicit false */ - public boolean getBoolean(final String section, final String name, - final boolean defaultValue) { - return typedGetter.getBoolean(this, section, null, name, defaultValue); + public boolean getBoolean(String section, String name, + boolean defaultValue) { + Boolean v = typedGetter.getBoolean(this, section, null, name, + Boolean.valueOf(defaultValue)); + return v == null ? defaultValue : v.booleanValue(); + } + + /** + * Get a boolean value from the git config + * + * @param section + * section the key is grouped within. + * @param name + * name of the key to get. + * @return configured boolean value, or {@code null} if not set. + * @since 7.2 + */ + @Nullable + public Boolean getBoolean(String section, String name) { + return getBoolean(section, null, name); } /** @@ -391,10 +528,28 @@ public class Config { * @return true if any value or defaultValue is true, false for missing or * explicit false */ - public boolean getBoolean(final String section, String subsection, - final String name, final boolean defaultValue) { - return typedGetter.getBoolean(this, section, subsection, name, - defaultValue); + public boolean getBoolean(String section, String subsection, String name, + boolean defaultValue) { + Boolean v = typedGetter.getBoolean(this, section, subsection, name, + Boolean.valueOf(defaultValue)); + return v == null ? defaultValue : v.booleanValue(); + } + + /** + * Get a boolean value from the git config + * + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @return configured boolean value, or {@code null} if not set. + * @since 7.2 + */ + @Nullable + public Boolean getBoolean(String section, String subsection, String name) { + return typedGetter.getBoolean(this, section, subsection, name, null); } /** @@ -412,8 +567,8 @@ public class Config { * default value to return if no value was present. * @return the selected enumeration value, or {@code defaultValue}. */ - public > T getEnum(final String section, - final String subsection, final String name, final T defaultValue) { + public > T getEnum(String section, String subsection, + String name, @NonNull T defaultValue) { final T[] all = allValuesOf(defaultValue); return typedGetter.getEnum(this, all, section, subsection, name, defaultValue); @@ -448,13 +603,40 @@ public class Config { * @param defaultValue * default value to return if no value was present. * @return the selected enumeration value, or {@code defaultValue}. + * @deprecated use {@link #getEnum(String, String, String, Enum)} or + * {{@link #getEnum(Enum[], String, String, String)}} instead. */ - public > T getEnum(final T[] all, final String section, - final String subsection, final String name, final T defaultValue) { + @Nullable + @Deprecated + public > T getEnum(T[] all, String section, + String subsection, String name, @Nullable T defaultValue) { return typedGetter.getEnum(this, all, section, subsection, name, defaultValue); } + /** + * Parse an enumeration from the configuration. + * + * @param + * type of the returned enum + * @param all + * all possible values in the enumeration which should be + * recognized. Typically {@code EnumType.values()}. + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @return the selected enumeration value, or {@code null} if not set. + * @since 7.2 + */ + @Nullable + public > T getEnum(T[] all, String section, + String subsection, String name) { + return typedGetter.getEnum(this, all, section, subsection, name, null); + } + /** * Get string value or null if not found. * @@ -466,8 +648,8 @@ public class Config { * the key name * @return a String value from the config, null if not found */ - public String getString(final String section, String subsection, - final String name) { + @Nullable + public String getString(String section, String subsection, String name) { return getRawString(section, subsection, name); } @@ -526,8 +708,34 @@ public class Config { */ public long getTimeUnit(String section, String subsection, String name, long defaultValue, TimeUnit wantUnit) { + Long v = typedGetter.getTimeUnit(this, section, subsection, name, + Long.valueOf(defaultValue), wantUnit); + return v == null ? defaultValue : v.longValue(); + + } + + /** + * Parse a numerical time unit, such as "1 minute", from the configuration. + * + * @param section + * section the key is in. + * @param subsection + * subsection the key is in, or null if not in a subsection. + * @param name + * the key name. + * @param wantUnit + * the units of {@code defaultValue} and the return value, as + * well as the units to assume if the value does not contain an + * indication of the units. + * @return the value, or {@code null} if not set, expressed in + * {@code units}. + * @since 7.2 + */ + @Nullable + public Long getTimeUnit(String section, String subsection, String name, + TimeUnit wantUnit) { return typedGetter.getTimeUnit(this, section, subsection, name, - defaultValue, wantUnit); + null, wantUnit); } /** @@ -555,8 +763,9 @@ public class Config { * @return the {@link Path}, or {@code defaultValue} if not set * @since 5.10 */ + @Nullable public Path getPath(String section, String subsection, String name, - @NonNull FS fs, File resolveAgainst, Path defaultValue) { + @NonNull FS fs, File resolveAgainst, @Nullable Path defaultValue) { return typedGetter.getPath(this, section, subsection, name, fs, resolveAgainst, defaultValue); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java index a71549c92e..65093987e8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java @@ -18,6 +18,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.Config.ConfigEnum; import org.eclipse.jgit.transport.RefSpec; @@ -34,24 +35,32 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { @Override public boolean getBoolean(Config config, String section, String subsection, String name, boolean defaultValue) { + return getBoolean(config, section, subsection, name, defaultValue); + } + + @Nullable + @Override + public Boolean getBoolean(Config config, String section, String subsection, + String name, @Nullable Boolean defaultValue) { String n = config.getString(section, subsection, name); if (n == null) { return defaultValue; } if (Config.isMissing(n)) { - return true; + return Boolean.TRUE; } try { - return StringUtils.toBoolean(n); + return Boolean.valueOf(StringUtils.toBoolean(n)); } catch (IllegalArgumentException err) { throw new IllegalArgumentException(MessageFormat.format( JGitText.get().invalidBooleanValue, section, name, n), err); } } + @Nullable @Override public > T getEnum(Config config, T[] all, String section, - String subsection, String name, T defaultValue) { + String subsection, String name, @Nullable T defaultValue) { String value = config.getString(section, subsection, name); if (value == null) { return defaultValue; @@ -107,9 +116,26 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { @Override public int getInt(Config config, String section, String subsection, String name, int defaultValue) { - long val = config.getLong(section, subsection, name, defaultValue); + return getInt(config, section, subsection, name, defaultValue); + } + + @Nullable + @Override + @SuppressWarnings("boxing") + public Integer getInt(Config config, String section, String subsection, + String name, @Nullable Integer defaultValue) { + Long longDefault = defaultValue != null + ? Long.valueOf(defaultValue.longValue()) + : null; + Long val = config.getLong(section, subsection, name); + if (val == null) { + val = longDefault; + } + if (val == null) { + return null; + } if (Integer.MIN_VALUE <= val && val <= Integer.MAX_VALUE) { - return (int) val; + return Integer.valueOf(Math.toIntExact(val)); } throw new IllegalArgumentException(MessageFormat .format(JGitText.get().integerValueOutOfRange, section, name)); @@ -118,31 +144,48 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { @Override public int getIntInRange(Config config, String section, String subsection, String name, int minValue, int maxValue, int defaultValue) { - int val = getInt(config, section, subsection, name, defaultValue); + return getIntInRange(config, section, subsection, name, minValue, + maxValue, defaultValue); + } + + @Override + @SuppressWarnings("boxing") + public Integer getIntInRange(Config config, String section, + String subsection, String name, int minValue, int maxValue, + Integer defaultValue) { + Integer val = getInt(config, section, subsection, name, defaultValue); + if (val == null) { + return null; + } if ((val >= minValue && val <= maxValue) || val == UNSET_INT) { return val; } if (subsection == null) { throw new IllegalArgumentException(MessageFormat.format( JGitText.get().integerValueNotInRange, section, name, - Integer.valueOf(val), Integer.valueOf(minValue), - Integer.valueOf(maxValue))); + val, minValue, maxValue)); } throw new IllegalArgumentException(MessageFormat.format( JGitText.get().integerValueNotInRangeSubSection, section, - subsection, name, Integer.valueOf(val), - Integer.valueOf(minValue), Integer.valueOf(maxValue))); + subsection, name, val, minValue, maxValue)); } @Override public long getLong(Config config, String section, String subsection, String name, long defaultValue) { - final String str = config.getString(section, subsection, name); + return getLong(config, section, subsection, name, defaultValue); + } + + @Nullable + @Override + public Long getLong(Config config, String section, String subsection, + String name, @Nullable Long defaultValue) { + String str = config.getString(section, subsection, name); if (str == null) { return defaultValue; } try { - return StringUtils.parseLongWithSuffix(str, false); + return Long.valueOf(StringUtils.parseLongWithSuffix(str, false)); } catch (StringIndexOutOfBoundsException e) { // Empty return defaultValue; @@ -156,6 +199,14 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { @Override public long getTimeUnit(Config config, String section, String subsection, String name, long defaultValue, TimeUnit wantUnit) { + Long v = getTimeUnit(config, section, subsection, name, + Long.valueOf(defaultValue), wantUnit); + return v == null ? defaultValue : v.longValue(); + } + + @Override + public Long getTimeUnit(Config config, String section, String subsection, + String name, @Nullable Long defaultValue, TimeUnit wantUnit) { String valueString = config.getString(section, subsection, name); if (valueString == null) { @@ -232,8 +283,8 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { } try { - return wantUnit.convert(Long.parseLong(digits) * inputMul, - inputUnit); + return Long.valueOf(wantUnit + .convert(Long.parseLong(digits) * inputMul, inputUnit)); } catch (NumberFormatException nfe) { IllegalArgumentException iae = notTimeUnit(section, subsection, unitName, valueString); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TypedConfigGetter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TypedConfigGetter.java index 0c03adcab8..3d4e0d1f3c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/TypedConfigGetter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/TypedConfigGetter.java @@ -17,6 +17,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.annotations.Nullable; import org.eclipse.jgit.transport.RefSpec; import org.eclipse.jgit.util.FS; @@ -50,10 +51,35 @@ public interface TypedConfigGetter { * default value to return if no value was present. * @return true if any value or defaultValue is true, false for missing or * explicit false + * @deprecated use + * {@link #getBoolean(Config, String, String, String, Boolean)} + * instead */ + @Deprecated boolean getBoolean(Config config, String section, String subsection, String name, boolean defaultValue); + /** + * Get a boolean value from a git {@link Config}. + * + * @param config + * to get the value from + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @param defaultValue + * default value to return if no value was present. + * @return true if any value or defaultValue is true, false for missing or + * explicit false + * @since 7.2 + */ + @Nullable + Boolean getBoolean(Config config, String section, String subsection, + String name, @Nullable Boolean defaultValue); + /** * Parse an enumeration from a git {@link Config}. * @@ -74,8 +100,9 @@ public interface TypedConfigGetter { * default value to return if no value was present. * @return the selected enumeration value, or {@code defaultValue}. */ + @Nullable > T getEnum(Config config, T[] all, String section, - String subsection, String name, T defaultValue); + String subsection, String name, @Nullable T defaultValue); /** * Obtain an integer value from a git {@link Config}. @@ -91,10 +118,33 @@ public interface TypedConfigGetter { * @param defaultValue * default value to return if no value was present. * @return an integer value from the configuration, or defaultValue. + * @deprecated use {@link #getInt(Config, String, String, String, Integer)} + * instead */ + @Deprecated int getInt(Config config, String section, String subsection, String name, int defaultValue); + /** + * Obtain an integer value from a git {@link Config}. + * + * @param config + * to get the value from + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @param defaultValue + * default value to return if no value was present. + * @return an integer value from the configuration, or defaultValue. + * @since 7.2 + */ + @Nullable + Integer getInt(Config config, String section, String subsection, + String name, @Nullable Integer defaultValue); + /** * Obtain an integer value from a git {@link Config} which must be in given * range. @@ -117,10 +167,42 @@ public interface TypedConfigGetter { * @return an integer value from the configuration, or defaultValue. * {@code #UNSET_INT} if unset. * @since 6.1 + * @deprecated use + * {@link #getIntInRange(Config, String, String, String, int, int, Integer)} + * instead */ + @Deprecated int getIntInRange(Config config, String section, String subsection, String name, int minValue, int maxValue, int defaultValue); + /** + * Obtain an integer value from a git {@link Config} which must be in given + * range. + * + * @param config + * to get the value from + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @param minValue + * minimal value + * @param maxValue + * maximum value + * @param defaultValue + * default value to return if no value was present. Use + * {@code #UNSET_INT} to set the default to unset. + * @return an integer value from the configuration, or defaultValue. + * {@code #UNSET_INT} if unset. + * @since 7.2 + */ + @Nullable + Integer getIntInRange(Config config, String section, String subsection, + String name, int minValue, int maxValue, + @Nullable Integer defaultValue); + /** * Obtain a long value from a git {@link Config}. * @@ -135,10 +217,33 @@ public interface TypedConfigGetter { * @param defaultValue * default value to return if no value was present. * @return a long value from the configuration, or defaultValue. + * @deprecated use {@link #getLong(Config, String, String, String, Long)} + * instead */ + @Deprecated long getLong(Config config, String section, String subsection, String name, long defaultValue); + /** + * Obtain a long value from a git {@link Config}. + * + * @param config + * to get the value from + * @param section + * section the key is grouped within. + * @param subsection + * subsection name, such a remote or branch name. + * @param name + * name of the key to get. + * @param defaultValue + * default value to return if no value was present. + * @return a long value from the configuration, or defaultValue. + * @since 7.2 + */ + @Nullable + Long getLong(Config config, String section, String subsection, String name, + @Nullable Long defaultValue); + /** * Parse a numerical time unit, such as "1 minute", from a git * {@link Config}. @@ -159,10 +264,40 @@ public interface TypedConfigGetter { * indication of the units. * @return the value, or {@code defaultValue} if not set, expressed in * {@code units}. + * @deprecated use + * {@link #getTimeUnit(Config, String, String, String, Long, TimeUnit)} + * instead */ + @Deprecated long getTimeUnit(Config config, String section, String subsection, String name, long defaultValue, TimeUnit wantUnit); + /** + * Parse a numerical time unit, such as "1 minute", from a git + * {@link Config}. + * + * @param config + * to get the value from + * @param section + * section the key is in. + * @param subsection + * subsection the key is in, or null if not in a subsection. + * @param name + * the key name. + * @param defaultValue + * default value to return if no value was present. + * @param wantUnit + * the units of {@code defaultValue} and the return value, as + * well as the units to assume if the value does not contain an + * indication of the units. + * @return the value, or {@code defaultValue} if not set, expressed in + * {@code units}. + * @since 7.2 + */ + @Nullable + Long getTimeUnit(Config config, String section, String subsection, + String name, @Nullable Long defaultValue, TimeUnit wantUnit); + /** * Parse a string value from a git {@link Config} and treat it as a file * path, replacing a ~/ prefix by the user's home directory. @@ -189,9 +324,10 @@ public interface TypedConfigGetter { * @return the {@link Path}, or {@code defaultValue} if not set * @since 5.10 */ + @Nullable default Path getPath(Config config, String section, String subsection, String name, @NonNull FS fs, File resolveAgainst, - Path defaultValue) { + @Nullable Path defaultValue) { String value = config.getString(section, subsection, name); if (value == null) { return defaultValue; -- cgit v1.2.3 From ff3a150495ad466169a7fb0cfaed06aace50da7b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 15 Jan 2025 13:15:28 +0100 Subject: Improve configuration of trusting file attributes in FileSnapshot FileSnapshot relies on File attributes (which can be retrieved by the stat() function on Unix) to quickly determine if a File was modified without reading file content or listing content of a directory. On NFS this doesn't work reliably due to NFS client caching behavior. Hence we introduced the option core.trustFolderStat to control if FileSnapshot can trust File attributes to ensure we don't miss modifications on NFS. Later more specific options for handling packed and loose refs were added which also support another config value AFTER_OPEN, in addition to ALWAYS and NEVER, which refreshes File attributes by opening a FileInputStream on the file instead of reading its content and then trusts the File attributes of the refreshed File. We discussed in jgit-127 how to extend these options for other scenarios where file attributes are used to detect modifications and came to the conclusion to improve the existing trustXXX config options in the following way: - replace the not well defined "trustFolderStat" option by a general option "trustStat" which allows to configure all these scenarios with a single option - introduce a new enum TrustStat and use it for all scenarios. It has the values - NEVER don't trust File attributes - ALWAYS always trust File attributes - AFTER_OPEN open a FileInputStream on the respective file or folder to ensure its File attributes are refreshed and then trust the refreshed File attributes - INHERIT only used for specific options to signal it should inherit its value from the "trustStat" option - deprecate the old, now unused enums "TrustPackedRefsStat" and "TrustLooseRefStat" - deprecate "trustFolderStat", if set, translate it to the corresponding value of the new option "trustStat" - if both "trustFolderStat" and "trustStat" are configured the value configured for "trustStat" takes precedence and "trustFolderStat" is ignored - add one specific option for each scenario which can override the global setting - add new options "trustLooseObjectStat" and "trustPackStat" which allow to override the global setting for handling of loose objects and pack files - implement option AFTER_OPEN for "trustLooseObjectStat" and "trustPackStat" Bug: jgit-127 Change-Id: I662982258bc4494f146805875e52838394673c8f --- Documentation/config-options.md | 9 +- .../internal/storage/file/ObjectDirectoryTest.java | 17 +- .../org/eclipse/jgit/internal/JGitText.properties | 3 + .../src/org/eclipse/jgit/internal/JGitText.java | 3 + .../jgit/internal/storage/file/LooseObjects.java | 46 ++++-- .../jgit/internal/storage/file/PackDirectory.java | 38 +++-- .../jgit/internal/storage/file/RefDirectory.java | 39 ++--- .../src/org/eclipse/jgit/lib/ConfigConstants.java | 23 +++ .../src/org/eclipse/jgit/lib/CoreConfig.java | 172 ++++++++++++++++++++- 9 files changed, 278 insertions(+), 72 deletions(-) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index eeb78ff550..807d4a8002 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -55,9 +55,12 @@ For details on native git options see also the official [git config documentatio | `core.streamFileThreshold` | `50 MiB` | ⃞ | The size threshold beyond which objects must be streamed. | | `core.supportsAtomicFileCreation` | `true` | ⃞ | Whether the filesystem supports atomic file creation. | | `core.symlinks` | Auto detect if filesystem supports symlinks| ✅ | If false, symbolic links are checked out as small plain files that contain the link text. | -| `core.trustFolderStat` | `true` | ⃞ | Whether to trust the pack folder's, packed-refs file's and loose-objects folder's file attributes (Java equivalent of stat command on *nix). When looking for pack files, if `false` JGit will always scan the `.git/objects/pack` folder and if set to `true` it assumes that pack files are unchanged if the file attributes of the pack folder are unchanged. When getting the list of packed refs, if `false` JGit will always read the packed-refs file and if set to `true` it uses the file attributes of the packed-refs file and will only read it if a file attribute has changed. When looking for loose objects, if `false` and if a loose object is not found, JGit will open and close a stream to `.git/objects` folder (which can refresh its directory listing, at least on some NFS clients) and retry looking for that loose object. Setting this option to `false` can help to workaround caching issues on NFS, but reduces performance. | -| `core.trustPackedRefsStat` | `unset` | ⃞ | Whether to trust the file attributes (Java equivalent of stat command on *nix) of the packed-refs file. If `never` JGit will ignore the file attributes of the packed-refs file and always read it. If `always` JGit will trust the file attributes of the packed-refs file and will only read it if a file attribute has changed. `after_open` behaves the same as `always`, except that the packed-refs file is opened and closed before its file attributes are considered. An open/close of the packed-refs file is known to refresh its file attributes, at least on some NFS clients. If `unset`, JGit will use the behavior described in `trustFolderStat`. | -| `core.trustLooseRefStat` | `always` | ⃞ | Whether to trust the file attributes (Java equivalent of stat command on *nix) of the loose ref. If `always` JGit will trust the file attributes of the loose ref and its parent directories. `after_open` behaves similar to `always`, except that all parent directories of the loose ref up to the repository root are opened and closed before its file attributes are considered. An open/close of these parent directories is known to refresh the file attributes, at least on some NFS clients. | +| ~~`core.trustFolderStat`~~ | `true` | ⃞ | __Deprecated__, use `core.trustStat` instead. If set to `true` translated to `core.trustStat=always`, if `false` translated to `core.trustStat=never`, see below. If both `core.trustFolderStat` and `core.trustStat` are configured then `trustStat` takes precedence and `trustFolderStat` is ignored. | +| `core.trustLooseRefStat` | `inherit` | ⃞ | Whether to trust the file attributes of loose refs and its fan-out parent directory. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `trustStat`. | +| `core.trustPackedRefsStat` | `inherit` | ⃞ | Whether to trust the file attributes of the packed-refs file. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `core.trustStat`. | +| `core.trustLooseObjectStat` | `inherit` | ⃞ | Whether to trust the file attributes of the loose object file and its fan-out parent directory. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `core.trustStat`. | +| `core.trustPackStat` | `inherit` | ⃞ | Whether to trust the file attributes of the `objects/pack` directory. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `core.trustStat`. | +| `core.trustStat` | `always` | ⃞ | Global option to configure whether to trust file attributes (Java equivalent of stat command on Unix) of files storing git objects. Can be overridden for specific files by configuring `core.trustLooseRefStat, core.trustPackedRefsStat, core.trustLooseObjectStat, core.trustPackStat`. If `never` JGit will ignore the file attributes of the file and always read it. If `always` JGit will trust the file attributes and will only read it if a file attribute has changed. `after_open` behaves the same as `always`, but file attributes are only considered *after* the file itself and any transient parent directories have been opened and closed. An open/close of the file/directory is known to refresh its file attributes, at least on some NFS clients. | | `core.worktree` | Root directory of the working tree if it is not the parent directory of the `.git` directory | ✅ | The path to the root of the working tree. | ## __fetch__ options diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java index 7d298ee6f1..33cbc868ca 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/ObjectDirectoryTest.java @@ -50,6 +50,7 @@ import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -210,17 +211,17 @@ public class ObjectDirectoryTest extends RepositoryTestCase { .fromString("873fb8d667d05436d728c52b1d7a09528e6eb59b"); WindowCursor curs = new WindowCursor(db.getObjectDatabase()); - LooseObjects mock = mock(LooseObjects.class); + Config config = new Config(); + config.setString("core", null, "trustLooseObjectStat", "ALWAYS"); + LooseObjects spy = Mockito.spy(new LooseObjects(config, trash)); UnpackedObjectCache unpackedObjectCacheMock = mock( UnpackedObjectCache.class); - Mockito.when(mock.getObjectLoader(any(), any(), any())) - .thenThrow(new IOException("Stale File Handle")); - Mockito.when(mock.open(curs, id)).thenCallRealMethod(); - Mockito.when(mock.unpackedObjectCache()) - .thenReturn(unpackedObjectCacheMock); + doThrow(new IOException("Stale File Handle")).when(spy) + .getObjectLoader(any(), any(), any()); + doReturn(unpackedObjectCacheMock).when(spy).unpackedObjectCache(); - assertNull(mock.open(curs, id)); + assertNull(spy.open(curs, id)); verify(unpackedObjectCacheMock).remove(id); } @@ -231,7 +232,7 @@ public class ObjectDirectoryTest extends RepositoryTestCase { WindowCursor curs = new WindowCursor(db.getObjectDatabase()); Config config = new Config(); - config.setString("core", null, "trustFolderStat", "false"); + config.setString("core", null, "trustLooseObjectStat", "NEVER"); LooseObjects spy = spy(new LooseObjects(config, db.getObjectDatabase().getDirectory())); diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index acfe812a20..7c47d3a04f 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -267,6 +267,7 @@ deletingBranches=Deleting branches... deletingNotSupported=Deleting {0} not supported. depthMustBeAt1=Depth must be >= 1 depthWithUnshallow=Depth and unshallow can\'t be used together +deprecatedTrustFolderStat=Option core.trustFolderStat is deprecated, replace it by core.trustStat. destinationIsNotAWildcard=Destination is not a wildcard. detachedHeadDetected=HEAD is detached diffToolNotGivenError=No diff tool provided and no defaults configured. @@ -464,6 +465,7 @@ invalidTimestamp=Invalid timestamp in {0} invalidTimeUnitValue2=Invalid time unit value: {0}.{1}={2} invalidTimeUnitValue3=Invalid time unit value: {0}.{1}.{2}={3} invalidTreeZeroLengthName=Cannot append a tree entry with zero-length name +invalidTrustStat=core.trustStat must not be set to TrustStat.INHERIT, falling back to TrustStat.ALWAYS. invalidURL=Invalid URL {0} invalidWildcards=Invalid wildcards {0} invalidRefSpec=Invalid refspec {0} @@ -615,6 +617,7 @@ peerDidNotSupplyACompleteObjectGraph=peer did not supply a complete object graph personIdentEmailNonNull=E-mail address of PersonIdent must not be null. personIdentNameNonNull=Name of PersonIdent must not be null. postCommitHookFailed=Execution of post-commit hook failed: {0}. +precedenceTrustConfig=Both core.trustFolderStat and core.trustStat are set, ignoring trustFolderStat since trustStat takes precedence. Remove core.trustFolderStat from your configuration. prefixRemote=remote: problemWithResolvingPushRefSpecsLocally=Problem with resolving push ref specs locally: {0} progressMonUploading=Uploading {0} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 2d9d2c527c..07e882498c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -295,6 +295,7 @@ public class JGitText extends TranslationBundle { /***/ public String deleteTagUnexpectedResult; /***/ public String deletingBranches; /***/ public String deletingNotSupported; + /***/ public String deprecatedTrustFolderStat; /***/ public String depthMustBeAt1; /***/ public String depthWithUnshallow; /***/ public String destinationIsNotAWildcard; @@ -493,6 +494,7 @@ public class JGitText extends TranslationBundle { /***/ public String invalidTimeUnitValue2; /***/ public String invalidTimeUnitValue3; /***/ public String invalidTreeZeroLengthName; + /***/ public String invalidTrustStat; /***/ public String invalidURL; /***/ public String invalidWildcards; /***/ public String invalidRefSpec; @@ -645,6 +647,7 @@ public class JGitText extends TranslationBundle { /***/ public String personIdentEmailNonNull; /***/ public String personIdentNameNonNull; /***/ public String postCommitHookFailed; + /***/ public String precedenceTrustConfig; /***/ public String prefixRemote; /***/ public String problemWithResolvingPushRefSpecsLocally; /***/ public String progressMonUploading; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java index 74ef6e139c..909b3e3082 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/LooseObjects.java @@ -26,8 +26,9 @@ import org.eclipse.jgit.internal.storage.file.FileObjectDatabase.InsertLooseObje import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.CoreConfig; +import org.eclipse.jgit.lib.CoreConfig.TrustStat; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.util.FileUtils; @@ -55,7 +56,7 @@ class LooseObjects { private final UnpackedObjectCache unpackedObjectCache; - private final boolean trustFolderStat; + private final TrustStat trustLooseObjectStat; /** * Initialize a reference to an on-disk object directory. @@ -68,9 +69,8 @@ class LooseObjects { LooseObjects(Config config, File dir) { directory = dir; unpackedObjectCache = new UnpackedObjectCache(); - trustFolderStat = config.getBoolean( - ConfigConstants.CONFIG_CORE_SECTION, - ConfigConstants.CONFIG_KEY_TRUSTFOLDERSTAT, true); + trustLooseObjectStat = config.get(CoreConfig.KEY) + .getTrustLooseObjectStat(); } /** @@ -108,7 +108,8 @@ class LooseObjects { */ boolean has(AnyObjectId objectId) { boolean exists = hasWithoutRefresh(objectId); - if (trustFolderStat || exists) { + if (trustLooseObjectStat == TrustStat.ALWAYS + || exists) { return exists; } try (InputStream stream = Files.newInputStream(directory.toPath())) { @@ -165,9 +166,29 @@ class LooseObjects { ObjectLoader open(WindowCursor curs, AnyObjectId id) throws IOException { File path = fileFor(id); for (int retries = 0; retries < MAX_STALE_READ_RETRIES; retries++) { - if (trustFolderStat && !path.exists()) { + boolean reload = true; + switch (trustLooseObjectStat) { + case NEVER: break; + case AFTER_OPEN: + try (InputStream stream = Files + .newInputStream(path.getParentFile().toPath())) { + // open the loose object's fanout directory to refresh + // attributes (on some NFS clients) + } catch (FileNotFoundException | NoSuchFileException e) { + // ignore + } + //$FALL-THROUGH$ + case ALWAYS: + if (!path.exists()) { + reload = false; + } + break; + case INHERIT: + // only used in CoreConfig internally + throw new IllegalStateException(); } + if (reload) { try { return getObjectLoader(curs, path, id); } catch (FileNotFoundException noFile) { @@ -181,9 +202,10 @@ class LooseObjects { } if (LOG.isDebugEnabled()) { LOG.debug(MessageFormat.format( - JGitText.get().looseObjectHandleIsStale, id.name(), - Integer.valueOf(retries), Integer.valueOf( - MAX_STALE_READ_RETRIES))); + JGitText.get().looseObjectHandleIsStale, + id.name(), Integer.valueOf(retries), + Integer.valueOf(MAX_STALE_READ_RETRIES))); + } } } } @@ -209,7 +231,7 @@ class LooseObjects { try { return getObjectLoaderWithoutRefresh(curs, path, id); } catch (FileNotFoundException e) { - if (trustFolderStat) { + if (trustLooseObjectStat == TrustStat.ALWAYS) { throw e; } try (InputStream stream = Files @@ -246,7 +268,7 @@ class LooseObjects { return getSizeWithoutRefresh(curs, id); } catch (FileNotFoundException noFile) { try { - if (trustFolderStat) { + if (trustLooseObjectStat == TrustStat.ALWAYS) { throw noFile; } try (InputStream stream = Files diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index 1ce14b3a18..ef877d8a48 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -17,6 +17,8 @@ import static org.eclipse.jgit.internal.storage.pack.PackExt.PACK; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Arrays; @@ -42,7 +44,8 @@ import org.eclipse.jgit.internal.storage.pack.PackWriter; import org.eclipse.jgit.lib.AbbreviatedObjectId; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Config; -import org.eclipse.jgit.lib.ConfigConstants; +import org.eclipse.jgit.lib.CoreConfig; +import org.eclipse.jgit.lib.CoreConfig.TrustStat; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.util.FileUtils; @@ -72,7 +75,7 @@ class PackDirectory { private final AtomicReference packList; - private final boolean trustFolderStat; + private final TrustStat trustPackStat; /** * Initialize a reference to an on-disk 'pack' directory. @@ -86,14 +89,7 @@ class PackDirectory { this.config = config; this.directory = directory; packList = new AtomicReference<>(NO_PACKS); - - // Whether to trust the pack folder's modification time. If set to false - // we will always scan the .git/objects/pack folder to check for new - // pack files. If set to true (default) we use the folder's size, - // modification time, and key (inode) and assume that no new pack files - // can be in this folder if these attributes have not changed. - trustFolderStat = config.getBoolean(ConfigConstants.CONFIG_CORE_SECTION, - ConfigConstants.CONFIG_KEY_TRUSTFOLDERSTAT, true); + trustPackStat = config.get(CoreConfig.KEY).getTrustPackStat(); } /** @@ -365,8 +361,26 @@ class PackDirectory { } boolean searchPacksAgain(PackList old) { - return (!trustFolderStat || old.snapshot.isModified(directory)) - && old != scanPacks(old); + switch (trustPackStat) { + case NEVER: + break; + case AFTER_OPEN: + try (InputStream stream = Files + .newInputStream(directory.toPath())) { + // open the pack directory to refresh attributes (on some NFS clients) + } catch (IOException e) { + // ignore + } + //$FALL-THROUGH$ + case ALWAYS: + if (!old.snapshot.isModified(directory)) { + return false; + } + break; + case INHERIT: + // only used in CoreConfig internally + } + return old != scanPacks(old); } void insert(Pack pack) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 33996519f7..05f1ef53a1 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@ -64,10 +64,9 @@ import org.eclipse.jgit.errors.MissingObjectException; import org.eclipse.jgit.errors.ObjectWritingException; import org.eclipse.jgit.events.RefsChangedEvent; import org.eclipse.jgit.internal.JGitText; -import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; -import org.eclipse.jgit.lib.CoreConfig.TrustLooseRefStat; -import org.eclipse.jgit.lib.CoreConfig.TrustPackedRefsStat; +import org.eclipse.jgit.lib.CoreConfig; +import org.eclipse.jgit.lib.CoreConfig.TrustStat; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef; import org.eclipse.jgit.lib.ProgressMonitor; @@ -185,11 +184,7 @@ public class RefDirectory extends RefDatabase { private List retrySleepMs = RETRY_SLEEP_MS; - private final boolean trustFolderStat; - - private final TrustPackedRefsStat trustPackedRefsStat; - - private final TrustLooseRefStat trustLooseRefStat; + private final CoreConfig coreConfig; RefDirectory(RefDirectory refDb) { parent = refDb.parent; @@ -201,9 +196,7 @@ public class RefDirectory extends RefDatabase { packedRefsFile = refDb.packedRefsFile; looseRefs.set(refDb.looseRefs.get()); packedRefs.set(refDb.packedRefs.get()); - trustFolderStat = refDb.trustFolderStat; - trustPackedRefsStat = refDb.trustPackedRefsStat; - trustLooseRefStat = refDb.trustLooseRefStat; + coreConfig = refDb.coreConfig; inProcessPackedRefsLock = refDb.inProcessPackedRefsLock; } @@ -219,17 +212,7 @@ public class RefDirectory extends RefDatabase { looseRefs.set(RefList. emptyList()); packedRefs.set(NO_PACKED_REFS); - trustFolderStat = db.getConfig() - .getBoolean(ConfigConstants.CONFIG_CORE_SECTION, - ConfigConstants.CONFIG_KEY_TRUSTFOLDERSTAT, true); - trustPackedRefsStat = db.getConfig() - .getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, - ConfigConstants.CONFIG_KEY_TRUST_PACKED_REFS_STAT, - TrustPackedRefsStat.UNSET); - trustLooseRefStat = db.getConfig() - .getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, - ConfigConstants.CONFIG_KEY_TRUST_LOOSE_REF_STAT, - TrustLooseRefStat.ALWAYS); + coreConfig = db.getConfig().get(CoreConfig.KEY); inProcessPackedRefsLock = new ReentrantLock(true); } @@ -979,7 +962,7 @@ public class RefDirectory extends RefDatabase { PackedRefList getPackedRefs() throws IOException { final PackedRefList curList = packedRefs.get(); - switch (trustPackedRefsStat) { + switch (coreConfig.getTrustPackedRefsStat()) { case NEVER: break; case AFTER_OPEN: @@ -995,12 +978,8 @@ public class RefDirectory extends RefDatabase { return curList; } break; - case UNSET: - if (trustFolderStat - && !curList.snapshot.isModified(packedRefsFile)) { - return curList; - } - break; + case INHERIT: + // only used in CoreConfig internally } return refreshPackedRefs(curList); @@ -1186,7 +1165,7 @@ public class RefDirectory extends RefDatabase { LooseRef scanRef(LooseRef ref, String name) throws IOException { final File path = fileFor(name); - if (trustLooseRefStat.equals(TrustLooseRefStat.AFTER_OPEN)) { + if (coreConfig.getTrustLooseRefStat() == TrustStat.AFTER_OPEN) { refreshPathToLooseRef(Paths.get(name)); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 5068a6cce0..30e7de47c3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -600,10 +600,20 @@ public final class ConfigConstants { /** * The "trustfolderstat" key in the "core" section + * * @since 3.6 + * @deprecated use {CONFIG_KEY_TRUST_STAT} instead */ + @Deprecated(since = "7.2", forRemoval = true) public static final String CONFIG_KEY_TRUSTFOLDERSTAT = "trustfolderstat"; + /** + * The "trustfilestat" key in the "core"section + * + * @since 7.2 + */ + public static final String CONFIG_KEY_TRUST_STAT = "truststat"; + /** * The "supportsAtomicFileCreation" key in the "core" section * @@ -1022,6 +1032,19 @@ public final class ConfigConstants { */ public static final String CONFIG_KEY_TRUST_LOOSE_REF_STAT = "trustLooseRefStat"; + /** + * The "trustLooseRefStat" key + * + * @since 7.2 + */ + public static final String CONFIG_KEY_TRUST_PACK_STAT = "trustPackStat"; + + /** + * The "trustLooseObjectFileStat" key + * + * @since 7.2 + */ + public static final String CONFIG_KEY_TRUST_LOOSE_OBJECT_STAT = "trustLooseObjectStat"; /** * The "pack.preserveOldPacks" key * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java index 49602a75eb..e43c9653dd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java @@ -17,12 +17,16 @@ package org.eclipse.jgit.lib; import static java.util.zip.Deflater.DEFAULT_COMPRESSION; +import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.Config.SectionParser; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class keeps git repository core parameters. */ public class CoreConfig { + private static final Logger LOG = LoggerFactory.getLogger(CoreConfig.class); /** Key for {@link Config#get(SectionParser)}. */ public static final Config.SectionParser KEY = CoreConfig::new; @@ -127,7 +131,9 @@ public class CoreConfig { * Permissible values for {@code core.trustPackedRefsStat}. * * @since 6.1.1 + * @deprecated use {@link TrustStat} instead */ + @Deprecated(since = "7.2", forRemoval = true) public enum TrustPackedRefsStat { /** Do not trust file attributes of the packed-refs file. */ NEVER, @@ -135,12 +141,15 @@ public class CoreConfig { /** Trust file attributes of the packed-refs file. */ ALWAYS, - /** Open and close the packed-refs file to refresh its file attributes - * and then trust it. */ + /** + * Open and close the packed-refs file to refresh its file attributes + * and then trust it. + */ AFTER_OPEN, - /** {@code core.trustPackedRefsStat} defaults to this when it is - * not set */ + /** + * {@code core.trustPackedRefsStat} defaults to this when it is not set + */ UNSET } @@ -148,17 +157,44 @@ public class CoreConfig { * Permissible values for {@code core.trustLooseRefStat}. * * @since 6.9 + * @deprecated use {@link TrustStat} instead */ + @Deprecated(since = "7.2", forRemoval = true) public enum TrustLooseRefStat { /** Trust file attributes of the loose ref. */ ALWAYS, - /** Open and close parent directories of the loose ref file until the - * repository root to refresh its file attributes and then trust it. */ + /** + * Open and close parent directories of the loose ref file until the + * repository root to refresh its file attributes and then trust it. + */ AFTER_OPEN, } + /** + * Values for {@code core.trustXXX} options. + * + * @since 7.2 + */ + public enum TrustStat { + /** Do not trust file attributes of a File. */ + NEVER, + + /** Always trust file attributes of a File. */ + ALWAYS, + + /** Open and close the File to refresh its file attributes + * and then trust it. */ + AFTER_OPEN, + + /** + * Used for specific options to inherit value from value set for + * core.trustStat. + */ + INHERIT + } + private final int compression; private final int packIndexVersion; @@ -169,6 +205,16 @@ public class CoreConfig { private final boolean commitGraph; + private final TrustStat trustStat; + + private final TrustStat trustPackedRefsStat; + + private final TrustStat trustLooseRefStat; + + private final TrustStat trustPackStat; + + private final TrustStat trustLooseObjectStat; + /** * Options for symlink handling * @@ -198,7 +244,13 @@ public class CoreConfig { DOTGITONLY } - private CoreConfig(Config rc) { + /** + * Create a new core configuration from the passed configuration. + * + * @param rc + * git configuration + */ + CoreConfig(Config rc) { compression = rc.getInt(ConfigConstants.CONFIG_CORE_SECTION, ConfigConstants.CONFIG_KEY_COMPRESSION, DEFAULT_COMPRESSION); packIndexVersion = rc.getInt(ConfigConstants.CONFIG_PACK_SECTION, @@ -210,6 +262,60 @@ public class CoreConfig { commitGraph = rc.getBoolean(ConfigConstants.CONFIG_CORE_SECTION, ConfigConstants.CONFIG_COMMIT_GRAPH, DEFAULT_COMMIT_GRAPH_ENABLE); + + trustStat = parseTrustStat(rc); + trustPackedRefsStat = parseTrustPackedRefsStat(rc); + trustLooseRefStat = parseTrustLooseRefStat(rc); + trustPackStat = parseTrustPackFileStat(rc); + trustLooseObjectStat = parseTrustLooseObjectFileStat(rc); + } + + private static TrustStat parseTrustStat(Config rc) { + Boolean tfs = rc.getBoolean(ConfigConstants.CONFIG_CORE_SECTION, + ConfigConstants.CONFIG_KEY_TRUSTFOLDERSTAT); + TrustStat ts = rc.getEnum(TrustStat.values(), + ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_TRUST_STAT); + if (tfs != null) { + if (ts == null) { + LOG.warn(JGitText.get().deprecatedTrustFolderStat); + return tfs.booleanValue() ? TrustStat.ALWAYS : TrustStat.NEVER; + } + LOG.warn(JGitText.get().precedenceTrustConfig); + } + if (ts == null) { + ts = TrustStat.ALWAYS; + } else if (ts == TrustStat.INHERIT) { + LOG.warn(JGitText.get().invalidTrustStat); + ts = TrustStat.ALWAYS; + } + return ts; + } + + private TrustStat parseTrustPackedRefsStat(Config rc) { + return inheritParseTrustStat(rc, + ConfigConstants.CONFIG_KEY_TRUST_PACKED_REFS_STAT); + } + + private TrustStat parseTrustLooseRefStat(Config rc) { + return inheritParseTrustStat(rc, + ConfigConstants.CONFIG_KEY_TRUST_LOOSE_REF_STAT); + } + + private TrustStat parseTrustPackFileStat(Config rc) { + return inheritParseTrustStat(rc, + ConfigConstants.CONFIG_KEY_TRUST_PACK_STAT); + } + + private TrustStat parseTrustLooseObjectFileStat(Config rc) { + return inheritParseTrustStat(rc, + ConfigConstants.CONFIG_KEY_TRUST_LOOSE_OBJECT_STAT); + } + + private TrustStat inheritParseTrustStat(Config rc, String key) { + TrustStat t = rc.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, key, + TrustStat.INHERIT); + return t == TrustStat.INHERIT ? trustStat : t; } /** @@ -260,4 +366,56 @@ public class CoreConfig { public boolean enableCommitGraph() { return commitGraph; } + + /** + * Get how far we can trust file attributes of packed-refs file which is + * used to store {@link org.eclipse.jgit.lib.Ref}s in + * {@link org.eclipse.jgit.internal.storage.file.RefDirectory}. + * + * @return how far we can trust file attributes of packed-refs file. + * + * @since 7.2 + */ + public TrustStat getTrustPackedRefsStat() { + return trustPackedRefsStat; + } + + /** + * Get how far we can trust file attributes of loose ref files which are + * used to store {@link org.eclipse.jgit.lib.Ref}s in + * {@link org.eclipse.jgit.internal.storage.file.RefDirectory}. + * + * @return how far we can trust file attributes of loose ref files. + * + * @since 7.2 + */ + public TrustStat getTrustLooseRefStat() { + return trustLooseRefStat; + } + + /** + * Get how far we can trust file attributes of packed-refs file which is + * used to store {@link org.eclipse.jgit.lib.Ref}s in + * {@link org.eclipse.jgit.internal.storage.file.RefDirectory}. + * + * @return how far we can trust file attributes of packed-refs file. + * + * @since 7.2 + */ + public TrustStat getTrustPackStat() { + return trustPackStat; + } + + /** + * Get how far we can trust file attributes of loose ref files which are + * used to store {@link org.eclipse.jgit.lib.Ref}s in + * {@link org.eclipse.jgit.internal.storage.file.RefDirectory}. + * + * @return how far we can trust file attributes of loose ref files. + * + * @since 7.2 + */ + public TrustStat getTrustLooseObjectStat() { + return trustLooseObjectStat; + } } -- cgit v1.2.3 From f41253804068768c1d44a01808805e15a7b63eb6 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 7 Feb 2025 21:25:08 +0100 Subject: Merge: improve handling of case-variants Ensure that on a case-insensitive filesystem a merge that includes a rename of a file from one case variant to another does not delete the file. Basically make sure that we don't delete files that we had marked under a case variant as "keep" before, and ensure that when checking out a file, it is written to the file system with the exact casing recorded in the git tree. Bug: egit-76 Change-Id: Ibbc9ba97c70971ba3e83381b41364a5529f5a5dc --- .../tst/org/eclipse/jgit/api/MergeCommandTest.java | 92 ++++++++++++++++++++++ .../src/org/eclipse/jgit/dircache/Checkout.java | 12 ++- .../eclipse/jgit/dircache/DirCacheCheckout.java | 68 +++++++--------- .../src/org/eclipse/jgit/lib/Repository.java | 40 ++++++++++ 4 files changed, 170 insertions(+), 42 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java index 503fef9916..1ec506798c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java @@ -21,6 +21,9 @@ import static org.junit.Assert.fail; import static org.junit.Assume.assumeTrue; import java.io.File; +import java.nio.file.DirectoryStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.Iterator; import java.util.regex.Pattern; @@ -46,6 +49,7 @@ import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.GitDateFormatter; import org.eclipse.jgit.util.GitDateFormatter.Format; +import org.junit.Assume; import org.junit.Before; import org.junit.Test; import org.junit.experimental.theories.DataPoints; @@ -2101,6 +2105,94 @@ public class MergeCommandTest extends RepositoryTestCase { } } + @Test + public void testMergeCaseInsensitiveRename() throws Exception { + Assume.assumeTrue( + "Test makes only sense on a case-insensitive file system", + db.isWorkTreeCaseInsensitive()); + try (Git git = new Git(db)) { + writeTrashFile("a", "aaa"); + git.add().addFilepattern("a").call(); + RevCommit initialCommit = git.commit().setMessage("initial").call(); + // "Rename" "a" to "A" + git.rm().addFilepattern("a").call(); + writeTrashFile("A", "aaa"); + git.add().addFilepattern("A").call(); + RevCommit master = git.commit().setMessage("rename to A").call(); + + createBranch(initialCommit, "refs/heads/side"); + checkoutBranch("refs/heads/side"); + + writeTrashFile("b", "bbb"); + git.add().addFilepattern("b").call(); + git.commit().setMessage("side").call(); + + // Merge master into side + MergeResult result = git.merge().include(master) + .setStrategy(MergeStrategy.RECURSIVE).call(); + assertEquals(MergeStatus.MERGED, result.getMergeStatus()); + assertTrue(new File(db.getWorkTree(), "A").isFile()); + // Double check + boolean found = true; + try (DirectoryStream dir = Files + .newDirectoryStream(db.getWorkTree().toPath())) { + for (Path p : dir) { + found = "A".equals(p.getFileName().toString()); + if (found) { + break; + } + } + } + assertTrue(found); + } + } + + @Test + public void testMergeCaseInsensitiveRenameConflict() throws Exception { + Assume.assumeTrue( + "Test makes only sense on a case-insensitive file system", + db.isWorkTreeCaseInsensitive()); + try (Git git = new Git(db)) { + writeTrashFile("a", "aaa"); + git.add().addFilepattern("a").call(); + RevCommit initialCommit = git.commit().setMessage("initial").call(); + // "Rename" "a" to "A" and change it + git.rm().addFilepattern("a").call(); + writeTrashFile("A", "yyy"); + git.add().addFilepattern("A").call(); + RevCommit master = git.commit().setMessage("rename to A").call(); + + createBranch(initialCommit, "refs/heads/side"); + checkoutBranch("refs/heads/side"); + + writeTrashFile("a", "xxx"); + git.add().addFilepattern("a").call(); + git.commit().setMessage("side").call(); + + // Merge master into side + MergeResult result = git.merge().include(master) + .setStrategy(MergeStrategy.RECURSIVE).call(); + assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus()); + File a = new File(db.getWorkTree(), "A"); + assertTrue(a.isFile()); + // Double check + boolean found = true; + try (DirectoryStream dir = Files + .newDirectoryStream(db.getWorkTree().toPath())) { + for (Path p : dir) { + found = "A".equals(p.getFileName().toString()); + if (found) { + break; + } + } + } + assertTrue(found); + assertEquals(1, result.getConflicts().size()); + assertTrue(result.getConflicts().containsKey("a")); + checkFile(a, "yyy"); + } + } + private static void setExecutable(Git git, String path, boolean executable) { FS.DETECTED.setExecute( new File(git.getRepository().getWorkTree(), path), executable); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java index accf732dc7..de02aecdb9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/Checkout.java @@ -217,10 +217,18 @@ public class Checkout { } } try { - if (recursiveDelete && Files.isDirectory(f.toPath(), - LinkOption.NOFOLLOW_LINKS)) { + boolean isDir = Files.isDirectory(f.toPath(), + LinkOption.NOFOLLOW_LINKS); + if (recursiveDelete && isDir) { FileUtils.delete(f, FileUtils.RECURSIVE); } + if (cache.getRepository().isWorkTreeCaseInsensitive() && !isDir) { + // We cannot rely on rename via Files.move() to work correctly + // if the target exists in a case variant. For instance with JDK + // 17 on Mac OS, the existing case-variant name is kept. On + // Windows 11 it would work and use the name given in 'f'. + FileUtils.delete(f, FileUtils.SKIP_MISSING); + } FileUtils.rename(tmpFile, f, StandardCopyOption.ATOMIC_MOVE); cachedParent.remove(f.getName()); } catch (IOException e) { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index 4f78404f48..d61a453973 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -5,7 +5,7 @@ * Copyright (C) 2006, Shawn O. Pearce * Copyright (C) 2010, Chrisian Halstrick * Copyright (C) 2019, 2020, Andre Bossert - * Copyright (C) 2017, 2023, Thomas Wolf and others + * Copyright (C) 2017, 2025, Thomas Wolf and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -31,6 +31,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeSet; import org.eclipse.jgit.api.errors.CanceledException; import org.eclipse.jgit.api.errors.FilterFailedException; @@ -66,7 +67,6 @@ import org.eclipse.jgit.treewalk.WorkingTreeOptions; import org.eclipse.jgit.treewalk.filter.PathFilter; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FS.ExecutionResult; -import org.eclipse.jgit.util.IntList; import org.eclipse.jgit.util.SystemReader; import org.eclipse.jgit.util.io.EolStreamTypeUtil; import org.slf4j.Logger; @@ -113,9 +113,11 @@ public class DirCacheCheckout { private Map updated = new LinkedHashMap<>(); + private Set existing; + private ArrayList conflicts = new ArrayList<>(); - private ArrayList removed = new ArrayList<>(); + private TreeSet removed; private ArrayList kept = new ArrayList<>(); @@ -185,7 +187,7 @@ public class DirCacheCheckout { * @return a list of all files removed by this checkout */ public List getRemoved() { - return removed; + return new ArrayList<>(removed); } /** @@ -214,6 +216,14 @@ public class DirCacheCheckout { this.mergeCommitTree = mergeCommitTree; this.workingTree = workingTree; this.initialCheckout = !repo.isBare() && !repo.getIndexFile().exists(); + boolean caseInsensitive = !repo.isBare() + && repo.isWorkTreeCaseInsensitive(); + this.removed = caseInsensitive + ? new TreeSet<>(String::compareToIgnoreCase) + : new TreeSet<>(); + this.existing = caseInsensitive + ? new TreeSet<>(String::compareToIgnoreCase) + : null; } /** @@ -521,6 +531,13 @@ public class DirCacheCheckout { // update our index builder.finish(); + // On case-insensitive file systems we may have a case variant kept + // and another one removed. In that case, don't remove it. + if (existing != null) { + removed.removeAll(existing); + existing.clear(); + } + // init progress reporting int numTotal = removed.size() + updated.size() + conflicts.size(); monitor.beginTask(JGitText.get().checkingOutFiles, numTotal); @@ -531,9 +548,9 @@ public class DirCacheCheckout { // when deleting files process them in the opposite order as they have // been reported. This ensures the files are deleted before we delete // their parent folders - IntList nonDeleted = new IntList(); - for (int i = removed.size() - 1; i >= 0; i--) { - String r = removed.get(i); + Iterator iter = removed.descendingIterator(); + while (iter.hasNext()) { + String r = iter.next(); file = new File(repo.getWorkTree(), r); if (!file.delete() && repo.getFS().exists(file)) { // The list of stuff to delete comes from the index @@ -542,7 +559,7 @@ public class DirCacheCheckout { // to delete it. A submodule is not empty, so it // is safe to check this after a failed delete. if (!repo.getFS().isDirectory(file)) { - nonDeleted.add(i); + iter.remove(); toBeDeleted.add(r); } } else { @@ -560,8 +577,6 @@ public class DirCacheCheckout { if (file != null) { removeEmptyParents(file); } - removed = filterOut(removed, nonDeleted); - nonDeleted = null; Iterator> toUpdate = updated .entrySet().iterator(); Map.Entry e = null; @@ -633,36 +648,6 @@ public class DirCacheCheckout { return toBeDeleted.isEmpty(); } - private static ArrayList filterOut(ArrayList strings, - IntList indicesToRemove) { - int n = indicesToRemove.size(); - if (n == strings.size()) { - return new ArrayList<>(0); - } - switch (n) { - case 0: - return strings; - case 1: - strings.remove(indicesToRemove.get(0)); - return strings; - default: - int length = strings.size(); - ArrayList result = new ArrayList<>(length - n); - // Process indicesToRemove from the back; we know that it - // contains indices in descending order. - int j = n - 1; - int idx = indicesToRemove.get(j); - for (int i = 0; i < length; i++) { - if (i == idx) { - idx = (--j >= 0) ? indicesToRemove.get(j) : -1; - } else { - result.add(strings.get(i)); - } - } - return result; - } - } - private static boolean isSamePrefix(String a, String b) { int as = a.lastIndexOf('/'); int bs = b.lastIndexOf('/'); @@ -1233,6 +1218,9 @@ public class DirCacheCheckout { if (!FileMode.TREE.equals(e.getFileMode())) { builder.add(e); } + if (existing != null) { + existing.add(path); + } if (force) { if (f == null || f.isModified(e, true, walk.getObjectReader())) { kept.add(path); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index 757473878b..c9dc6da4ba 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -26,6 +26,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.UncheckedIOException; import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.LinkOption; import java.text.MessageFormat; import java.util.ArrayList; import java.util.Collection; @@ -33,10 +35,12 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Pattern; import org.eclipse.jgit.annotations.NonNull; @@ -132,6 +136,8 @@ public abstract class Repository implements AutoCloseable { private final String initialBranch; + private final AtomicReference caseInsensitiveWorktree = new AtomicReference<>(); + /** * Initialize a new repository instance. * @@ -1576,6 +1582,40 @@ public abstract class Repository implements AutoCloseable { return workTree; } + /** + * Tells whether the work tree is on a case-insensitive file system. + * + * @return {@code true} if the work tree is case-insensitive; {@code false} + * otherwise + * @throws NoWorkTreeException + * if the repository is bare + * @since 7.2 + */ + public boolean isWorkTreeCaseInsensitive() throws NoWorkTreeException { + Boolean flag = caseInsensitiveWorktree.get(); + if (flag == null) { + File directory = getWorkTree(); + // See if we can find ".git" also as ".GIT". + File dotGit = new File(directory, Constants.DOT_GIT); + if (Files.exists(dotGit.toPath(), LinkOption.NOFOLLOW_LINKS)) { + dotGit = new File(directory, + Constants.DOT_GIT.toUpperCase(Locale.ROOT)); + flag = Boolean.valueOf(Files.exists(dotGit.toPath(), + LinkOption.NOFOLLOW_LINKS)); + } else { + // Fall back to a mostly sane default. On Mac, HFS+ and APFS + // partitions are case-insensitive by default but can be + // configured to be case-sensitive. + SystemReader system = SystemReader.getInstance(); + flag = Boolean.valueOf(system.isWindows() || system.isMacOS()); + } + if (!caseInsensitiveWorktree.compareAndSet(null, flag)) { + flag = caseInsensitiveWorktree.get(); + } + } + return flag.booleanValue(); + } + /** * Force a scan for changed refs. Fires an IndexChangedEvent(false) if * changes are detected. -- cgit v1.2.3 From 4c4bef885c59662c22cbaa940ac7bec0dfee2d21 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 8 Feb 2025 14:09:39 +0100 Subject: DirCacheCheckout.preScanOneTree: consider mode bits If only the file mode is changed, it's still a change and we must check out the entry from the commit. Bug: jgit-138 Change-Id: I83adebe563fcdb4cbe330edb44884d55ed463c2c --- .../tst/org/eclipse/jgit/api/ResetCommandTest.java | 26 ++++++++++++++++++++++ .../eclipse/jgit/dircache/DirCacheCheckout.java | 13 ++++++----- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java index 4265806078..99873e1be1 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java @@ -42,6 +42,7 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.util.FileUtils; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; public class ResetCommandTest extends RepositoryTestCase { @@ -555,6 +556,31 @@ public class ResetCommandTest extends RepositoryTestCase { assertNull(db.resolve(Constants.HEAD)); } + @Test + public void testHardResetFileMode() throws Exception { + Assume.assumeTrue("Test must be able to set executable bit", + db.getFS().supportsExecute()); + git = new Git(db); + File a = writeTrashFile("a.txt", "aaa"); + File b = writeTrashFile("b.txt", "bbb"); + db.getFS().setExecute(b, true); + assertFalse(db.getFS().canExecute(a)); + assertTrue(db.getFS().canExecute(b)); + git.add().addFilepattern("a.txt").addFilepattern("b.txt").call(); + RevCommit commit = git.commit().setMessage("files created").call(); + db.getFS().setExecute(a, true); + db.getFS().setExecute(b, false); + assertTrue(db.getFS().canExecute(a)); + assertFalse(db.getFS().canExecute(b)); + git.add().addFilepattern("a.txt").addFilepattern("b.txt").call(); + git.commit().setMessage("change exe bits").call(); + Ref ref = git.reset().setRef(commit.getName()).setMode(HARD).call(); + assertSameAsHead(ref); + assertEquals(commit.getId(), ref.getObjectId()); + assertFalse(db.getFS().canExecute(a)); + assertTrue(db.getFS().canExecute(b)); + } + private void assertReflog(ObjectId prevHead, ObjectId head) throws IOException { // Check the reflog for HEAD diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java index d61a453973..18d77482e0 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java @@ -410,9 +410,11 @@ public class DirCacheCheckout { // content to be checked out. update(m); } - } else + } else { update(m); - } else if (f == null || !m.idEqual(i)) { + } + } else if (f == null || !m.idEqual(i) + || m.getEntryRawMode() != i.getEntryRawMode()) { // The working tree file is missing or the merge content differs // from index content update(m); @@ -420,11 +422,11 @@ public class DirCacheCheckout { // The index contains a file (and not a folder) if (f.isModified(i.getDirCacheEntry(), true, this.walk.getObjectReader()) - || i.getDirCacheEntry().getStage() != 0) + || i.getDirCacheEntry().getStage() != 0) { // The working tree file is dirty or the index contains a // conflict update(m); - else { + } else { // update the timestamp of the index with the one from the // file if not set, as we are sure to be in sync here. DirCacheEntry entry = i.getDirCacheEntry(); @@ -434,9 +436,10 @@ public class DirCacheCheckout { } keep(i.getEntryPathString(), entry, f); } - } else + } else { // The index contains a folder keep(i.getEntryPathString(), i.getDirCacheEntry(), f); + } } else { // There is no entry in the merge commit. Means: we want to delete // what's currently in the index and working tree -- cgit v1.2.3 From 6670e54e8a182bbfc283dff1bf24c1d3b07115c5 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Fri, 22 Nov 2024 21:52:42 +0100 Subject: [ssh known_hosts] Correct parsing of host key lines Use the correct parsing method to parse just a key type followed by the base64-encoded key data. If we parse an AuthorizedKeyEntry, we may get an exception if an unknown key type is listed. Change-Id: I9e4e58410f1bb4e1af849d0586085052e04284d7 --- .../META-INF/MANIFEST.MF | 1 + .../transport/sshd/KnownHostEntryReaderTest.java | 29 ++++++++++++++++++++++ org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../transport/sshd/KnownHostEntryReader.java | 7 +++--- 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReaderTest.java diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index f266ce106a..32c12a194c 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -27,6 +27,7 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.signing.ssh;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.transport.sshd;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.2.0,7.3.0)", org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", org.eclipse.jgit.junit.ssh;version="[7.2.0,7.3.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReaderTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReaderTest.java new file mode 100644 index 0000000000..d36c38f335 --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReaderTest.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2024 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.transport.sshd; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.apache.sshd.client.config.hosts.KnownHostEntry; +import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; +import org.junit.Test; + +public class KnownHostEntryReaderTest { + + @Test + public void testUnsupportedHostKeyLine() { + KnownHostEntry entry = KnownHostEntryReader.parseHostEntry( + "[localhost]:2222 ssh-unknown AAAAC3NzaC1lZDI1NTE5AAAAIPu6ntmyfSOkqLl3qPxD5XxwW7OONwwSG3KO+TGn+PFu"); + AuthorizedKeyEntry keyEntry = entry.getKeyEntry(); + assertNotNull(keyEntry); + assertEquals("ssh-unknown", keyEntry.getKeyType()); + } +} diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index b6b528cec4..822ef55fa2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -9,7 +9,7 @@ Bundle-ActivationPolicy: lazy Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-internal:=true; + org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReader.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReader.java index 96829b7365..6b2345df1b 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReader.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/KnownHostEntryReader.java @@ -29,6 +29,7 @@ import org.apache.sshd.client.config.hosts.HostPatternsHolder; import org.apache.sshd.client.config.hosts.KnownHostEntry; import org.apache.sshd.client.config.hosts.KnownHostHashValue; import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; +import org.apache.sshd.common.config.keys.PublicKeyEntry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -97,7 +98,7 @@ public class KnownHostEntryReader { return i < 0 ? line.trim() : line.substring(0, i).trim(); } - private static KnownHostEntry parseHostEntry(String line) { + static KnownHostEntry parseHostEntry(String line) { KnownHostEntry entry = new KnownHostEntry(); entry.setConfigLine(line); String tmp = line; @@ -135,8 +136,8 @@ public class KnownHostEntryReader { entry.setPatterns(patterns); } tmp = tmp.substring(i + 1).trim(); - AuthorizedKeyEntry key = AuthorizedKeyEntry - .parseAuthorizedKeyEntry(tmp); + AuthorizedKeyEntry key = PublicKeyEntry + .parsePublicKeyEntry(new AuthorizedKeyEntry(), tmp); if (key == null) { return null; } -- cgit v1.2.3 From b3230f25e57858958f4fc1d01070dfc0bf08370e Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 11 Feb 2025 14:39:19 -0800 Subject: test/tests.bzl: Add docstrings to module and function Downstream validators complain about these docstrings missing. Change-Id: I01c1f40eccc7294a613a75d245a6ca03e14a47e1 --- org.eclipse.jgit.test/tests.bzl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl index bae3b4fa2b..41f76d090a 100644 --- a/org.eclipse.jgit.test/tests.bzl +++ b/org.eclipse.jgit.test/tests.bzl @@ -1,9 +1,27 @@ +''' +Expose each test as a bazel target +''' load( "@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests", ) def tests(tests, srcprefix="tst/", extra_tags=[]): + ''' + Create a target each of the tests + + Each target is the full push (removing srcprefix) replacing directory + separators with underscores. + + e.g. a test under tst/a/b/c/A.test will become the target + //org.eclipse.jgit.tests:a_b_c_A + + Args: + tests: a glob of tests files + srcprefix: prefix between org.eclipse.jgit.tests and the package + start + extra_tags: additional tags to add to the generated targets + ''' for src in tests: name = src[len(srcprefix):len(src) - len(".java")].replace("/", "_") labels = [] -- cgit v1.2.3 From 072e93fded7229f00002232b33ed91a0ef614ddb Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 23 Jan 2025 15:49:30 -0800 Subject: midx.MultiPackIndexWriter: a writer for the multipack index format Fromg git documentation[1]: While the pack-indexes provide fast lookup per packfile, this performance degrades as the number of packfiles increases, because abbreviations need to inspect every packfile and we are more likely to have a miss on our most-recently-used packfile. For some large repositories, repacking into a single packfile is not feasible due to storage space or excessive repack times. (...) The multi-pack-index (MIDX for short) stores a list of objects and their offsets into multiple packfiles. (...) Thus, we can provide O(log N) lookup time for any number of packfiles. This is a writer of the multipack index format. The test only verifies the "shape" of the file, when we get a parser we can check also the values (specially the large offset handling). On the JGit repository, the multipack index generated by this writer passes the validation of `git multi-pack-index verify`. [1] https://git-scm.com/docs/pack-format#_multi_pack_index_midx_files_have_the_following_format Change-Id: I1fca599c4ebf28154f28f039c2c4cfe75b2dc79d --- .../storage/midx/CgitMidxCompatibilityTest.java | 210 ++++++++++ .../storage/midx/MultiPackIndexWriterTest.java | 161 ++++++++ .../org/eclipse/jgit/internal/JGitText.properties | 2 + .../src/org/eclipse/jgit/internal/JGitText.java | 2 + .../storage/midx/MultiPackIndexConstants.java | 55 +++ .../storage/midx/MultiPackIndexWriter.java | 422 +++++++++++++++++++++ 6 files changed, 852 insertions(+) create mode 100644 org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexConstants.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java diff --git a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java new file mode 100644 index 0000000000..bbff7d433f --- /dev/null +++ b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java @@ -0,0 +1,210 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.CHUNK_LOOKUP_WIDTH; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OBJECTOFFSETS; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OIDFANOUT; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OIDLOOKUP; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_PACKNAMES; +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.jgit.internal.storage.file.ObjectDirectory; +import org.eclipse.jgit.internal.storage.file.Pack; +import org.eclipse.jgit.internal.storage.file.PackFile; +import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; +import org.eclipse.jgit.util.NB; +import org.junit.Test; + +public class CgitMidxCompatibilityTest extends SampleDataRepositoryTestCase { + + @Test + public void jgitMidx_verifyByCgit() + throws IOException, InterruptedException { + byte[] jgitMidxBytes = generateJGitMidx(); + writeMidx(jgitMidxBytes); + assertEquals("cgit exit code", 0, run_cgit_multipackindex_verify()); + } + + @Test + public void compareBasicChunkSizes() + throws IOException, InterruptedException { + // We cannot compare byte-by-byte because there are optional chunks and + // it is not guaranteed what cgit and jgit will generate + byte[] jgitMidxBytes = generateJGitMidx(); + assertEquals("cgit exit code", 0, run_cgit_multipackindex_write()); + byte[] cgitMidxBytes = readCgitMidx(); + + RawMultiPackIndex jgitMidx = new RawMultiPackIndex(jgitMidxBytes); + RawMultiPackIndex cgitMidx = new RawMultiPackIndex(cgitMidxBytes); + + // This is a fixed sized chunk + assertEquals(256 * 4, cgitMidx.getChunkSize(MIDX_CHUNKID_OIDFANOUT)); + assertArrayEquals(cgitMidx.getRawChunk(MIDX_CHUNKID_OIDFANOUT), + jgitMidx.getRawChunk(MIDX_CHUNKID_OIDFANOUT)); + + assertArrayEquals(cgitMidx.getRawChunk(MIDX_CHUNKID_OIDLOOKUP), + jgitMidx.getRawChunk(MIDX_CHUNKID_OIDLOOKUP)); + + // The spec has changed from padding packnames to a multile of four, to + // move the packname chunk to the end of the file. + // git 2.48 pads the packs names to a multiple of 4 + // jgit puts the chunk at the end + byte[] cgitPacknames = trimPadding( + cgitMidx.getRawChunk(MIDX_CHUNKID_PACKNAMES)); + assertArrayEquals(cgitPacknames, + jgitMidx.getRawChunk(MIDX_CHUNKID_PACKNAMES)); + + assertArrayEquals(cgitMidx.getRawChunk(MIDX_CHUNKID_OBJECTOFFSETS), + jgitMidx.getRawChunk(MIDX_CHUNKID_OBJECTOFFSETS)); + + } + + private byte[] generateJGitMidx() throws IOException { + Map indexes = new HashMap<>(); + for (Pack pack : db.getObjectDatabase().getPacks()) { + PackFile packFile = pack.getPackFile().create(PackExt.INDEX); + indexes.put(packFile.getName(), pack.getIndex()); + } + + MultiPackIndexWriter writer = new MultiPackIndexWriter(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + writer.write(NullProgressMonitor.INSTANCE, out, indexes); + return out.toByteArray(); + } + + private int run_cgit_multipackindex_write() + throws IOException, InterruptedException { + String[] command = new String[] { "git", "multi-pack-index", "write" }; + Process proc = Runtime.getRuntime().exec(command, new String[0], + db.getDirectory()); + return proc.waitFor(); + } + + private int run_cgit_multipackindex_verify() + throws IOException, InterruptedException { + String[] command = new String[] { "git", "multi-pack-index", "verify" }; + Process proc = Runtime.getRuntime().exec(command, new String[0], + db.getDirectory()); + return proc.waitFor(); + } + + private byte[] readCgitMidx() throws IOException { + File midx = getMIdxStandardLocation(); + assertTrue("cgit multi-pack-index exists", midx.exists()); + return Files.readAllBytes(midx.toPath()); + } + + private void writeMidx(byte[] midx) throws IOException { + File midxFile = getMIdxStandardLocation(); + Files.write(midxFile.toPath(), midx); + } + + private File getMIdxStandardLocation() { + return new File( + ((ObjectDirectory) db.getObjectDatabase()).getPackDirectory(), + "multi-pack-index"); + } + + private byte[] trimPadding(byte[] data) { + // Chunk MUST have one \0, we want to remove any extra \0 + int newEnd = data.length - 1; + while (newEnd - 1 >= 0 && data[newEnd - 1] == 0) { + newEnd--; + } + + if (newEnd == data.length - 1) { + return data; + } + return Arrays.copyOfRange(data, 0, newEnd + 1); + } + + private static class RawMultiPackIndex { + private final List chunks; + + private final byte[] midx; + + private RawMultiPackIndex(byte[] midx) { + this.chunks = readChunks(midx); + this.midx = midx; + } + + long getChunkSize(int chunkId) { + int chunkPos = findChunkPosition(chunks, chunkId); + return chunks.get(chunkPos + 1).offset + - chunks.get(chunkPos).offset; + } + + long getOffset(int chunkId) { + return chunks.get(findChunkPosition(chunks, chunkId)).offset; + } + + private long getNextOffset(int chunkId) { + return chunks.get(findChunkPosition(chunks, chunkId) + 1).offset; + } + + byte[] getRawChunk(int chunkId) { + int start = (int) getOffset(chunkId); + int end = (int) getNextOffset(chunkId); + return Arrays.copyOfRange(midx, start, end); + } + + private static int findChunkPosition(List chunks, + int id) { + int chunkPos = -1; + for (int i = 0; i < chunks.size(); i++) { + if (chunks.get(i).id() == id) { + chunkPos = i; + break; + } + } + if (chunkPos == -1) { + throw new IllegalStateException("Chunk doesn't exist"); + } + return chunkPos; + } + + private List readChunks(byte[] midx) { + // Read the number of "chunkOffsets" (1 byte) + int chunkCount = midx[6]; + byte[] lookupBuffer = new byte[CHUNK_LOOKUP_WIDTH + * (chunkCount + 1)]; + System.arraycopy(midx, 12, lookupBuffer, 0, lookupBuffer.length); + + List chunks = new ArrayList<>(chunkCount + 1); + for (int i = 0; i <= chunkCount; i++) { + // chunks[chunkCount] is just a marker, in order to record the + // length of the last chunk. + int id = NB.decodeInt32(lookupBuffer, i * 12); + long offset = NB.decodeInt64(lookupBuffer, i * 12 + 4); + chunks.add(new ChunkSegment(id, offset)); + } + return chunks; + } + } + + private record ChunkSegment(int id, long offset) { + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java new file mode 100644 index 0000000000..82f3eb1e08 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriterTest.java @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.CHUNK_LOOKUP_WIDTH; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_LARGEOFFSETS; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OBJECTOFFSETS; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OIDFANOUT; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OIDLOOKUP; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_PACKNAMES; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_REVINDEX; +import static org.junit.Assert.assertEquals; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.junit.FakeIndexFactory; +import org.eclipse.jgit.junit.FakeIndexFactory.IndexObject; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.eclipse.jgit.util.NB; +import org.junit.Test; + +public class MultiPackIndexWriterTest { + + @Test + public void write_allSmallOffsets() throws IOException { + PackIndex index1 = indexOf( + object("0000000000000000000000000000000000000001", 500), + object("0000000000000000000000000000000000000003", 1500), + object("0000000000000000000000000000000000000005", 3000)); + PackIndex index2 = indexOf( + object("0000000000000000000000000000000000000002", 500), + object("0000000000000000000000000000000000000004", 1500), + object("0000000000000000000000000000000000000006", 3000)); + + Map data = Map.of("packname1", index1, "packname2", + index2); + + MultiPackIndexWriter writer = new MultiPackIndexWriter(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + writer.write(NullProgressMonitor.INSTANCE, out, data); + // header (12 bytes) + // + chunkHeader (6 * 12 bytes) + // + fanout table (256 * 4 bytes) + // + OIDs (6 * 20 bytes) + // + (pack, offset) pairs (6 * 8) + // + RIDX (6 * 4 bytes) + // + packfile names (2 * 10) + // + checksum (20) + assertEquals(1340, out.size()); + List chunkIds = readChunkIds(out); + assertEquals(5, chunkIds.size()); + assertEquals(0, chunkIds.indexOf(MIDX_CHUNKID_OIDFANOUT)); + assertEquals(1, chunkIds.indexOf(MIDX_CHUNKID_OIDLOOKUP)); + assertEquals(2, chunkIds.indexOf(MIDX_CHUNKID_OBJECTOFFSETS)); + assertEquals(3, chunkIds.indexOf(MIDX_CHUNKID_REVINDEX)); + assertEquals(4, chunkIds.indexOf(MIDX_CHUNKID_PACKNAMES)); + } + + @Test + public void write_smallOffset_limit() throws IOException { + PackIndex index1 = indexOf( + object("0000000000000000000000000000000000000001", 500), + object("0000000000000000000000000000000000000003", 1500), + object("0000000000000000000000000000000000000005", (1L << 32) -1)); + PackIndex index2 = indexOf( + object("0000000000000000000000000000000000000002", 500), + object("0000000000000000000000000000000000000004", 1500), + object("0000000000000000000000000000000000000006", 3000)); + Map data = + Map.of("packname1", index1, "packname2", index2); + + MultiPackIndexWriter writer = new MultiPackIndexWriter(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + writer.write(NullProgressMonitor.INSTANCE, out, data); + // header (12 bytes) + // + chunkHeader (6 * 12 bytes) + // + fanout table (256 * 4 bytes) + // + OIDs (6 * 20 bytes) + // + (pack, offset) pairs (6 * 8) + // + RIDX (6 * 4 bytes) + // + packfile names (2 * 10) + // + checksum (20) + assertEquals(1340, out.size()); + List chunkIds = readChunkIds(out); + assertEquals(5, chunkIds.size()); + assertEquals(0, chunkIds.indexOf(MIDX_CHUNKID_OIDFANOUT)); + assertEquals(1, chunkIds.indexOf(MIDX_CHUNKID_OIDLOOKUP)); + assertEquals(2, chunkIds.indexOf(MIDX_CHUNKID_OBJECTOFFSETS)); + assertEquals(3, chunkIds.indexOf(MIDX_CHUNKID_REVINDEX)); + assertEquals(4, chunkIds.indexOf(MIDX_CHUNKID_PACKNAMES)); + } + + @Test + public void write_largeOffset() throws IOException { + PackIndex index1 = indexOf( + object("0000000000000000000000000000000000000001", 500), + object("0000000000000000000000000000000000000003", 1500), + object("0000000000000000000000000000000000000005", 1L << 32)); + PackIndex index2 = indexOf( + object("0000000000000000000000000000000000000002", 500), + object("0000000000000000000000000000000000000004", 1500), + object("0000000000000000000000000000000000000006", 3000)); + Map data = + Map.of("packname1", index1, "packname2", index2); + + MultiPackIndexWriter writer = new MultiPackIndexWriter(); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + writer.write(NullProgressMonitor.INSTANCE, out, data); + // header (12 bytes) + // + chunkHeader (7 * 12 bytes) + // + fanout table (256 * 4 bytes) + // + OIDs (6 * 20 bytes) + // + (pack, offset) pairs (6 * 8) + // + (large-offset) (1 * 8) + // + RIDX (6 * 4 bytes) + // + packfile names (2 * 10) + // + checksum (20) + assertEquals(1360, out.size()); + List chunkIds = readChunkIds(out); + assertEquals(6, chunkIds.size()); + assertEquals(0, chunkIds.indexOf(MIDX_CHUNKID_OIDFANOUT)); + assertEquals(1, chunkIds.indexOf(MIDX_CHUNKID_OIDLOOKUP)); + assertEquals(2, chunkIds.indexOf(MIDX_CHUNKID_OBJECTOFFSETS)); + assertEquals(3, chunkIds.indexOf(MIDX_CHUNKID_LARGEOFFSETS)); + assertEquals(4, chunkIds.indexOf(MIDX_CHUNKID_REVINDEX)); + assertEquals(5, chunkIds.indexOf(MIDX_CHUNKID_PACKNAMES)); + } + + private List readChunkIds(ByteArrayOutputStream out) { + List chunkIds = new ArrayList<>(); + byte[] raw = out.toByteArray(); + int numChunks = raw[6]; + int position = 12; + for (int i = 0; i < numChunks; i++) { + chunkIds.add(NB.decodeInt32(raw, position)); + position += CHUNK_LOOKUP_WIDTH; + } + return chunkIds; + } + + private static PackIndex indexOf(IndexObject... objs) { + return FakeIndexFactory.indexOf(Arrays.asList(objs)); + } + + private static IndexObject object(String name, long offset) { + return new IndexObject(name, offset); + } +} diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 7c47d3a04f..392f4e9954 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -529,6 +529,8 @@ mkDirsFailed=Creating directories for {0} failed month=month months=months monthsAgo={0} months ago +multiPackIndexUnexpectedSize=MultiPack index: expected %d bytes but out has %d bytes +multiPackIndexWritingCancelled=Multipack index writing was canceled multipleMergeBasesFor=Multiple merge bases for:\n {0}\n {1} found:\n {2}\n {3} nameMustNotBeNullOrEmpty=Ref name must not be null or empty. need2Arguments=Need 2 arguments diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 07e882498c..d7fe456946 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -559,6 +559,8 @@ public class JGitText extends TranslationBundle { /***/ public String month; /***/ public String months; /***/ public String monthsAgo; + /***/ public String multiPackIndexUnexpectedSize; + /***/ public String multiPackIndexWritingCancelled; /***/ public String multipleMergeBasesFor; /***/ public String nameMustNotBeNullOrEmpty; /***/ public String need2Arguments; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexConstants.java new file mode 100644 index 0000000000..6122a9a143 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexConstants.java @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +class MultiPackIndexConstants { + static final int MIDX_SIGNATURE = 0x4d494458; /* MIDX */ + + static final byte MIDX_VERSION = 1; + + /** + * We infer the length of object IDs (OIDs) from this value: + * + * 

+	 * 1 => SHA-1
+	 * 2 => SHA-256
+	 *
+ */ + static final byte OID_HASH_VERSION = 1; + + static final int MULTIPACK_INDEX_FANOUT_SIZE = 4 * 256; + + /** + * First 4 bytes describe the chunk id. Value 0 is a terminating label. + * Other 8 bytes provide the byte-offset in current file for chunk to start. + */ + static final int CHUNK_LOOKUP_WIDTH = 12; + + /** "PNAM" chunk */ + static final int MIDX_CHUNKID_PACKNAMES = 0x504e414d; + + /** "OIDF" chunk */ + static final int MIDX_CHUNKID_OIDFANOUT = 0x4f494446; + + /** "OIDL" chunk */ + static final int MIDX_CHUNKID_OIDLOOKUP = 0x4f49444c; + + /** "OOFF" chunk */ + static final int MIDX_CHUNKID_OBJECTOFFSETS = 0x4f4f4646; + + /** "LOFF" chunk */ + static final int MIDX_CHUNKID_LARGEOFFSETS = 0x4c4f4646; + + /** "RIDX" chunk */ + static final int MIDX_CHUNKID_REVINDEX = 0x52494458; + + private MultiPackIndexConstants() { + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java new file mode 100644 index 0000000000..28d2fb2334 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -0,0 +1,422 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.CHUNK_LOOKUP_WIDTH; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_LARGEOFFSETS; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OBJECTOFFSETS; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OIDFANOUT; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_OIDLOOKUP; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_PACKNAMES; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_CHUNKID_REVINDEX; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_SIGNATURE; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MIDX_VERSION; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.MULTIPACK_INDEX_FANOUT_SIZE; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.OID_HASH_VERSION; +import static org.eclipse.jgit.lib.Constants.OBJECT_ID_LENGTH; + +import java.io.IOException; +import java.io.InterruptedIOException; +import java.io.OutputStream; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import org.eclipse.jgit.internal.JGitText; +import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.internal.storage.io.CancellableDigestOutputStream; +import org.eclipse.jgit.internal.storage.midx.PackIndexMerger.MidxMutableEntry; +import org.eclipse.jgit.lib.ProgressMonitor; +import org.eclipse.jgit.util.NB; + +/** + * Writes a collection of indexes as a multipack index. + *

+ * See multipack + * index format spec + */ +public class MultiPackIndexWriter { + + private static final int LIMIT_31_BITS = (1 << 31) - 1; + + private static final int MIDX_HEADER_SIZE = 12; + + /** + * Writes the inputs in the multipack index format in the outputStream. + * + * @param monitor + * progress monitor + * @param outputStream + * stream to write the multipack index file + * @param inputs + * pairs of name and index for each pack to include in the + * multipack index. + * @throws IOException + * Error writing to the stream + */ + public void write(ProgressMonitor monitor, OutputStream outputStream, + Map inputs) throws IOException { + PackIndexMerger data = new PackIndexMerger(inputs); + + // List of chunks in the order they need to be written + List chunkHeaders = createChunkHeaders(data); + long expectedSize = calculateExpectedSize(chunkHeaders); + try (CancellableDigestOutputStream out = new CancellableDigestOutputStream( + monitor, outputStream)) { + writeHeader(out, chunkHeaders.size(), data.getPackCount()); + writeChunkLookup(out, chunkHeaders); + + WriteContext ctx = new WriteContext(out, data); + for (ChunkHeader chunk : chunkHeaders) { + chunk.writerFn.write(ctx); + } + writeCheckSum(out); + if (expectedSize != out.length()) { + throw new IllegalStateException(String.format( + JGitText.get().multiPackIndexUnexpectedSize, + expectedSize, out.length())); + } + } catch (InterruptedIOException e) { + throw new IOException(JGitText.get().multiPackIndexWritingCancelled, + e); + } + } + + private static long calculateExpectedSize(List chunks) { + int chunkLookup = (chunks.size() + 1) * CHUNK_LOOKUP_WIDTH; + long chunkContent = chunks.stream().mapToLong(c -> c.size).sum(); + return /* header */ 12 + chunkLookup + chunkContent + /* CRC */ 20; + } + + private List createChunkHeaders(PackIndexMerger data) { + List chunkHeaders = new ArrayList<>(); + chunkHeaders.add(new ChunkHeader(MIDX_CHUNKID_OIDFANOUT, + MULTIPACK_INDEX_FANOUT_SIZE, this::writeFanoutTable)); + chunkHeaders.add(new ChunkHeader(MIDX_CHUNKID_OIDLOOKUP, + (long) data.getUniqueObjectCount() * OBJECT_ID_LENGTH, + this::writeOidLookUp)); + chunkHeaders.add(new ChunkHeader(MIDX_CHUNKID_OBJECTOFFSETS, + 8L * data.getUniqueObjectCount(), this::writeObjectOffsets)); + if (data.needsLargeOffsetsChunk()) { + chunkHeaders.add(new ChunkHeader(MIDX_CHUNKID_LARGEOFFSETS, + 8L * data.getOffsetsOver31BitsCount(), + this::writeObjectLargeOffsets)); + } + chunkHeaders.add(new ChunkHeader(MIDX_CHUNKID_REVINDEX, + 4L * data.getUniqueObjectCount(), this::writeRidx)); + + int packNamesSize = data.getPackNames().stream() + .mapToInt(String::length).map(i -> i + 1 /* null at the end */) + .sum(); + chunkHeaders.add(new ChunkHeader(MIDX_CHUNKID_PACKNAMES, packNamesSize, + this::writePackfileNames)); + return chunkHeaders; + } + + /** + * Write the first 12 bytes of the multipack index. + *

+ * These bytes include things like magic number, version, number of + * chunks... + * + * @param out + * output stream to write + * @param numChunks + * number of chunks this multipack index is going to have + * @param packCount + * number of packs covered by this multipack index + * @throws IOException + * error writing to the output stream + */ + private void writeHeader(CancellableDigestOutputStream out, int numChunks, + int packCount) throws IOException { + byte[] headerBuffer = new byte[MIDX_HEADER_SIZE]; + NB.encodeInt32(headerBuffer, 0, MIDX_SIGNATURE); + byte[] buff = { MIDX_VERSION, OID_HASH_VERSION, (byte) numChunks, + (byte) 0 }; + System.arraycopy(buff, 0, headerBuffer, 4, 4); + NB.encodeInt32(headerBuffer, 8, packCount); + out.write(headerBuffer, 0, headerBuffer.length); + out.flush(); + } + + /** + * Write a table of "chunkId, start-offset", with a special value "0, + * end-of-previous_chunk", to mark the end. + * + * @param out + * output stream to write + * @param chunkHeaders + * list of chunks in the order they are expected to be written + * @throws IOException + * error writing to the output stream + */ + private void writeChunkLookup(CancellableDigestOutputStream out, + List chunkHeaders) throws IOException { + + // first chunk will start at header + this lookup block + long chunkStart = MIDX_HEADER_SIZE + + (long) (chunkHeaders.size() + 1) * CHUNK_LOOKUP_WIDTH; + byte[] chunkEntry = new byte[CHUNK_LOOKUP_WIDTH]; + for (ChunkHeader chunkHeader : chunkHeaders) { + NB.encodeInt32(chunkEntry, 0, chunkHeader.chunkId); + NB.encodeInt64(chunkEntry, 4, chunkStart); + out.write(chunkEntry); + chunkStart += chunkHeader.size; + } + // Terminating label for the block + // (chunkid 0, offset where the next block would start) + NB.encodeInt32(chunkEntry, 0, 0); + NB.encodeInt64(chunkEntry, 4, chunkStart); + out.write(chunkEntry); + } + + /** + * Write the fanout table for the object ids + *

+ * Table with 256 entries (one byte), where the ith entry, F[i], stores the + * number of OIDs with first byte at most i. Thus, F[255] stores the total + * number of objects. + * + * @param ctx + * write context + * @throws IOException + * error writing to the output stream + */ + + private void writeFanoutTable(WriteContext ctx) throws IOException { + byte[] tmp = new byte[4]; + int[] fanout = new int[256]; + Iterator iterator = ctx.data.bySha1Iterator(); + while (iterator.hasNext()) { + MidxMutableEntry e = iterator.next(); + fanout[e.getObjectId().getFirstByte() & 0xff]++; + } + for (int i = 1; i < fanout.length; i++) { + fanout[i] += fanout[i - 1]; + } + for (int n : fanout) { + NB.encodeInt32(tmp, 0, n); + ctx.out.write(tmp, 0, 4); + } + } + + /** + * Write the OID lookup chunk + *

+ * A list of OIDs in sha1 order. + * + * @param ctx + * write context + * @throws IOException + * error writing to the output stream + */ + private void writeOidLookUp(WriteContext ctx) throws IOException { + byte[] tmp = new byte[OBJECT_ID_LENGTH]; + + Iterator iterator = ctx.data.bySha1Iterator(); + while (iterator.hasNext()) { + MidxMutableEntry e = iterator.next(); + e.getObjectId().copyRawTo(tmp, 0); + ctx.out.write(tmp, 0, OBJECT_ID_LENGTH); + } + } + + /** + * Write the object offsets chunk + *

+ * A list of offsets, parallel to the list of OIDs. If the offset is too + * large (see {@link #fitsIn31bits(long)}), this contains the position in + * the large offsets list (marked with a 1 in the most significant bit). + * + * @param ctx + * write context + * @throws IOException + * error writing to the output stream + */ + private void writeObjectOffsets(WriteContext ctx) throws IOException { + byte[] entry = new byte[8]; + Iterator iterator = ctx.data.bySha1Iterator(); + while (iterator.hasNext()) { + MidxMutableEntry e = iterator.next(); + NB.encodeInt32(entry, 0, e.getPackId()); + if (!ctx.data.needsLargeOffsetsChunk() + || fitsIn31bits(e.getOffset())) { + NB.encodeInt32(entry, 4, (int) e.getOffset()); + } else { + int offloadedPosition = ctx.largeOffsets.append(e.getOffset()); + NB.encodeInt32(entry, 4, offloadedPosition | (1 << 31)); + } + ctx.out.write(entry); + } + } + + /** + * Writes the reverse index chunk + *

+ * This stores the position of the objects in the main index, ordered first + * by pack and then by offset + * + * @param ctx + * write context + * @throws IOException + * erorr writing to the output stream + */ + private void writeRidx(WriteContext ctx) throws IOException { + Map> packOffsets = new HashMap<>( + ctx.data.getPackCount()); + // TODO(ifrade): Brute force solution loading all offsets/packs in + // memory. We could also iterate reverse indexes looking up + // their position in the midx (and discarding if the pack doesn't + // match). + Iterator iterator = ctx.data.bySha1Iterator(); + int midxPosition = 0; + while (iterator.hasNext()) { + MidxMutableEntry e = iterator.next(); + OffsetPosition op = new OffsetPosition(e.getOffset(), midxPosition); + midxPosition++; + packOffsets.computeIfAbsent(e.getPackId(), k -> new ArrayList<>()) + .add(op); + } + + for (int i = 0; i < ctx.data.getPackCount(); i++) { + List offsetsForPack = packOffsets.get(i); + if (offsetsForPack.isEmpty()) { + continue; + } + offsetsForPack.sort(Comparator.comparing(OffsetPosition::offset)); + byte[] ridxForPack = new byte[4 * offsetsForPack.size()]; + for (int j = 0; j < offsetsForPack.size(); j++) { + NB.encodeInt32(ridxForPack, j * 4, + offsetsForPack.get(j).position); + } + ctx.out.write(ridxForPack); + } + } + + /** + * Write the large offset chunk + *

+ * A list of large offsets (long). The regular offset chunk will point to a + * position here. + * + * @param ctx + * writer context + * @throws IOException + * error writing to the output stream + */ + private void writeObjectLargeOffsets(WriteContext ctx) throws IOException { + ctx.out.write(ctx.largeOffsets.offsets, 0, + ctx.largeOffsets.bytePosition); + } + + /** + * Write the list of packfiles chunk + *

+ * List of packfiles (in lexicographical order) with an \0 at the end + * + * @param ctx + * writer context + * @throws IOException + * error writing to the output stream + */ + private void writePackfileNames(WriteContext ctx) throws IOException { + for (String packName : ctx.data.getPackNames()) { + // Spec doesn't talk about encoding. + ctx.out.write(packName.getBytes(StandardCharsets.UTF_8)); + ctx.out.write(0); + } + } + + /** + * Write final checksum of the data written to the stream + * + * @param out + * output stream used to write + * @throws IOException + * error writing to the output stream + */ + private void writeCheckSum(CancellableDigestOutputStream out) + throws IOException { + out.write(out.getDigest()); + out.flush(); + } + + + private record OffsetPosition(long offset, int position) { + } + + /** + * If there is at least one offset value larger than 2^32-1, then the large + * offset chunk must exist, and offsets larger than 2^31-1 must be stored in + * it instead + * + * @param offset object offset + * + * @return true if the offset fits in 31 bits + */ + private static boolean fitsIn31bits(long offset) { + return offset <= LIMIT_31_BITS; + } + + private static class LargeOffsets { + private final byte[] offsets; + + private int bytePosition; + + LargeOffsets(int largeOffsetsCount) { + offsets = new byte[largeOffsetsCount * 8]; + bytePosition = 0; + } + + /** + * Add an offset to the large offset chunk + * + * @param largeOffset + * a large offset + * @return the position of the just inserted offset (as in number of + * offsets, NOT in bytes) + */ + int append(long largeOffset) { + int at = bytePosition; + NB.encodeInt64(offsets, at, largeOffset); + bytePosition += 8; + return at / 8; + } + } + + private record ChunkHeader(int chunkId, long size, ChunkWriter writerFn) { + } + + @FunctionalInterface + private interface ChunkWriter { + void write(WriteContext ctx) throws IOException; + } + + private static class WriteContext { + final CancellableDigestOutputStream out; + + final PackIndexMerger data; + + final LargeOffsets largeOffsets; + + WriteContext(CancellableDigestOutputStream out, PackIndexMerger data) { + this.out = out; + this.data = data; + this.largeOffsets = new LargeOffsets( + data.getOffsetsOver31BitsCount()); + } + } +} -- cgit v1.2.3 From e9f43b6c1f9069a0a66c8a513b130c4df421dd6e Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 23 Jan 2025 16:03:04 -0800 Subject: midx.MultiPackIndexPrettyPrinter: pretty printer to debug multi pack index Prints the multipack index file in a human readable format. This helps to debug/inspect multipack indexes generated by jgit or git. Change-Id: I04f477b3763b0ecfde6f4379f267de8a609a54e7 --- .../storage/midx/MultiPackIndexPrettyPrinter.java | 154 +++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java new file mode 100644 index 0000000000..e8428b8fca --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java @@ -0,0 +1,154 @@ +/* + * Copyright (C) 2025, Google Inc. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.storage.midx; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.eclipse.jgit.internal.storage.midx.MultiPackIndexConstants.CHUNK_LOOKUP_WIDTH; + +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.util.NB; + +/** + * Prints a multipack index file in a human-readable format. + */ +@SuppressWarnings("nls") +public class MultiPackIndexPrettyPrinter { + + /** + * Writes to out, in human-readable format, the multipack index in rawMidx + * + * @param rawMidx the bytes of a multipack index + * @param out a writer + */ + public static void prettyPrint(byte[] rawMidx, PrintWriter out) { + // Header (12 bytes) + out.println("[ 0] Magic: " + new String(rawMidx, 0, 4, UTF_8)); + out.println("[ 4] Version number: " + (int) rawMidx[4]); + out.println("[ 5] OID version: " + (int) rawMidx[5]); + int chunkCount = rawMidx[6]; + out.println("[ 6] # of chunks: " + chunkCount); + out.println("[ 7] # of bases: " + (int) rawMidx[7]); + int numberOfPacks = NB.decodeInt32(rawMidx, 8); + out.println("[ 8] # of packs: " + numberOfPacks); + + // Chunk lookup table + List chunkSegments = new ArrayList<>(); + int current = printChunkLookup(out, rawMidx, chunkCount, chunkSegments); + + for (int i = 0; i < chunkSegments.size() - 1; i++) { + ChunkSegment segment = chunkSegments.get(i); + if (current != segment.startOffset()) { + throw new IllegalStateException(String.format( + "We are at byte %d, but segment should start at %d", + current, segment.startOffset())); + } + out.printf("Starting chunk: %s @ %d%n", segment.chunkName(), + segment.startOffset()); + switch (segment.chunkName()) { + case "OIDF" -> current = printOIDF(out, rawMidx, current); + case "OIDL" -> current = printOIDL(out, rawMidx, current, + chunkSegments.get(i + 1).startOffset); + case "OOFF" -> current = printOOFF(out, rawMidx, current, + chunkSegments.get(i + 1).startOffset); + case "PNAM" -> current = printPNAM(out, rawMidx, current, + chunkSegments.get(i + 1).startOffset); + case "RIDX" -> current = printRIDX(out, rawMidx, current, + chunkSegments.get(i + 1).startOffset); + default -> { + out.printf( + "Skipping %s (don't know how to print it yet)%n", + segment.chunkName()); + current = (int) chunkSegments.get(i + 1).startOffset(); + } + } + } + // Checksum is a SHA-1, use ObjectId to parse it + out.printf("[ %d] Checksum %s%n", current, + ObjectId.fromRaw(rawMidx, current).name()); + out.printf("Total size: " + (current + 20)); + } + + private static int printChunkLookup(PrintWriter out, byte[] rawMidx, int chunkCount, + List chunkSegments) { + out.println("Starting chunk lookup @ 12"); + int current = 12; + for (int i = 0; i < chunkCount; i++) { + String chunkName = new String(rawMidx, current, 4, UTF_8); + long offset = NB.decodeInt64(rawMidx, current + 4); + out.printf("[ %d] |%8s|%8d|%n", current, chunkName, offset); + current += CHUNK_LOOKUP_WIDTH; + chunkSegments.add(new ChunkSegment(chunkName, offset)); + } + String chunkName = "0000"; + long offset = NB.decodeInt64(rawMidx, current + 4); + out.printf("[ %d] |%8s|%8d|%n", current, chunkName, offset); + current += CHUNK_LOOKUP_WIDTH; + chunkSegments.add(new ChunkSegment(chunkName, offset)); + return current; + } + + private static int printOIDF(PrintWriter out, byte[] rawMidx, int start) { + int current = start; + for (short i = 0; i < 256; i++) { + out.printf("[ %d] (%02X) %d%n", current, i, + NB.decodeInt32(rawMidx, current)); + current += 4; + } + return current; + } + + private static int printOIDL(PrintWriter out, byte[] rawMidx, int start, long end) { + int i = start; + while (i < end) { + out.printf("[ %d] %s%n", i, + ObjectId.fromRaw(rawMidx, i).name()); + i += 20; + } + return i; + } + + private static int printOOFF(PrintWriter out, byte[] rawMidx, int start, long end) { + int i = start; + while (i < end) { + out.printf("[ %d] %d %d%n", i, NB.decodeInt32(rawMidx, i), + NB.decodeInt32(rawMidx, i + 4)); + i += 8; + } + return i; + } + + private static int printRIDX(PrintWriter out, byte[] rawMidx, int start, long end) { + int i = start; + while (i < end) { + out.printf("[ %d] %d%n", i, NB.decodeInt32(rawMidx, i)); + i += 4; + } + return (int) end; + } + + private static int printPNAM(PrintWriter out, byte[] rawMidx, int start, long end) { + int nameStart = start; + for (int i = start; i < end; i++) { + if (rawMidx[i] == 0) { + out + .println(new String(rawMidx, nameStart, i - nameStart)); + nameStart = i + 1; + } + } + return (int) end; + } + + private record ChunkSegment(String chunkName, long startOffset) { + } +} -- cgit v1.2.3 From 097b158c3b03c275ccef27bdb35c91ccf8372a02 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 11 Feb 2025 09:57:55 -0800 Subject: DefaultTypedConfigGetter: Box values to avoid infinite recursion Errorprone says: DefaultTypedConfigGetter.java:176: error: [InfiniteRecursion] This method always recurses, and will cause a StackOverflowError return getLong(config, section, subsection, name, defaultValue); [1] introduced new getters with boxed types to return a null when the config is not set. The getters of unboxed types should call to the boxed version, but, as the values are not explicitely boxed, they are calling to themselves. [1] https://gerrithub.io/c/eclipse-jgit/jgit/+/1207895 Change-Id: Ied45a199c8ef905e3774a17a04d91a656aa0e42b --- .../eclipse/jgit/lib/DefaultTypedConfigGetter.java | 40 +++++++++++++++------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java index 65093987e8..3059f283fe 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/DefaultTypedConfigGetter.java @@ -32,10 +32,12 @@ import org.eclipse.jgit.util.StringUtils; */ public class DefaultTypedConfigGetter implements TypedConfigGetter { + @SuppressWarnings("boxed") @Override public boolean getBoolean(Config config, String section, String subsection, String name, boolean defaultValue) { - return getBoolean(config, section, subsection, name, defaultValue); + return neverNull(getBoolean(config, section, subsection, name, + Boolean.valueOf(defaultValue))); } @Nullable @@ -116,7 +118,8 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { @Override public int getInt(Config config, String section, String subsection, String name, int defaultValue) { - return getInt(config, section, subsection, name, defaultValue); + return neverNull(getInt(config, section, subsection, name, + Integer.valueOf(defaultValue))); } @Nullable @@ -144,8 +147,8 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { @Override public int getIntInRange(Config config, String section, String subsection, String name, int minValue, int maxValue, int defaultValue) { - return getIntInRange(config, section, subsection, name, minValue, - maxValue, defaultValue); + return neverNull(getIntInRange(config, section, subsection, name, + minValue, maxValue, Integer.valueOf(defaultValue))); } @Override @@ -161,9 +164,9 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { return val; } if (subsection == null) { - throw new IllegalArgumentException(MessageFormat.format( - JGitText.get().integerValueNotInRange, section, name, - val, minValue, maxValue)); + throw new IllegalArgumentException( + MessageFormat.format(JGitText.get().integerValueNotInRange, + section, name, val, minValue, maxValue)); } throw new IllegalArgumentException(MessageFormat.format( JGitText.get().integerValueNotInRangeSubSection, section, @@ -173,7 +176,8 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { @Override public long getLong(Config config, String section, String subsection, String name, long defaultValue) { - return getLong(config, section, subsection, name, defaultValue); + return neverNull(getLong(config, section, subsection, name, + Long.valueOf(defaultValue))); } @Nullable @@ -190,8 +194,9 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { // Empty return defaultValue; } catch (NumberFormatException nfe) { - throw new IllegalArgumentException(MessageFormat.format( - JGitText.get().invalidIntegerValue, section, name, str), + throw new IllegalArgumentException( + MessageFormat.format(JGitText.get().invalidIntegerValue, + section, name, str), nfe); } } @@ -199,9 +204,8 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { @Override public long getTimeUnit(Config config, String section, String subsection, String name, long defaultValue, TimeUnit wantUnit) { - Long v = getTimeUnit(config, section, subsection, name, - Long.valueOf(defaultValue), wantUnit); - return v == null ? defaultValue : v.longValue(); + return neverNull(getTimeUnit(config, section, subsection, name, + Long.valueOf(defaultValue), wantUnit)); } @Override @@ -325,4 +329,14 @@ public class DefaultTypedConfigGetter implements TypedConfigGetter { } return result; } + + // Trick for the checkers. When we use this, one is never null, but + // they don't know. + @NonNull + private static T neverNull(T one) { + if (one == null) { + throw new IllegalArgumentException(); + } + return one; + } } -- cgit v1.2.3 From 5320df833b91eb82f82bdafa9b48397c1012c400 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 14 Feb 2025 02:10:19 +0100 Subject: MultiPackIndexWriter: add missing @since for new API class and fix boxing warnings. Change-Id: Ia9b4deba7892256639c53bac5d7b62f1fbb01389 --- .../jgit/internal/storage/midx/MultiPackIndexWriter.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java index 28d2fb2334..bddf3ac4ad 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexWriter.java @@ -46,6 +46,8 @@ import org.eclipse.jgit.util.NB; * See multipack * index format spec + * + * @since 7.2 */ public class MultiPackIndexWriter { @@ -86,7 +88,8 @@ public class MultiPackIndexWriter { if (expectedSize != out.length()) { throw new IllegalStateException(String.format( JGitText.get().multiPackIndexUnexpectedSize, - expectedSize, out.length())); + Long.valueOf(expectedSize), + Long.valueOf(out.length()))); } } catch (InterruptedIOException e) { throw new IOException(JGitText.get().multiPackIndexWritingCancelled, @@ -287,12 +290,13 @@ public class MultiPackIndexWriter { MidxMutableEntry e = iterator.next(); OffsetPosition op = new OffsetPosition(e.getOffset(), midxPosition); midxPosition++; - packOffsets.computeIfAbsent(e.getPackId(), k -> new ArrayList<>()) - .add(op); + packOffsets.computeIfAbsent(Integer.valueOf(e.getPackId()), + k -> new ArrayList<>()).add(op); } for (int i = 0; i < ctx.data.getPackCount(); i++) { - List offsetsForPack = packOffsets.get(i); + List offsetsForPack = packOffsets + .get(Integer.valueOf(i)); if (offsetsForPack.isEmpty()) { continue; } -- cgit v1.2.3 From 5dae4a8351287526b323547f942da72b9e00f456 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Wed, 12 Feb 2025 19:07:42 -0800 Subject: Pack: no longer set invalid in openFail() The intention of the 'invalidate' argument in openFail() is to invalidate the Pack in certain situations. However, after moving doOpen() to a lock instead of using synchronized, the invalidation approach could also incorrectly mark an already invalid Pack valid, which was never the intention since previously invalid would only ever get set to false if it already was false. Fix this by never setting invalid in openFail(), instead set invalid explicitly before calling openFail when needed. This makes the intent clearer, and aligns better with all the existing comments already trying to explain the boolean (and some of them become obvious enough now that the comment is deleted or shortened). This is also likely faster than adding a conditional in openFail() to make 'invalidate' work properly. Change-Id: Ie6182103ee2994724cb5cb0b64030fedba84b637 Signed-off-by: Martin Fick --- .../eclipse/jgit/internal/storage/file/Pack.java | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index 1a7b5de1d7..122d800582 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -694,7 +694,7 @@ public class Pack implements Iterable { private void doOpen() throws IOException { if (invalid) { - openFail(true, invalidatingCause); + openFail(invalidatingCause); throw new PackInvalidException(packFile, invalidatingCause); } try { @@ -705,39 +705,41 @@ public class Pack implements Iterable { } } catch (InterruptedIOException e) { // don't invalidate the pack, we are interrupted from another thread - openFail(false, e); + openFail(e); throw e; } catch (FileNotFoundException fn) { - // don't invalidate the pack if opening an existing file failed - // since it may be related to a temporary lack of resources (e.g. - // max open files) - openFail(!packFile.exists(), fn); + if (!packFile.exists()) { + // Failure to open an existing file may be related to a temporary lack of resources + // (e.g. max open files) + invalid = true; + } + openFail(fn); throw fn; } catch (EOFException | AccessDeniedException | NoSuchFileException | CorruptObjectException | NoPackSignatureException | PackMismatchException | UnpackException | UnsupportedPackIndexVersionException | UnsupportedPackVersionException pe) { - // exceptions signaling permanent problems with a pack - openFail(true, pe); + invalid = true; // exceptions signaling permanent problems with a pack + openFail(pe); throw pe; } catch (IOException ioe) { - // mark this packfile as invalid when NFS stale file handle error - // occur - openFail(FileUtils.isStaleFileHandleInCausalChain(ioe), ioe); + if (FileUtils.isStaleFileHandleInCausalChain(ioe)) { + invalid = true; + } + openFail(ioe); throw ioe; } catch (RuntimeException ge) { // generic exceptions could be transient so we should not mark the // pack invalid to avoid false MissingObjectExceptions - openFail(false, ge); + openFail(ge); throw ge; } } - private void openFail(boolean invalidate, Exception cause) { + private void openFail(Exception cause) { activeWindows = 0; activeCopyRawData = 0; - invalid = invalidate; invalidatingCause = cause; doClose(); } -- cgit v1.2.3 From 860ec71598f27aeadef86bd0826ddaeb23c5b41c Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 13 Feb 2025 14:57:17 -0800 Subject: BlameGeneratorTest: Extract "file.txt" to a constant Following change will add many tests, all using the same "file.txt" and they read better with a constant. Extract it now, so we have a clean change with only new tests without modifying the old ones. Change-Id: Ib5de86ce434358e8ce8c0514f76010dca31bdd6b --- .../eclipse/jgit/api/blame/BlameGeneratorTest.java | 36 ++++++++++++---------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/blame/BlameGeneratorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/blame/BlameGeneratorTest.java index f47f447375..c2c06b2477 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/blame/BlameGeneratorTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/blame/BlameGeneratorTest.java @@ -23,20 +23,22 @@ import org.junit.Test; /** Unit tests of {@link BlameGenerator}. */ public class BlameGeneratorTest extends RepositoryTestCase { + private static final String FILE = "file.txt"; + @Test public void testBoundLineDelete() throws Exception { try (Git git = new Git(db)) { String[] content1 = new String[] { "first", "second" }; - writeTrashFile("file.txt", join(content1)); - git.add().addFilepattern("file.txt").call(); + writeTrashFile(FILE, join(content1)); + git.add().addFilepattern(FILE).call(); RevCommit c1 = git.commit().setMessage("create file").call(); String[] content2 = new String[] { "third", "first", "second" }; - writeTrashFile("file.txt", join(content2)); - git.add().addFilepattern("file.txt").call(); + writeTrashFile(FILE, join(content2)); + git.add().addFilepattern(FILE).call(); RevCommit c2 = git.commit().setMessage("create file").call(); - try (BlameGenerator generator = new BlameGenerator(db, "file.txt")) { + try (BlameGenerator generator = new BlameGenerator(db, FILE)) { generator.push(null, db.resolve(Constants.HEAD)); assertEquals(3, generator.getResultContents().size()); @@ -47,7 +49,7 @@ public class BlameGeneratorTest extends RepositoryTestCase { assertEquals(1, generator.getResultEnd()); assertEquals(0, generator.getSourceStart()); assertEquals(1, generator.getSourceEnd()); - assertEquals("file.txt", generator.getSourcePath()); + assertEquals(FILE, generator.getSourcePath()); assertTrue(generator.next()); assertEquals(c1, generator.getSourceCommit()); @@ -56,7 +58,7 @@ public class BlameGeneratorTest extends RepositoryTestCase { assertEquals(3, generator.getResultEnd()); assertEquals(0, generator.getSourceStart()); assertEquals(2, generator.getSourceEnd()); - assertEquals("file.txt", generator.getSourcePath()); + assertEquals(FILE, generator.getSourcePath()); assertFalse(generator.next()); } @@ -87,7 +89,8 @@ public class BlameGeneratorTest extends RepositoryTestCase { git.add().addFilepattern(FILENAME_2).call(); RevCommit c2 = git.commit().setMessage("change file2").call(); - try (BlameGenerator generator = new BlameGenerator(db, FILENAME_2)) { + try (BlameGenerator generator = new BlameGenerator(db, + FILENAME_2)) { generator.push(null, db.resolve(Constants.HEAD)); assertEquals(3, generator.getResultContents().size()); @@ -113,7 +116,8 @@ public class BlameGeneratorTest extends RepositoryTestCase { } // and test again with other BlameGenerator API: - try (BlameGenerator generator = new BlameGenerator(db, FILENAME_2)) { + try (BlameGenerator generator = new BlameGenerator(db, + FILENAME_2)) { generator.push(null, db.resolve(Constants.HEAD)); BlameResult result = generator.computeBlameResult(); @@ -136,21 +140,21 @@ public class BlameGeneratorTest extends RepositoryTestCase { try (Git git = new Git(db)) { String[] content1 = new String[] { "first", "second", "third" }; - writeTrashFile("file.txt", join(content1)); - git.add().addFilepattern("file.txt").call(); + writeTrashFile(FILE, join(content1)); + git.add().addFilepattern(FILE).call(); git.commit().setMessage("create file").call(); String[] content2 = new String[] { "" }; - writeTrashFile("file.txt", join(content2)); - git.add().addFilepattern("file.txt").call(); + writeTrashFile(FILE, join(content2)); + git.add().addFilepattern(FILE).call(); git.commit().setMessage("create file").call(); - writeTrashFile("file.txt", join(content1)); - git.add().addFilepattern("file.txt").call(); + writeTrashFile(FILE, join(content1)); + git.add().addFilepattern(FILE).call(); RevCommit c3 = git.commit().setMessage("create file").call(); - try (BlameGenerator generator = new BlameGenerator(db, "file.txt")) { + try (BlameGenerator generator = new BlameGenerator(db, FILE)) { generator.push(null, db.resolve(Constants.HEAD)); assertEquals(3, generator.getResultContents().size()); -- cgit v1.2.3 From c625d67f8d7c25b5ce728ecfcc7c894d0ad03938 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 16 Feb 2025 11:50:44 +0100 Subject: URIish: fix stack overflow in regex matching The regex for a relative path used greedy matches, which could cause excessive backtracking. Simplify the regex and use a possessive quantifier to avoid backtracking at all: a relative path is a sequence (AB)*A?, where A and B are disjunct: once (AB)* has been matched, there is no need for any backtracking in the relative path. Bug: egit-80 Change-Id: Ic7865f20767d85ec1db2d0b92adcd548099eb643 --- .../tst/org/eclipse/jgit/transport/URIishTest.java | 37 ++++++++++++++++++++++ .../src/org/eclipse/jgit/transport/URIish.java | 4 +-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java index d403624b71..67920029d4 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/transport/URIishTest.java @@ -81,6 +81,43 @@ public class URIishTest { assertEquals(u, new URIish(str)); } + @Test + public void testBrokenFilePath() throws Exception { + String str = "D:\\\\my\\\\x"; + URIish u = new URIish(str); + assertNull(u.getScheme()); + assertFalse(u.isRemote()); + assertEquals(str, u.getPath()); + assertEquals(u, new URIish(str)); + } + + @Test + public void testStackOverflow() throws Exception { + StringBuilder b = new StringBuilder("D:\\"); + for (int i = 0; i < 4000; i++) { + b.append("x\\"); + } + String str = b.toString(); + URIish u = new URIish(str); + assertNull(u.getScheme()); + assertFalse(u.isRemote()); + assertEquals(str, u.getPath()); + } + + @Test + public void testStackOverflow2() throws Exception { + StringBuilder b = new StringBuilder("D:\\"); + for (int i = 0; i < 4000; i++) { + b.append("x\\"); + } + b.append('y'); + String str = b.toString(); + URIish u = new URIish(str); + assertNull(u.getScheme()); + assertFalse(u.isRemote()); + assertEquals(str, u.getPath()); + } + @Test public void testRelativePath() throws Exception { final String str = "../../foo/bar"; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java index 4de6ff825f..7b5842b712 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java @@ -82,7 +82,7 @@ public class URIish implements Serializable { * Part of a pattern which matches a relative path. Relative paths don't * start with slash or drive letters. Defines no capturing group. */ - private static final String RELATIVE_PATH_P = "(?:(?:[^\\\\/]+[\\\\/]+)*[^\\\\/]+[\\\\/]*)"; //$NON-NLS-1$ + private static final String RELATIVE_PATH_P = "(?:(?:[^\\\\/]+[\\\\/]+)*+[^\\\\/]*)"; //$NON-NLS-1$ /** * Part of a pattern which matches a relative or absolute path. Defines no @@ -120,7 +120,7 @@ public class URIish implements Serializable { * path (maybe even containing windows drive-letters) or a relative path. */ private static final Pattern LOCAL_FILE = Pattern.compile("^" // //$NON-NLS-1$ - + "([\\\\/]?" + PATH_P + ")" // //$NON-NLS-1$ //$NON-NLS-2$ + + "([\\\\/]?+" + PATH_P + ")" // //$NON-NLS-1$ //$NON-NLS-2$ + "$"); //$NON-NLS-1$ /** -- cgit v1.2.3 From b85aedfb4792dcdfbe26111e51caf79cbb931717 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 10 Feb 2025 12:52:18 +0100 Subject: Update GetRefsBenchmark to use 3 state core.trustStat which was introduced in I662982258bc4494f146805875e52838394673c8f. In addition - adjust inconsistent values for parameter numBranches to use 100, 1000, 10000, 100000 to cover 4 orders of magnitude - reduce measurement time to 5 sec per round to limit overall time needed to run the benchmark Change-Id: I778b6b0a19354e26fa0b7733e322359ff0ce9466 --- .../eclipse/jgit/benchmarks/GetRefsBenchmark.java | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/GetRefsBenchmark.java b/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/GetRefsBenchmark.java index 52a881bd11..ea279fbba9 100644 --- a/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/GetRefsBenchmark.java +++ b/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/GetRefsBenchmark.java @@ -28,6 +28,7 @@ import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.lib.BatchRefUpdate; import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; +import org.eclipse.jgit.lib.CoreConfig.TrustStat; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.lib.RepositoryCache; @@ -66,11 +67,11 @@ public class GetRefsBenchmark { @Param({ "true", "false" }) boolean useRefTable; - @Param({ "100", "2500", "10000", "50000" }) + @Param({ "100", "1000", "10000", "100000" }) int numBranches; - @Param({ "true", "false" }) - boolean trustFolderStat; + @Param({ "ALWAYS", "AFTER_OPEN", "NEVER" }) + TrustStat trustStat; List branches = new ArrayList<>(numBranches); @@ -83,8 +84,8 @@ public class GetRefsBenchmark { public void setupBenchmark() throws IOException, GitAPIException { String firstBranch = "firstbranch"; testDir = Files.createDirectory(Paths.get("testrepos")); - String repoName = "branches-" + numBranches + "-trustFolderStat-" - + trustFolderStat + "-" + refDatabaseType(); + String repoName = "branches-" + numBranches + "-trustStat-" + + trustStat + "-" + refDatabaseType(); Path workDir = testDir.resolve(repoName); Path repoPath = workDir.resolve(".git"); Git git = Git.init().setDirectory(workDir.toFile()).call(); @@ -98,9 +99,9 @@ public class GetRefsBenchmark { ConfigConstants.CONFIG_REF_STORAGE_REFTABLE, false, false); } else { - cfg.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, - ConfigConstants.CONFIG_KEY_TRUSTFOLDERSTAT, - trustFolderStat); + cfg.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_TRUST_STAT, + trustStat); } cfg.setInt(ConfigConstants.CONFIG_RECEIVE_SECTION, null, "maxCommandBytes", Integer.MAX_VALUE); @@ -112,7 +113,7 @@ public class GetRefsBenchmark { System.out.println("Preparing test"); System.out.println("- repository: \t\t" + repoPath); System.out.println("- refDatabase: \t\t" + refDatabaseType()); - System.out.println("- trustFolderStat: \t" + trustFolderStat); + System.out.println("- trustStat: \t" + trustStat); System.out.println("- branches: \t\t" + numBranches); BatchRefUpdate u = repo.getRefDatabase().newBatchUpdate(); @@ -152,7 +153,7 @@ public class GetRefsBenchmark { @BenchmarkMode({ Mode.AverageTime }) @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS) - @Measurement(iterations = 2, time = 10, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) public void testGetExactRef(Blackhole blackhole, BenchmarkState state) throws IOException { String branchName = state.branches @@ -164,7 +165,7 @@ public class GetRefsBenchmark { @BenchmarkMode({ Mode.AverageTime }) @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS) - @Measurement(iterations = 2, time = 10, timeUnit = TimeUnit.SECONDS) + @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) public void testGetRefsByPrefix(Blackhole blackhole, BenchmarkState state) throws IOException { String branchPrefix = "refs/heads/branch/" + branchIndex.nextInt(100) -- cgit v1.2.3 From 24238a35739971cbd86c852f13a2f73f2cad3246 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 11 Feb 2025 00:56:23 +0100 Subject: Replace usage of deprecated Config#getEnum method Need to make DirCacheVersions public otherwise Config#allValuesOf cannot invoke its #values method via introspection. Change-Id: Id11a6fdbe7ce3d84f04bf47e98746424dcc761b4 --- .../tst/org/eclipse/jgit/api/CloneCommandTest.java | 4 +--- .../eclipse/jgit/api/RenameBranchCommandTest.java | 24 +++++++++------------- .../src/org/eclipse/jgit/api/FetchCommand.java | 4 ++-- .../src/org/eclipse/jgit/api/PullCommand.java | 6 +++--- .../src/org/eclipse/jgit/dircache/DirCache.java | 22 ++++++++++++++++---- .../src/org/eclipse/jgit/lib/BranchConfig.java | 3 +-- .../src/org/eclipse/jgit/lib/GpgConfig.java | 3 +-- .../org/eclipse/jgit/submodule/SubmoduleWalk.java | 8 ++++---- .../src/org/eclipse/jgit/transport/HttpConfig.java | 7 +++---- 9 files changed, 43 insertions(+), 38 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java index f5fd73ba38..661878fa07 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CloneCommandTest.java @@ -797,7 +797,7 @@ public class CloneCommandTest extends RepositoryTestCase { assertNull(git2.getRepository().getConfig().getEnum( BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, "test", - ConfigConstants.CONFIG_KEY_REBASE, null)); + ConfigConstants.CONFIG_KEY_REBASE)); StoredConfig userConfig = SystemReader.getInstance() .getUserConfig(); @@ -813,7 +813,6 @@ public class CloneCommandTest extends RepositoryTestCase { addRepoToClose(git2.getRepository()); assertEquals(BranchRebaseMode.REBASE, git2.getRepository().getConfig().getEnum( - BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, "test", ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE)); @@ -830,7 +829,6 @@ public class CloneCommandTest extends RepositoryTestCase { addRepoToClose(git2.getRepository()); assertEquals(BranchRebaseMode.REBASE, git2.getRepository().getConfig().getEnum( - BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, "test", ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE)); diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java index 534ebd9c61..add5886c2d 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/RenameBranchCommandTest.java @@ -118,23 +118,21 @@ public class RenameBranchCommandTest extends RepositoryTestCase { String branch = "b1"; assertEquals(BranchRebaseMode.REBASE, - config.getEnum(BranchRebaseMode.values(), - ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, - ConfigConstants.CONFIG_KEY_REBASE, + config.getEnum(ConfigConstants.CONFIG_BRANCH_SECTION, + Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE)); assertNull(config.getEnum(BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, branch, - ConfigConstants.CONFIG_KEY_REBASE, null)); + ConfigConstants.CONFIG_KEY_REBASE)); assertNotNull(git.branchRename().setNewName(branch).call()); config = git.getRepository().getConfig(); assertNull(config.getEnum(BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, - ConfigConstants.CONFIG_KEY_REBASE, null)); + ConfigConstants.CONFIG_KEY_REBASE)); assertEquals(BranchRebaseMode.REBASE, - config.getEnum(BranchRebaseMode.values(), - ConfigConstants.CONFIG_BRANCH_SECTION, branch, + config.getEnum(ConfigConstants.CONFIG_BRANCH_SECTION, branch, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE)); } @@ -170,13 +168,12 @@ public class RenameBranchCommandTest extends RepositoryTestCase { String branch = "b1"; assertEquals(BranchRebaseMode.REBASE, - config.getEnum(BranchRebaseMode.values(), - ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, - ConfigConstants.CONFIG_KEY_REBASE, + config.getEnum(ConfigConstants.CONFIG_BRANCH_SECTION, + Constants.MASTER, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE)); assertNull(config.getEnum(BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, branch, - ConfigConstants.CONFIG_KEY_REBASE, null)); + ConfigConstants.CONFIG_KEY_REBASE)); assertTrue(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, ConfigConstants.CONFIG_KEY_MERGE, true)); assertFalse(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION, @@ -187,10 +184,9 @@ public class RenameBranchCommandTest extends RepositoryTestCase { config = git.getRepository().getConfig(); assertNull(config.getEnum(BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, Constants.MASTER, - ConfigConstants.CONFIG_KEY_REBASE, null)); + ConfigConstants.CONFIG_KEY_REBASE)); assertEquals(BranchRebaseMode.REBASE, - config.getEnum(BranchRebaseMode.values(), - ConfigConstants.CONFIG_BRANCH_SECTION, branch, + config.getEnum(ConfigConstants.CONFIG_BRANCH_SECTION, branch, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE)); assertFalse(config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java index 0713c38931..f24127bd51 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/FetchCommand.java @@ -124,7 +124,7 @@ public class FetchCommand extends TransportCommand { FetchRecurseSubmodulesMode mode = repo.getConfig().getEnum( FetchRecurseSubmodulesMode.values(), ConfigConstants.CONFIG_SUBMODULE_SECTION, path, - ConfigConstants.CONFIG_KEY_FETCH_RECURSE_SUBMODULES, null); + ConfigConstants.CONFIG_KEY_FETCH_RECURSE_SUBMODULES); if (mode != null) { return mode; } @@ -132,7 +132,7 @@ public class FetchCommand extends TransportCommand { // Fall back to fetch.recurseSubmodules, if set mode = repo.getConfig().getEnum(FetchRecurseSubmodulesMode.values(), ConfigConstants.CONFIG_FETCH_SECTION, null, - ConfigConstants.CONFIG_KEY_RECURSE_SUBMODULES, null); + ConfigConstants.CONFIG_KEY_RECURSE_SUBMODULES); if (mode != null) { return mode; } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java index 83ae0fc9d4..4b2cee45c2 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java @@ -533,9 +533,9 @@ public class PullCommand extends TransportCommand { Config config) { BranchRebaseMode mode = config.getEnum(BranchRebaseMode.values(), ConfigConstants.CONFIG_BRANCH_SECTION, - branchName, ConfigConstants.CONFIG_KEY_REBASE, null); + branchName, ConfigConstants.CONFIG_KEY_REBASE); if (mode == null) { - mode = config.getEnum(BranchRebaseMode.values(), + mode = config.getEnum( ConfigConstants.CONFIG_PULL_SECTION, null, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE); } @@ -549,7 +549,7 @@ public class PullCommand extends TransportCommand { Config config = repo.getConfig(); Merge ffMode = config.getEnum(Merge.values(), ConfigConstants.CONFIG_PULL_SECTION, null, - ConfigConstants.CONFIG_KEY_FF, null); + ConfigConstants.CONFIG_KEY_FF); return ffMode != null ? FastForwardMode.valueOf(ffMode) : null; } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java index 34dba0b5be..c650d6e8e7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCache.java @@ -1037,7 +1037,12 @@ public class DirCache { } } - enum DirCacheVersion implements ConfigEnum { + /** + * DirCache versions + * + * @since 7.2 + */ + public enum DirCacheVersion implements ConfigEnum { /** Minimum index version on-disk format that we support. */ DIRC_VERSION_MINIMUM(2), @@ -1060,6 +1065,9 @@ public class DirCache { this.version = versionCode; } + /** + * @return the version code for this version + */ public int getVersionCode() { return version; } @@ -1078,6 +1086,13 @@ public class DirCache { } } + /** + * Create DirCacheVersion from integer value of the version code. + * + * @param val + * integer value of the version code. + * @return the DirCacheVersion instance of the version code. + */ public static DirCacheVersion fromInt(int val) { for (DirCacheVersion v : DirCacheVersion.values()) { if (val == v.getVersionCode()) { @@ -1098,9 +1113,8 @@ public class DirCache { boolean manyFiles = cfg.getBoolean( ConfigConstants.CONFIG_FEATURE_SECTION, ConfigConstants.CONFIG_KEY_MANYFILES, false); - indexVersion = cfg.getEnum(DirCacheVersion.values(), - ConfigConstants.CONFIG_INDEX_SECTION, null, - ConfigConstants.CONFIG_KEY_VERSION, + indexVersion = cfg.getEnum(ConfigConstants.CONFIG_INDEX_SECTION, + null, ConfigConstants.CONFIG_KEY_VERSION, manyFiles ? DirCacheVersion.DIRC_VERSION_PATHCOMPRESS : DirCacheVersion.DIRC_VERSION_EXTENDED); skipHash = cfg.getBoolean(ConfigConstants.CONFIG_INDEX_SECTION, diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java index e15c7af932..7921052aaa 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java @@ -187,8 +187,7 @@ public class BranchConfig { * @since 4.5 */ public BranchRebaseMode getRebaseMode() { - return config.getEnum(BranchRebaseMode.values(), - ConfigConstants.CONFIG_BRANCH_SECTION, branchName, + return config.getEnum(ConfigConstants.CONFIG_BRANCH_SECTION, branchName, ConfigConstants.CONFIG_KEY_REBASE, BranchRebaseMode.NONE); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java index 76ed36a6e5..23d16db39f 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/GpgConfig.java @@ -74,8 +74,7 @@ public class GpgConfig { * the config to read from */ public GpgConfig(Config config) { - keyFormat = config.getEnum(GpgFormat.values(), - ConfigConstants.CONFIG_GPG_SECTION, null, + keyFormat = config.getEnum(ConfigConstants.CONFIG_GPG_SECTION, null, ConfigConstants.CONFIG_KEY_FORMAT, GpgFormat.OPENPGP); signingKey = config.getString(ConfigConstants.CONFIG_USER_SECTION, null, ConfigConstants.CONFIG_KEY_SIGNINGKEY); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java b/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java index becc8082ba..105cba7d28 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/submodule/SubmoduleWalk.java @@ -787,14 +787,14 @@ public class SubmoduleWalk implements AutoCloseable { IgnoreSubmoduleMode mode = repoConfig.getEnum( IgnoreSubmoduleMode.values(), ConfigConstants.CONFIG_SUBMODULE_SECTION, getModuleName(), - ConfigConstants.CONFIG_KEY_IGNORE, null); + ConfigConstants.CONFIG_KEY_IGNORE); if (mode != null) { return mode; } lazyLoadModulesConfig(); - return modulesConfig.getEnum(IgnoreSubmoduleMode.values(), - ConfigConstants.CONFIG_SUBMODULE_SECTION, getModuleName(), - ConfigConstants.CONFIG_KEY_IGNORE, IgnoreSubmoduleMode.NONE); + return modulesConfig.getEnum(ConfigConstants.CONFIG_SUBMODULE_SECTION, + getModuleName(), ConfigConstants.CONFIG_KEY_IGNORE, + IgnoreSubmoduleMode.NONE); } /** diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpConfig.java index 73eddb8e21..f10b7bf452 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/HttpConfig.java @@ -302,8 +302,7 @@ public class HttpConfig { int postBufferSize = config.getInt(HTTP, POST_BUFFER_KEY, 1 * 1024 * 1024); boolean sslVerifyFlag = config.getBoolean(HTTP, SSL_VERIFY_KEY, true); - HttpRedirectMode followRedirectsMode = config.getEnum( - HttpRedirectMode.values(), HTTP, null, + HttpRedirectMode followRedirectsMode = config.getEnum(HTTP, null, FOLLOW_REDIRECTS_KEY, HttpRedirectMode.INITIAL); int redirectLimit = config.getInt(HTTP, MAX_REDIRECTS_KEY, MAX_REDIRECTS); @@ -335,8 +334,8 @@ public class HttpConfig { postBufferSize); sslVerifyFlag = config.getBoolean(HTTP, match, SSL_VERIFY_KEY, sslVerifyFlag); - followRedirectsMode = config.getEnum(HttpRedirectMode.values(), - HTTP, match, FOLLOW_REDIRECTS_KEY, followRedirectsMode); + followRedirectsMode = config.getEnum(HTTP, match, + FOLLOW_REDIRECTS_KEY, followRedirectsMode); int newMaxRedirects = config.getInt(HTTP, match, MAX_REDIRECTS_KEY, redirectLimit); if (newMaxRedirects >= 0) { -- cgit v1.2.3 From 98b50a726bb66749353912b0b6ccf177fce2c3f8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 14 Feb 2025 02:11:37 +0100 Subject: CgitMidxCompatibilityTest: remove unnecessary cast Change-Id: I4ad43dfae8a0e9ac4db0e6f1dc88ac139d4fb853 --- .../eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java index bbff7d433f..88f0806c62 100644 --- a/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java +++ b/org.eclipse.jgit.test/exttst/org/eclipse/jgit/internal/storage/midx/CgitMidxCompatibilityTest.java @@ -28,7 +28,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.jgit.internal.storage.file.ObjectDirectory; import org.eclipse.jgit.internal.storage.file.Pack; import org.eclipse.jgit.internal.storage.file.PackFile; import org.eclipse.jgit.internal.storage.file.PackIndex; @@ -123,8 +122,7 @@ public class CgitMidxCompatibilityTest extends SampleDataRepositoryTestCase { } private File getMIdxStandardLocation() { - return new File( - ((ObjectDirectory) db.getObjectDatabase()).getPackDirectory(), + return new File(db.getObjectDatabase().getPackDirectory(), "multi-pack-index"); } -- cgit v1.2.3 From e295f7bd9eeccfd039393d58574461fc9d924e8a Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 12 Feb 2025 16:25:05 -0800 Subject: blame.cache: Define interface and POJO to cache blame results The blame generator goes into the history of a file until it blames all lines. If the caller keeps a cache of the results, the generator could use it to shorten that walk, using the blame information of an older revision of the file to build the new blame view. Define an interface and POJO for the blame cache. Change-Id: Ib6b033ef46089bbc5a5b32e8e060d4ab0f74b871 --- .../org/eclipse/jgit/blame/cache/BlameCache.java | 46 ++++++++ .../org/eclipse/jgit/blame/cache/CacheRegion.java | 121 +++++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/BlameCache.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/BlameCache.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/BlameCache.java new file mode 100644 index 0000000000..d44fb5f62b --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/BlameCache.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2025, Google LLC. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.blame.cache; + +import java.io.IOException; +import java.util.List; + +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; + +/** + * Keeps the blame information for a path at certain commit. + *

+ * If there is a result, it covers the whole file at that revision + * + * @since 7.2 + */ +public interface BlameCache { + /** + * Gets the blame of a path at a given commit if available. + *

+ * Since this cache is used in blame calculation, this get() method should + * only retrieve the cache value, and not re-trigger blame calculation. In + * other words, this acts as "getIfPresent", and not "computeIfAbsent". + * + * @param repo + * repository containing the commit + * @param commitId + * we are looking at the file in this revision + * @param path + * path a file in the repo + * + * @return the blame of a path at a given commit or null if not in cache + * @throws IOException + * error retrieving/parsing values from storage + */ + List get(Repository repo, ObjectId commitId, String path) + throws IOException; +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java new file mode 100644 index 0000000000..6aa4eef2ca --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java @@ -0,0 +1,121 @@ +/* + * Copyright (C) 2025, Google LLC. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.blame.cache; + +import org.eclipse.jgit.lib.ObjectId; + +/** + * Region of the blame of a file. + *

+ * Usually all parameters are non-null, except when the Region was created + * to fill an unblamed gap (to cover for bugs in the calculation). In that + * case, path, commit and author will be null. + * + * @since 7.2 + **/ +public class CacheRegion implements Comparable { + private final String sourcePath; + + private final ObjectId sourceCommit; + + private final int end; + + private final int start; + + /** + * A blamed portion of a file + * + * @param path + * location of the file + * @param commit + * commit that is modifying this region + * @param start + * first line of this region (inclusive) + * @param end + * last line of this region (non-inclusive!) + */ + public CacheRegion(String path, ObjectId commit, + int start, int end) { + allOrNoneNull(path, commit); + this.sourcePath = path; + this.sourceCommit = commit; + this.start = start; + this.end = end; + } + + /** + * First line of this region. Starting by 0, inclusive + * + * @return first line of this region. + */ + public int getStart() { + return start; + } + + /** + * One after last line in this region (or: last line non-inclusive) + * + * @return one after last line in this region. + */ + public int getEnd() { + return end; + } + + + /** + * Path of the file this region belongs to + * + * @return path in the repo/commit + */ + public String getSourcePath() { + return sourcePath; + } + + /** + * Commit this region belongs to + * + * @return commit for this region + */ + public ObjectId getSourceCommit() { + return sourceCommit; + } + + @Override + public int compareTo(CacheRegion o) { + return start - o.start; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + if (sourceCommit != null) { + sb.append(sourceCommit.name(), 0, 7).append(' ') + .append(" (") + .append(sourcePath).append(')'); + } else { + sb.append(""); + } + sb.append(' ').append("start=").append(start).append(", count=") + .append(end - start); + return sb.toString(); + } + + private static void allOrNoneNull(String path, ObjectId commit) { + if (path != null && commit != null) { + return; + } + + if (path == null && commit == null) { + return; + } + throw new IllegalArgumentException(String.format( + "expected all null or none: %s, %s", path, commit)); + } +} -- cgit v1.2.3 From 24d08f221f5dc30ddd8a5e35eb6df960c6829739 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 19 Feb 2025 15:20:18 +0100 Subject: JGit v7.2.0.202502191417-m3 Signed-off-by: Matthias Sohn Change-Id: Icf59680527f6f008c971b7e9e2a539da4a2d3428 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0069b09467..ef2639b057 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c6c81648ae..8d55d585dd 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 3af82e4759..57899c473a 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 89d05be73b..d9baa9c1a7 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 11806f15c6..17b8537081 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index b142a66a8c..173381d2f9 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 3ca6590f02..b22d330878 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 27a2bba5a2..f83d79e611 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index c92fa9f156..094a3017ab 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 9493c07dbc..47666880ca 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.test - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 35294256e1..a288385ae2 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 245ba7e127..a7d7b53c80 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 2120439e51..b411ae0c86 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 532e749cb2..74f3d307ce 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f94e2b27b1..a892490fc6 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 7d23d53614..14d3af5a02 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 679252de34..b333c72b87 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index c390d8f5ee..479cc6d00b 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 39dc2ef42a..7d884bd2aa 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.2.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index e7940bd358..ebf2d0b4d4 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 3f79f8b82d..b08292cf55 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 3550501dba..20f15a6964 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 2f25191fee..85e0fe24e0 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 4ba595901b..0813e86784 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 5abd7d6d51..44eb5e7f6a 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ea38ae31ba..c547de5e39 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index bcd9fbfc81..8bcd9167aa 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index b8f22cea5d..7483be6d25 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index f937748212..cc1930e787 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 6488a887fb..701e26677b 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 9d494cb2e0..348f63fc83 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9f43ced73b..c30bfa6c5c 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 77749c8d89..c1ff8516b6 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 98e63b0f1e..428034d206 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 1973b26477..c9bde1013c 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 73f5cab59d..459f22cf3d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 0dd0786050..0e62b6f9e1 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index f27377447c..951871d457 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index eff7e0b7eb..7bc3ee337f 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index fb211cc89c..1445f31295 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.2.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 4ca03a3f72..b2173da1e3 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 329740085e..2d80fd0bd8 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 43980f06ae..c8b562ad19 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 59345e75f9..d4c1180600 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index ae91bd5405..98cb72d504 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index aa88700423..14e0315795 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 57d7d8dd69..c511c74bcc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 2038cfd58c..8d1232225f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index d9a9db307d..88ad0ba2db 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index d98990c532..d4c9c91d70 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8f0c532a4a..adb8ba774e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 7e1b0c8226..ced8a2f972 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 78867c96c0..7f8139cc98 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 02435b6c08..baa1ccd841 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index d3773f54f3..a5ea32eb9b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index b8f402e4f0..048512c54c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 4eee8255cc..ce525d8015 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 811beafca6..6ec8a29e60 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 025844c6b0..bb6cb93fa1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index a0cd57bcbb..2fb965eb1b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 81c9651fd9..be1b7fad0f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 5bc67b458e..5c9afeadd6 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 60a60bb51d..fd46f1b478 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 9195a369e7..596fa6855d 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index fbcab95354..4925dc7246 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 0101464c82..3e1d22dbb2 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 81efa44cc6..b35c961f34 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 6eeb24d6b4..91670a35b6 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 30437f25ee..62163ce039 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index feec706a25..692dec5289 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 32c12a194c..eeec50ca2e 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2df07f7ea1..265126434f 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 822ef55fa2..158c3ad16a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index c19e0aa253..328f9fed91 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index a002290378..008e68a25a 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 9cf812ce3b..404a9d82d3 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e84ac4d574..544052dbf4 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index ed6115b046..33e4941c91 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 4e8da25752..3d2f7dc156 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index fdc5ffb8b3..119cc49974 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index af5fd1c53a..5e5c5abe04 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index c936b09fd7..b1134a2b79 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 423d22b748..115c8ae1bf 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.2.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 12363f802e..78833c5e4a 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index ada06ed656..51d6d415e2 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index f5cc16cfe2..d5fc98e125 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502191417-m3 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 0f9ec1fb22..0684692506 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502191417-m3 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202502191417-m3";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index df7ae83647..68972beef7 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index e6ea7488f0..863aed0f7c 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0-SNAPSHOT + 7.2.0.202502191417-m3 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 00528ac80e36d4d9539d35de19745128b5b57cf1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 19 Feb 2025 18:54:28 +0100 Subject: Prepare 7.2.0-SNAPSHOT builds Change-Id: Ib33f0dc4138ecec79b5a15e5ac059e09be2a8334 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index ef2639b057..0069b09467 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 8d55d585dd..c6c81648ae 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 57899c473a..3af82e4759 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index d9baa9c1a7..89d05be73b 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 17b8537081..11806f15c6 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 173381d2f9..b142a66a8c 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index b22d330878..3ca6590f02 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index f83d79e611..27a2bba5a2 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 094a3017ab..c92fa9f156 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 47666880ca..9493c07dbc 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index a288385ae2..35294256e1 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index a7d7b53c80..245ba7e127 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index b411ae0c86..2120439e51 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 74f3d307ce..532e749cb2 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index a892490fc6..f94e2b27b1 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 14d3af5a02..7d23d53614 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index b333c72b87..679252de34 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 479cc6d00b..c390d8f5ee 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 7d884bd2aa..39dc2ef42a 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.2.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index ebf2d0b4d4..e7940bd358 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index b08292cf55..3f79f8b82d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 20f15a6964..3550501dba 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 85e0fe24e0..2f25191fee 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 0813e86784..4ba595901b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 44eb5e7f6a..5abd7d6d51 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index c547de5e39..ea38ae31ba 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 8bcd9167aa..bcd9fbfc81 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 7483be6d25..b8f22cea5d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index cc1930e787..f937748212 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 701e26677b..6488a887fb 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 348f63fc83..9d494cb2e0 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c30bfa6c5c..9f43ced73b 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index c1ff8516b6..77749c8d89 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 428034d206..98e63b0f1e 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index c9bde1013c..1973b26477 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 459f22cf3d..73f5cab59d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 0e62b6f9e1..0dd0786050 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 951871d457..f27377447c 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 7bc3ee337f..eff7e0b7eb 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 1445f31295..fb211cc89c 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.2.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index b2173da1e3..4ca03a3f72 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 2d80fd0bd8..329740085e 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index c8b562ad19..43980f06ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index d4c1180600..59345e75f9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 98cb72d504..ae91bd5405 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 14e0315795..aa88700423 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index c511c74bcc..57d7d8dd69 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 8d1232225f..2038cfd58c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 88ad0ba2db..d9a9db307d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index d4c9c91d70..d98990c532 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index adb8ba774e..8f0c532a4a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index ced8a2f972..7e1b0c8226 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 7f8139cc98..78867c96c0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index baa1ccd841..02435b6c08 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index a5ea32eb9b..d3773f54f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 048512c54c..b8f402e4f0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index ce525d8015..4eee8255cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 6ec8a29e60..811beafca6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index bb6cb93fa1..025844c6b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 2fb965eb1b..a0cd57bcbb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index be1b7fad0f..81c9651fd9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 5c9afeadd6..5bc67b458e 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index fd46f1b478..60a60bb51d 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 596fa6855d..9195a369e7 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 4925dc7246..fbcab95354 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 3e1d22dbb2..0101464c82 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index b35c961f34..81efa44cc6 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 91670a35b6..6eeb24d6b4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 62163ce039..30437f25ee 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 692dec5289..feec706a25 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index eeec50ca2e..32c12a194c 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 265126434f..2df07f7ea1 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 158c3ad16a..822ef55fa2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 328f9fed91..c19e0aa253 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 008e68a25a..a002290378 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 404a9d82d3..9cf812ce3b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 544052dbf4..e84ac4d574 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 33e4941c91..ed6115b046 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 3d2f7dc156..4e8da25752 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 119cc49974..fdc5ffb8b3 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 5e5c5abe04..af5fd1c53a 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index b1134a2b79..c936b09fd7 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 115c8ae1bf..423d22b748 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.2.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 78833c5e4a..12363f802e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 51d6d415e2..ada06ed656 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d5fc98e125..f5cc16cfe2 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.202502191417-m3 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 0684692506..0f9ec1fb22 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502191417-m3 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202502191417-m3";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 68972beef7..df7ae83647 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 863aed0f7c..e6ea7488f0 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0.202502191417-m3 + 7.2.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 871c5e17781cdba1991051fbf015e43a29d1b31f Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 6 Feb 2025 14:07:47 -0800 Subject: BlameGenerator: cache and reuse blame results Blame goes into the history of a file until it blames all lines. If we have a blamed version of the file in cache, we can use it to resolve the lines not blamed yet and cut the calculation earlier. When processing a candidate, check if it is in the cache and if so fill the blame from the pending regions using the information of the cached (and fully blamed) copy. The generator doesn't populate the cache itself. Callers must take the final results and put them in the cache. Change-Id: Ia99b09d6d825e96940ca4200967958923bf647c7 --- .../jgit/blame/BlameGeneratorCacheTest.java | 398 +++++++++++++++++++++ .../eclipse/jgit/blame/BlameRegionMergerTest.java | 320 +++++++++++++++++ .../src/org/eclipse/jgit/blame/BlameGenerator.java | 121 ++++++- .../org/eclipse/jgit/blame/BlameRegionMerger.java | 158 ++++++++ .../src/org/eclipse/jgit/blame/BlameResult.java | 1 + 5 files changed, 993 insertions(+), 5 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameGeneratorCacheTest.java create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java create mode 100644 org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameGeneratorCacheTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameGeneratorCacheTest.java new file mode 100644 index 0000000000..65cac11982 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameGeneratorCacheTest.java @@ -0,0 +1,398 @@ +/* + * Copyright (C) 2025, Google LLC. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.blame; + +import static java.lang.String.join; +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.eclipse.jgit.blame.cache.BlameCache; +import org.eclipse.jgit.blame.cache.CacheRegion; +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Test; + +public class BlameGeneratorCacheTest extends RepositoryTestCase { + private static final String FILE = "file.txt"; + + /** + * Simple history: + * + * 

+	 *          C1    C2    C3    C4   C4 blame
+	 * lines ----------------------------------
+	 * L1    |  C1    C1    C1    C1     C1
+	 * L2    |  C1    C1   *C3   *C4     C4
+	 * L3    |  C1    C1   *C3    C3     C3
+	 * L4    |       *C2    C2   *C4     C4
+	 *
+ * + * @throws Exception any error + */ + @Test + public void blame_simple_correctRegions() throws Exception { + RevCommit c1, c2, c3, c4; + try (TestRepository r = new TestRepository<>(db)) { + c1 = commit(r, lines("L1C1", "L2C1", "L3C1")); + c2 = commit(r, lines("L1C1", "L2C1", "L3C1", "L4C2"), c1); + c3 = commit(r, lines("L1C1", "L2C3", "L3C3", "L4C2"), c2); + c4 = commit(r, lines("L1C1", "L2C4", "L3C3", "L4C4"), c3); + } + + List expectedRegions = Arrays.asList( + new EmittedRegion(c1, 0, 1), + new EmittedRegion(c4, 1, 2), + new EmittedRegion(c3, 2, 3), + new EmittedRegion(c4, 3, 4)); + + assertRegions(c4, null, expectedRegions, 4); + assertRegions(c4, emptyCache(), expectedRegions, 4); + assertRegions(c4, blameAndCache(c4), expectedRegions, 4); + assertRegions(c4, blameAndCache(c3), expectedRegions, 4); + assertRegions(c4, blameAndCache(c2), expectedRegions, 4); + assertRegions(c4, blameAndCache(c1), expectedRegions, 4); + } + + @Test + public void blame_simple_cacheUsage() throws Exception { + RevCommit c1, c2, c3, c4; + try (TestRepository r = new TestRepository<>(db)) { + c1 = commit(r, lines("L1C1", "L2C1", "L3C1")); + c2 = commit(r, lines("L1C1", "L2C1", "L3C1", "L4C2"), c1); + c3 = commit(r, lines("L1C1", "L2C3", "L3C3", "L4C2"), c2); + c4 = commit(r, lines("L1C1", "L2C4", "L3C3", "L4C4"), c3); + } + + assertCacheUsage(c4, null, false, 4); + assertCacheUsage(c4, emptyCache(), false, 4); + assertCacheUsage(c4, blameAndCache(c4), true, 1); + assertCacheUsage(c4, blameAndCache(c3), true, 2); + assertCacheUsage(c4, blameAndCache(c2), true, 3); + assertCacheUsage(c4, blameAndCache(c1), true, 4); + } + + /** + * Overwrite: + * + * 
+	 *          C1    C2    C3    C3 blame
+	 * lines ----------------------------------
+	 * L1    |  C1    C1   *C3      C3
+	 * L2    |  C1    C1   *C3      C3
+	 * L3    |  C1    C1   *C3      C3
+	 * L4    |       *C2
+	 *
+ * + * @throws Exception any error + */ + @Test + public void blame_ovewrite_correctRegions() throws Exception { + RevCommit c1, c2, c3; + try (TestRepository r = new TestRepository<>(db)) { + c1 = commit(r, lines("L1C1", "L2C1", "L3C1")); + c2 = commit(r, lines("L1C1", "L2C1", "L3C1", "L4C2"), c1); + c3 = commit(r, lines("L1C3", "L2C3", "L3C3"), c2); + } + + List expectedRegions = Arrays.asList( + new EmittedRegion(c3, 0, 3)); + + assertRegions(c3, null, expectedRegions, 3); + assertRegions(c3, emptyCache(), expectedRegions, 3); + assertRegions(c3, blameAndCache(c3), expectedRegions, 3); + assertRegions(c3, blameAndCache(c2), expectedRegions, 3); + assertRegions(c3, blameAndCache(c1), expectedRegions, 3); + } + + @Test + public void blame_overwrite_cacheUsage() throws Exception { + RevCommit c1, c2, c3; + try (TestRepository r = new TestRepository<>(db)) { + c1 = commit(r, lines("L1C1", "L2C1", "L3C1")); + c2 = commit(r, lines("L1C1", "L2C1", "L3C1", "L4C2"), c1); + c3 = commit(r, lines("L1C3", "L2C3", "L3C3"), c2); + } + + assertCacheUsage(c3, null, false, 1); + assertCacheUsage(c3, emptyCache(), false, 1); + assertCacheUsage(c3, blameAndCache(c3), true, 1); + assertCacheUsage(c3, blameAndCache(c2), false, 1); + assertCacheUsage(c3, blameAndCache(c1), false, 1); + } + + /** + * Merge: + * + * 
+	 *                 root
+	 *                 ----
+	 *                 L1  -
+	 *                 L2  -
+	 *                 L3  -
+	 *               /     \
+	 *           sideA     sideB
+	 *           -----     -----
+	 *           *L1 a      L1 -
+	 *           *L2 a      L2 -
+	 *           *L3 a      L3 -
+	 *           *L4 a     *L4 b
+	 *            L5 -     *L5 b
+	 *            L6 -     *L6 b
+	 *            L7 -     *L7 b
+	 *              \       /
+	 *                merge
+	 *                -----
+	 *              L1-L4 a (from sideA)
+	 *              L5-L7 - (common, from root)
+	 *              L8-L11 b (from sideB)
+	 *
+ * + * @throws Exception any error + */ + @Test + public void blame_merge_correctRegions() throws Exception { + RevCommit root, sideA, sideB, mergedTip; + try (TestRepository r = new TestRepository<>(db)) { + root = commitAsLines(r, "---"); + sideA = commitAsLines(r, "aaaa---", root); + sideB = commitAsLines(r, "---bbbb", root); + mergedTip = commitAsLines(r, "aaaa---bbbb", sideA, sideB); + } + + List expectedRegions = Arrays.asList( + new EmittedRegion(sideA, 0, 4), + new EmittedRegion(root, 4, 7), + new EmittedRegion(sideB, 7, 11)); + + assertRegions(mergedTip, null, expectedRegions, 11); + assertRegions(mergedTip, emptyCache(), expectedRegions, 11); + assertRegions(mergedTip, blameAndCache(root), expectedRegions, 11); + assertRegions(mergedTip, blameAndCache(sideA), expectedRegions, 11); + assertRegions(mergedTip, blameAndCache(sideB), expectedRegions, 11); + assertRegions(mergedTip, blameAndCache(mergedTip), expectedRegions, 11); + } + + @Test + public void blame_merge_cacheUsage() throws Exception { + RevCommit root, sideA, sideB, mergedTip; + try (TestRepository r = new TestRepository<>(db)) { + root = commitAsLines(r, "---"); + sideA = commitAsLines(r, "aaaa---", root); + sideB = commitAsLines(r, "---bbbb", root); + mergedTip = commitAsLines(r, "aaaa---bbbb", sideA, sideB); + } + + assertCacheUsage(mergedTip, null, /* cacheUsed */ false, + /* candidates */ 4); + assertCacheUsage(mergedTip, emptyCache(), false, 4); + assertCacheUsage(mergedTip, blameAndCache(mergedTip), true, 1); + + // While splitting unblamed regions to parents, sideA comes first + // and gets "aaaa----". Processing is by commit time, so sideB is + // explored first + assertCacheUsage(mergedTip, blameAndCache(sideA), true, 3); + assertCacheUsage(mergedTip, blameAndCache(sideB), true, 4); + assertCacheUsage(mergedTip, blameAndCache(root), true, 4); + } + + /** + * Moving block (insertion) + * + * 
+	 *          C1    C2    C3    C3 blame
+	 * lines ----------------------------------
+	 * L1    |  C1    C1    C1      C1
+	 * L2    |  C1   *C2    C2      C2
+	 * L3    |        C1   *C3      C3
+	 * L4    |              C1      C1
+	 *
+ * + * @throws Exception any error + */ + @Test + public void blame_movingBlock_correctRegions() throws Exception { + RevCommit c1, c2, c3; + try (TestRepository r = new TestRepository<>(db)) { + c1 = commit(r, lines("L1C1", "L2C1")); + c2 = commit(r, lines("L1C1", "middle", "L2C1"), c1); + c3 = commit(r, lines("L1C1", "middle", "extra", "L2C1"), c2); + } + + List expectedRegions = Arrays.asList( + new EmittedRegion(c1, 0, 1), + new EmittedRegion(c2, 1, 2), + new EmittedRegion(c3, 2, 3), + new EmittedRegion(c1, 3, 4)); + + assertRegions(c3, null, expectedRegions, 4); + assertRegions(c3, emptyCache(), expectedRegions, 4); + assertRegions(c3, blameAndCache(c3), expectedRegions, 4); + assertRegions(c3, blameAndCache(c2), expectedRegions, 4); + assertRegions(c3, blameAndCache(c1), expectedRegions, 4); + } + + @Test + public void blame_movingBlock_cacheUsage() throws Exception { + RevCommit c1, c2, c3; + try (TestRepository r = new TestRepository<>(db)) { + c1 = commitAsLines(r, "root---"); + c2 = commitAsLines(r, "rootXXX---", c1); + c3 = commitAsLines(r, "rootYYYXXX---", c2); + } + + assertCacheUsage(c3, null, false, 3); + assertCacheUsage(c3, emptyCache(), false, 3); + assertCacheUsage(c3, blameAndCache(c3), true, 1); + assertCacheUsage(c3, blameAndCache(c2), true, 2); + assertCacheUsage(c3, blameAndCache(c1), true, 3); + } + + private void assertRegions(RevCommit commit, InMemoryBlameCache cache, + List expectedRegions, int resultLineCount) + throws IOException { + try (BlameGenerator gen = new BlameGenerator(db, FILE, cache)) { + gen.push(null, db.parseCommit(commit)); + List regions = consume(gen); + assertRegionsEquals(expectedRegions, regions); + assertAllLinesCovered(/* lines= */ resultLineCount, regions); + } + } + + private void assertCacheUsage(RevCommit commit, InMemoryBlameCache cache, + boolean useCache, int candidatesVisited) throws IOException { + try (BlameGenerator gen = new BlameGenerator(db, FILE, cache)) { + gen.push(null, db.parseCommit(commit)); + consume(gen); + assertEquals(useCache, gen.getStats().isCacheHit()); + assertEquals(candidatesVisited, + gen.getStats().getCandidatesVisited()); + } + } + + private static void assertAllLinesCovered(int lines, + List regions) { + Collections.sort(regions); + assertEquals("Starts in first line", 0, regions.get(0).resultStart()); + for (int i = 1; i < regions.size(); i++) { + assertEquals("No gaps", regions.get(i).resultStart(), + regions.get(i - 1).resultEnd()); + } + assertEquals("Ends in last line", lines, + regions.get(regions.size() - 1).resultEnd()); + } + + private static void assertRegionsEquals( + List expected, List actual) { + assertEquals(expected.size(), actual.size()); + Collections.sort(actual); + for (int i = 0; i < expected.size(); i++) { + assertEquals(String.format("List differ in element %d", i), + expected.get(i), actual.get(i)); + } + } + + private static InMemoryBlameCache emptyCache() { + return new InMemoryBlameCache(""); + } + + private List consume(BlameGenerator generator) + throws IOException { + List result = new ArrayList<>(); + while (generator.next()) { + EmittedRegion genRegion = new EmittedRegion( + generator.getSourceCommit().toObjectId(), + generator.getResultStart(), generator.getResultEnd()); + result.add(genRegion); + } + return result; + } + + private InMemoryBlameCache blameAndCache(RevCommit commit) + throws IOException { + List regions; + try (BlameGenerator generator = new BlameGenerator(db, FILE)) { + generator.push(null, commit); + regions = consume(generator).stream() + .map(EmittedRegion::asCacheRegion) + .collect(Collectors.toUnmodifiableList()); + } + InMemoryBlameCache cache = new InMemoryBlameCache(""); + cache.put(commit, FILE, regions); + return cache; + } + + private static RevCommit commitAsLines(TestRepository r, + String charPerLine, RevCommit... parents) throws Exception { + return commit(r, charPerLine.replaceAll("\\S", "$0\n"), parents); + } + + private static RevCommit commit(TestRepository r, String contents, + RevCommit... parents) throws Exception { + return r.commit(r.tree(r.file(FILE, r.blob(contents))), parents); + } + + private static String lines(String... l) { + return join("\n", l); + } + + private record EmittedRegion(ObjectId oid, int resultStart, int resultEnd) + implements Comparable { + @Override + public int compareTo(EmittedRegion o) { + return resultStart - o.resultStart; + } + + CacheRegion asCacheRegion() { + return new CacheRegion(FILE, oid, resultStart, resultEnd); + } + } + + private static class InMemoryBlameCache implements BlameCache { + + private final Map> cache = new HashMap<>(); + + private final String description; + + public InMemoryBlameCache(String description) { + this.description = description; + } + + @Override + public List get(Repository repo, ObjectId commitId, + String path) throws IOException { + return cache.get(new Key(commitId.name(), path)); + } + + public void put(ObjectId commitId, String path, + List cachedRegions) { + cache.put(new Key(commitId.name(), path), cachedRegions); + } + + @Override + public String toString() { + return "InMemoryCache: " + description; + } + + record Key(String commitId, String path) { + } + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java new file mode 100644 index 0000000000..cf0dc452e7 --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java @@ -0,0 +1,320 @@ +/* + * Copyright (C) 2025, Google LLC. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.blame; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +import org.eclipse.jgit.blame.cache.CacheRegion; +import org.eclipse.jgit.junit.RepositoryTestCase; +import org.eclipse.jgit.lib.AnyObjectId; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.revwalk.RevCommit; +import org.junit.Test; + +public class BlameRegionMergerTest extends RepositoryTestCase { + + private static final ObjectId O1 = ObjectId + .fromString("ff6dd8db6edc9aa0ac58fea1d14a55be46c3eb14"); + + private static final ObjectId O2 = ObjectId + .fromString("c3c7f680c6bee238617f25f6aa85d0b565fc8ecb"); + + private static final ObjectId O3 = ObjectId + .fromString("29e014aad0399fe8ede7c101d01b6e440ac9966b"); + + List fakeCommits = List.of(new FakeRevCommit(O1), + new FakeRevCommit(O2), new FakeRevCommit(O3)); + + // In reverse order, so the code doesn't assume a sorted list + List cachedRegions = List.of( + new CacheRegion("README", O3, 20, 30), + new CacheRegion("README", O2, 10, 20), + new CacheRegion("README", O1, 0, 10)); + + BlameRegionMerger blamer = new BlameRegionMergerFakeCommits(fakeCommits, + cachedRegions); + + @Test + public void intersectRegions_allInside() { + Region unblamed = new Region(15, 18, 10); + CacheRegion blamed = new CacheRegion("README", O1, 10, 90); + + Region result = BlameRegionMerger.intersectRegions(unblamed, blamed); + // Same lines in result and source + assertEquals(15, result.resultStart); + assertEquals(18, result.sourceStart); + assertEquals(10, result.length); + assertNull(result.next); + } + + @Test + public void intersectRegions_startsBefore() { + // Intesecting [4, 14) with [10, 90) + Region unblamed = new Region(30, 4, 10); + CacheRegion blamed = new CacheRegion("README", O1, 10, 90); + + Region result = BlameRegionMerger.intersectRegions(unblamed, blamed); + + // The unblamed region starting at 4 (sourceStart), starts at 30 in the + // original file (resultStart). e.g. some commit introduced + // lines. If we take the second portion of the region, we need to move + // the result start accordingly. + assertEquals(36, result.resultStart); + assertEquals(10, result.sourceStart); + assertEquals(4, result.length); + assertNull(result.next); + } + + @Test + public void intersectRegions_endsAfter() { + // Intesecting [85, 95) with [10, 90) + Region unblamed = new Region(30, 85, 10); + CacheRegion blamed = new CacheRegion("README", O1, 10, 90); + + Region result = BlameRegionMerger.intersectRegions(unblamed, blamed); + + assertEquals(30, result.resultStart); + assertEquals(85, result.sourceStart); + assertEquals(5, result.length); + assertNull(result.next); + } + + @Test + public void intersectRegions_spillOverBothSides() { + // Intesecting [5, 100) with [10, 90) + Region unblamed = new Region(30, 5, 95); + CacheRegion blamed = new CacheRegion("README", O1, 10, 90); + + Region result = BlameRegionMerger.intersectRegions(unblamed, blamed); + + assertEquals(35, result.resultStart); + assertEquals(10, result.sourceStart); + assertEquals(80, result.length); + assertNull(result.next); + } + + @Test + public void intersectRegions_exactMatch() { + // Intesecting [5, 100) with [10, 90) + Region unblamed = new Region(30, 10, 80); + CacheRegion blamed = new CacheRegion("README", O1, 10, 90); + + Region result = BlameRegionMerger.intersectRegions(unblamed, blamed); + + assertEquals(30, result.resultStart); + assertEquals(10, result.sourceStart); + assertEquals(80, result.length); + assertNull(result.next); + } + + @Test + public void findOverlaps_allInside() { + Region unblamed = new Region(0, 11, 4); + List overlaps = blamer.findOverlaps(unblamed); + assertEquals(1, overlaps.size()); + assertEquals(10, overlaps.get(0).getStart()); + assertEquals(20, overlaps.get(0).getEnd()); + } + + @Test + public void findOverlaps_overTwoRegions() { + Region unblamed = new Region(0, 8, 4); + List overlaps = blamer.findOverlaps(unblamed); + assertEquals(2, overlaps.size()); + assertEquals(0, overlaps.get(0).getStart()); + assertEquals(10, overlaps.get(0).getEnd()); + assertEquals(10, overlaps.get(1).getStart()); + assertEquals(20, overlaps.get(1).getEnd()); + } + + @Test + public void findOverlaps_overThreeRegions() { + Region unblamed = new Region(0, 8, 15); + List overlaps = blamer.findOverlaps(unblamed); + assertEquals(3, overlaps.size()); + assertEquals(0, overlaps.get(0).getStart()); + assertEquals(10, overlaps.get(0).getEnd()); + assertEquals(10, overlaps.get(1).getStart()); + assertEquals(20, overlaps.get(1).getEnd()); + assertEquals(20, overlaps.get(2).getStart()); + assertEquals(30, overlaps.get(2).getEnd()); + } + + @Test + public void blame_exactOverlap() throws IOException { + Region unblamed = new Region(0, 10, 10); + List blamed = blamer.mergeOneRegion(unblamed); + + assertEquals(1, blamed.size()); + Candidate c = blamed.get(0); + assertEquals(c.sourceCommit.name(), O2.name()); + assertEquals(c.regionList.resultStart, unblamed.resultStart); + assertEquals(c.regionList.sourceStart, unblamed.sourceStart); + assertEquals(10, c.regionList.length); + assertNull(c.regionList.next); + } + + @Test + public void blame_corruptedIndex() { + Region outOfRange = new Region(0, 43, 4); + // This region is out of the blamed area + assertThrows(IllegalStateException.class, + () -> blamer.mergeOneRegion(outOfRange)); + } + + @Test + public void blame_allInsideOneBlamedRegion() throws IOException { + Region unblamed = new Region(0, 5, 3); + // This region if fully blamed to O1 + List blamed = blamer.mergeOneRegion(unblamed); + assertEquals(1, blamed.size()); + Candidate c = blamed.get(0); + assertEquals(c.sourceCommit.name(), O1.name()); + assertEquals(c.regionList.resultStart, unblamed.resultStart); + assertEquals(c.regionList.sourceStart, unblamed.sourceStart); + assertEquals(3, c.regionList.length); + assertNull(c.regionList.next); + } + + @Test + public void blame_overTwoBlamedRegions() throws IOException { + Region unblamed = new Region(0, 8, 5); + // (8, 10) belongs go C1, (10, 13) to C2 + List blamed = blamer.mergeOneRegion(unblamed); + assertEquals(2, blamed.size()); + Candidate c = blamed.get(0); + assertEquals(c.sourceCommit.name(), O1.name()); + assertEquals(unblamed.resultStart, c.regionList.resultStart); + assertEquals(unblamed.sourceStart, c.regionList.sourceStart); + assertEquals(2, c.regionList.length); + assertNull(c.regionList.next); + + c = blamed.get(1); + assertEquals(c.sourceCommit.name(), O2.name()); + assertEquals(2, c.regionList.resultStart); + assertEquals(10, c.regionList.sourceStart); + assertEquals(3, c.regionList.length); + assertNull(c.regionList.next); + } + + @Test + public void blame_all() throws IOException { + Region unblamed = new Region(0, 0, 30); + List blamed = blamer.mergeOneRegion(unblamed); + assertEquals(3, blamed.size()); + Candidate c = blamed.get(0); + assertEquals(c.sourceCommit.name(), O1.name()); + assertEquals(unblamed.resultStart, c.regionList.resultStart); + assertEquals(unblamed.sourceStart, c.regionList.sourceStart); + assertEquals(10, c.regionList.length); + assertNull(c.regionList.next); + + c = blamed.get(1); + assertEquals(c.sourceCommit.name(), O2.name()); + assertEquals(10, c.regionList.resultStart); + assertEquals(10, c.regionList.sourceStart); + assertEquals(10, c.regionList.length); + assertNull(c.regionList.next); + + c = blamed.get(2); + assertEquals(c.sourceCommit.name(), O3.name()); + assertEquals(20, c.regionList.resultStart); + assertEquals(20, c.regionList.sourceStart); + assertEquals(10, c.regionList.length); + assertNull(c.regionList.next); + } + + @Test + public void blame_fromCandidate() { + // We don't use anything from the candidate besides the + // regionList + Candidate c = new Candidate(null, null, null); + c.regionList = new Region(0, 8, 5); + c.regionList.next = new Region(22, 22, 4); + + Candidate blamed = blamer.mergeCandidate(c); + // Three candidates + assertNotNull(blamed); + assertNotNull(blamed.queueNext); + assertNotNull(blamed.queueNext.queueNext); + assertNull(blamed.queueNext.queueNext.queueNext); + + assertEquals(O1.name(), blamed.sourceCommit.name()); + + Candidate second = blamed.queueNext; + assertEquals(O2.name(), second.sourceCommit.name()); + + Candidate third = blamed.queueNext.queueNext; + assertEquals(O3.name(), third.sourceCommit.name()); + } + + @Test + public void blame_fromCandidate_twiceCandidateInOutput() { + Candidate c = new Candidate(null, null, null); + // This produces O1 and O2 + c.regionList = new Region(0, 8, 5); + // This produces O2 and O3 + c.regionList.next = new Region(20, 15, 7); + + Candidate blamed = blamer.mergeCandidate(c); + assertCandidateSingleRegion(O1, 2, blamed); + blamed = blamed.queueNext; + assertCandidateSingleRegion(O2, 3, blamed); + // We do not merge candidates afterwards, so these are + // two different candidates to the same source + blamed = blamed.queueNext; + assertCandidateSingleRegion(O2, 5, blamed); + blamed = blamed.queueNext; + assertCandidateSingleRegion(O3, 2, blamed); + assertNull(blamed.queueNext); + } + + private static void assertCandidateSingleRegion(ObjectId expectedOid, + int expectedLength, Candidate actual) { + assertNotNull("candidate", actual); + assertNotNull("region list not empty", actual.regionList); + assertNull("region list has only one element", actual.regionList.next); + assertEquals(expectedOid, actual.sourceCommit); + assertEquals(expectedLength, actual.regionList.length); + } + + private static final class BlameRegionMergerFakeCommits + extends BlameRegionMerger { + + private final Map cache; + + BlameRegionMergerFakeCommits(List commits, + List blamedRegions) { + super(null, null, blamedRegions); + cache = commits.stream().collect(Collectors + .toMap(RevCommit::toObjectId, Function.identity())); + } + + @Override + protected RevCommit parse(ObjectId oid) { + return cache.get(oid); + } + } + + private static final class FakeRevCommit extends RevCommit { + FakeRevCommit(AnyObjectId id) { + super(id); + } + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java index 77967df2e5..b2296e0123 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java @@ -28,6 +28,8 @@ import org.eclipse.jgit.blame.Candidate.BlobCandidate; import org.eclipse.jgit.blame.Candidate.HeadCandidate; import org.eclipse.jgit.blame.Candidate.ReverseCandidate; import org.eclipse.jgit.blame.ReverseWalk.ReverseCommit; +import org.eclipse.jgit.blame.cache.BlameCache; +import org.eclipse.jgit.blame.cache.CacheRegion; import org.eclipse.jgit.diff.DiffAlgorithm; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffEntry.ChangeType; @@ -129,8 +131,19 @@ public class BlameGenerator implements AutoCloseable { /** Blame is currently assigned to this source. */ private Candidate outCandidate; + private Region outRegion; + private final BlameCache blameCache; + + /** + * Blame in reverse order needs the source lines, but we don't have them in + * the cache. We need to ignore the cache in that case. + */ + private boolean useCache = true; + + private final Stats stats = new Stats(); + /** * Create a blame generator for the repository and path (relative to * repository) @@ -142,6 +155,24 @@ public class BlameGenerator implements AutoCloseable { * repository). */ public BlameGenerator(Repository repository, String path) { + this(repository, path, null); + } + + /** + * Create a blame generator for the repository and path (relative to + * repository) + * + * @param repository + * repository to access revision data from. + * @param path + * initial path of the file to start scanning (relative to the + * repository). + * @param blameCache + * previously calculated blames. This generator will *not* + * populate it, just consume it. + */ + public BlameGenerator(Repository repository, String path, + @Nullable BlameCache blameCache) { this.repository = repository; this.resultPath = PathFilter.create(path); @@ -150,6 +181,7 @@ public class BlameGenerator implements AutoCloseable { initRevPool(false); remaining = -1; + this.blameCache = blameCache; } private void initRevPool(boolean reverse) { @@ -159,10 +191,12 @@ public class BlameGenerator implements AutoCloseable { if (revPool != null) revPool.close(); - if (reverse) + if (reverse) { + useCache = false; revPool = new ReverseWalk(getRepository()); - else + } else { revPool = new RevWalk(getRepository()); + } SEEN = revPool.newFlag("SEEN"); //$NON-NLS-1$ reader = revPool.getObjectReader(); @@ -244,6 +278,27 @@ public class BlameGenerator implements AutoCloseable { return renameDetector; } + /** + * Stats about this generator + * + * @return the stats of this generator + */ + public Stats getStats() { + return stats; + } + + /** + * Enable/disable the use of cache (if present). Enabled by default. + *

+ * If caller need source line numbers, the generator cannot use the cache + * (source lines are not there). Use this method to disable the cache in that case. + * + * @param useCache should this generator use the cache. + */ + public void setUseCache(boolean useCache) { + this.useCache = useCache; + } + /** * Push a candidate blob onto the generator's traversal stack. *

@@ -591,6 +646,20 @@ public class BlameGenerator implements AutoCloseable { Candidate n = pop(); if (n == null) return done(); + stats.candidatesVisited += 1; + if (blameCache != null && useCache) { + List cachedBlame = blameCache.get(repository, + n.sourceCommit, n.sourcePath.getPath()); + if (cachedBlame != null) { + BlameRegionMerger rb = new BlameRegionMerger(repository, revPool, + cachedBlame); + Candidate fullyBlamed = rb.mergeCandidate(n); + if (fullyBlamed != null) { + stats.cacheHit = true; + return result(fullyBlamed); + } + } + } int pCnt = n.getParentCount(); if (pCnt == 1) { @@ -605,7 +674,7 @@ public class BlameGenerator implements AutoCloseable { // Do not generate a tip of a reverse. The region // survives and should not appear to be deleted. - } else /* if (pCnt == 0) */{ + } else /* if (pCnt == 0) */ { // Root commit, with at least one surviving region. // Assign the remaining blame here. return result(n); @@ -846,8 +915,8 @@ public class BlameGenerator implements AutoCloseable { editList = new EditList(0); } else { p.loadText(reader); - editList = diffAlgorithm.diff(textComparator, - p.sourceText, n.sourceText); + editList = diffAlgorithm.diff(textComparator, p.sourceText, + n.sourceText); } if (editList.isEmpty()) { @@ -981,6 +1050,10 @@ public class BlameGenerator implements AutoCloseable { /** * Get first line of the source data that has been blamed for the current * region + *

+ * This value is not reliable when the generator is reusing cached values. + * Cache doesn't keep the source lines, the returned value is based on the + * result and can be off if the region moved in previous commits. * * @return first line of the source data that has been blamed for the * current region. This is line number of where the region was added @@ -994,6 +1067,10 @@ public class BlameGenerator implements AutoCloseable { /** * Get one past the range of the source data that has been blamed for the * current region + *

+ * This value is not reliable when the generator is reusing cached values. + * Cache doesn't keep the source lines, the returned value is based on the + * result and can be off if the region moved in previous commits. * * @return one past the range of the source data that has been blamed for * the current region. This is line number of where the region was @@ -1124,4 +1201,38 @@ public class BlameGenerator implements AutoCloseable { return ent.getChangeType() == ChangeType.RENAME || ent.getChangeType() == ChangeType.COPY; } + + /** + * Stats about the work done by the generator + */ + public static class Stats { + + /** Candidates taken from the queue */ + private int candidatesVisited; + + private boolean cacheHit; + + /** + * Number of candidates taken from the queue + *

+ * The generator could signal it's done without exhausting all + * candidates if there is no more remaining lines or the last visited + * candidate is found in the cache. + * + * @return number of candidates taken from the queue + */ + public int getCandidatesVisited() { + return candidatesVisited; + } + + /** + * The generator found a blamed version in the cache + * + * @return true if we used results from the cache + */ + public boolean isCacheHit() { + return cacheHit; + } + + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java new file mode 100644 index 0000000000..bf7e0ff736 --- /dev/null +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2025, Google LLC. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.blame; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.eclipse.jgit.blame.cache.CacheRegion; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Repository; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.revwalk.RevWalk; +import org.eclipse.jgit.treewalk.filter.PathFilter; + +/** + * Translates an unblamed region into one or more blamed regions, using the + * fully blamed data from cache. + *

+ * Blamed and unblamed regions are not symmetrical: An unblamed region is just a + * range of lines over the file. A blamed region is a Candidate (with the commit + * info) with a region inside (the range blamed). + */ +class BlameRegionMerger { + private final Repository repo; + + private final List cachedRegions; + + private final RevWalk rw; + + BlameRegionMerger(Repository repo, RevWalk rw, + List cachedRegions) { + this.repo = repo; + List sorted = new ArrayList<>(cachedRegions); + Collections.sort(sorted); + this.cachedRegions = sorted; + this.rw = rw; + } + + /** + * Return one or more candidates blaming all the regions of the "unblamed" + * incoming candidate. + * + * @param candidate + * a candidate with a list of unblamed regions + * @return A linked list of Candidates with their blamed regions, null if + * there was any error. + */ + Candidate mergeCandidate(Candidate candidate) { + List newCandidates = new ArrayList<>(); + Region r = candidate.regionList; + while (r != null) { + try { + newCandidates.addAll(mergeOneRegion(r)); + } catch (IOException e) { + return null; + } + r = r.next; + } + return asLinkedCandidate(newCandidates); + } + + // Visible for testing + List mergeOneRegion(Region region) throws IOException { + List overlaps = findOverlaps(region); + if (overlaps.isEmpty()) { + throw new IllegalStateException( + "Cached blame should cover all lines"); + } + /* + * Cached regions cover the whole file. We find first which ones overlap + * with our unblamed region. Then we take the overlapping portions with + * the corresponding blame. + */ + List candidates = new ArrayList<>(); + for (CacheRegion overlap : overlaps) { + Region blamedRegions = intersectRegions(region, overlap); + Candidate c = new Candidate(repo, parse(overlap.getSourceCommit()), + PathFilter.create(overlap.getSourcePath())); + c.regionList = blamedRegions; + candidates.add(c); + } + return candidates; + } + + // Visible for testing + List findOverlaps(Region unblamed) { + int unblamedStart = unblamed.sourceStart; + int unblamedEnd = unblamedStart + unblamed.length; + List overlapping = new ArrayList<>(); + for (CacheRegion blamed : cachedRegions) { + // End is not included + if (blamed.getEnd() <= unblamedStart) { + // Blamed region is completely before + continue; + } + + if (blamed.getStart() >= unblamedEnd) { + // Blamed region is completely after + // Blamed regions are sorted by start position, nothing will + // match anymore + break; + } + overlapping.add(blamed); + } + return overlapping; + } + + // Visible for testing + /** + * Calculate the intersection between a Region and a CacheRegion, adjusting + * the start if needed. + *

+ * This should be called only if there is an overlap (filtering the cached + * regions with {@link #findOverlaps(Region)}), otherwise the result is + * meaningless. + * + * @param unblamed + * a region from the blame generator + * @param cached + * a cached region + * @return a new region with the intersection. + */ + static Region intersectRegions(Region unblamed, CacheRegion cached) { + int blamedStart = Math.max(cached.getStart(), unblamed.sourceStart); + int blamedEnd = Math.min(cached.getEnd(), + unblamed.sourceStart + unblamed.length); + int length = blamedEnd - blamedStart; + + // result start and source start should move together + int blameStartDelta = blamedStart - unblamed.sourceStart; + return new Region(unblamed.resultStart + blameStartDelta, blamedStart, + length); + } + + // Tests can override this, so they don't need a real repo, commit and walk + protected RevCommit parse(ObjectId oid) throws IOException { + return rw.parseCommit(oid); + } + + private static Candidate asLinkedCandidate(List c) { + Candidate head = c.get(0); + Candidate tail = head; + for (int i = 1; i < c.size(); i++) { + tail.queueNext = c.get(i); + tail = tail.queueNext; + } + return head; + } +} diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java index 5e2746cc7c..48f6b7e250 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameResult.java @@ -79,6 +79,7 @@ public class BlameResult { BlameResult(BlameGenerator bg, String path, RawText text) { generator = bg; + generator.setUseCache(false); resultPath = path; resultContents = text; -- cgit v1.2.3 From bec51e7d781a8b60a1da2f8db23fd1fbc6041840 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Thu, 23 Jan 2025 16:12:06 -0800 Subject: pgm.MultiPackIndex: CLI command to write/print the multipack index At the moment it supports only the write and print commands, and it is subject to change (e.g. maybe paths are not handled correctly). Example of usage, from the JGit directory: $ bazel run //org.eclipse.jgit.pgm:jgit -- multi-pack-index \ print --midx $(pwd)/.git/objects/pack/multi-pack-index or $ bazel run //org.eclipse.jgit.pgm:jgit -- multi-pack-index \ write --midx ~/example.midx Change-Id: Iac036eece9f119c2a23c9a20279888c0fabbb645 --- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 5 +- .../services/org.eclipse.jgit.pgm.TextBuiltin | 1 + .../eclipse/jgit/pgm/internal/CLIText.properties | 1 + .../src/org/eclipse/jgit/pgm/MultiPackIndex.java | 107 +++++++++++++++++++++ 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index fbcab95354..2ced4db133 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -23,9 +23,10 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", org.eclipse.jgit.gitrepo;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", @@ -33,8 +34,8 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jgit.lfs.server.fs;version="[7.2.0,7.3.0)", org.eclipse.jgit.lfs.server.s3;version="[7.2.0,7.3.0)", org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", org.eclipse.jgit.notes;version="[7.2.0,7.3.0)", org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", diff --git a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin index 41b0091b77..6bf88d9aa8 100644 --- a/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin +++ b/org.eclipse.jgit.pgm/META-INF/services/org.eclipse.jgit.pgm.TextBuiltin @@ -26,6 +26,7 @@ org.eclipse.jgit.pgm.LsTree org.eclipse.jgit.pgm.Merge org.eclipse.jgit.pgm.MergeBase org.eclipse.jgit.pgm.MergeTool +org.eclipse.jgit.pgm.MultiPackIndex org.eclipse.jgit.pgm.PackRefs org.eclipse.jgit.pgm.Push org.eclipse.jgit.pgm.ReceivePack diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index d24b639a31..f8b71c3046 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -300,6 +300,7 @@ usage_MakeCacheTree=Show the current cache tree structure usage_Match=Only consider tags matching the given glob(7) pattern or patterns, excluding the "refs/tags/" prefix. usage_MergeBase=Find as good common ancestors as possible for a merge usage_MergesTwoDevelopmentHistories=Merges two development histories +usage_MultiPackIndex=Operations over the multipack index usage_PackKeptObjects=Include objects in packs locked by a ".keep" file when repacking usage_PackRefs=Pack heads and tags for efficient repository access usage_PreserveOldPacks=Preserve old pack files by moving them into the preserved subdirectory instead of deleting them after repacking diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java new file mode 100644 index 0000000000..1844223cc9 --- /dev/null +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MultiPackIndex.java @@ -0,0 +1,107 @@ +/* + * Copyright (C) 2025, Google LLC. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +package org.eclipse.jgit.pgm; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.jgit.internal.storage.file.ObjectDirectory; +import org.eclipse.jgit.internal.storage.file.Pack; +import org.eclipse.jgit.internal.storage.file.PackFile; +import org.eclipse.jgit.internal.storage.file.PackIndex; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndexPrettyPrinter; +import org.eclipse.jgit.internal.storage.midx.MultiPackIndexWriter; +import org.eclipse.jgit.internal.storage.pack.PackExt; +import org.eclipse.jgit.lib.NullProgressMonitor; +import org.kohsuke.args4j.Argument; +import org.kohsuke.args4j.Option; + +@Command(common = true, usage = "usage_MultiPackIndex") +@SuppressWarnings("nls") +class MultiPackIndex extends TextBuiltin { + @Argument(index = 0, required = true, usage = "write, print") + private String command; + + @Option(name = "--midx") + private String midxPath; + + /** {@inheritDoc} */ + @Override + protected void run() throws IOException { + switch (command) { + case "print": + printMultiPackIndex(); + break; + case "write": + writeMultiPackIndex(); + break; + default: + outw.println("Unknown command " + command); + } + } + + private void printMultiPackIndex() { + if (midxPath == null || midxPath.isEmpty()) { + throw die("'print' requires the path of a multipack " + + "index file with --midx option."); + } + + try (FileInputStream is = new FileInputStream(midxPath)) { + PrintWriter pw = new PrintWriter(outw, true); + MultiPackIndexPrettyPrinter.prettyPrint(is.readAllBytes(), pw); + } catch (FileNotFoundException e) { + throw die(true, e); + } catch (IOException e) { + throw die(true, e); + } + } + + private void writeMultiPackIndex() throws IOException { + if (!(db.getObjectDatabase() instanceof ObjectDirectory)) { + throw die("This repository object db doesn't have packs"); + } + + File midx; + if (midxPath == null || midxPath.isEmpty()) { + midx = new File(((ObjectDirectory) db.getObjectDatabase()) + .getPackDirectory(), "multi-pack-index"); + } else { + midx = new File(midxPath); + } + + errw.println("Writing " + midx.getAbsolutePath()); + + ObjectDirectory odb = (ObjectDirectory) db.getObjectDatabase(); + + Map indexes = new HashMap<>(); + for (Pack pack : odb.getPacks()) { + PackFile packFile = pack.getPackFile().create(PackExt.INDEX); + try { + indexes.put(packFile.getName(), pack.getIndex()); + } catch (IOException e) { + throw die("Cannot open index in pack", e); + } + } + + MultiPackIndexWriter writer = new MultiPackIndexWriter(); + try (FileOutputStream out = new FileOutputStream(midxPath)) { + writer.write(NullProgressMonitor.INSTANCE, out, indexes); + } catch (IOException e) { + throw die("Cannot write midx " + midxPath, e); + } + } +} -- cgit v1.2.3 From ae6665197b175134001d7416d5c8a183dd621454 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Fri, 21 Feb 2025 10:11:48 -0800 Subject: BlameGenerator: add @since tags to new methods and inner class Change-Id: I849d0a3ff07bb53e93112eb716a6537cf2419290 --- .../src/org/eclipse/jgit/blame/BlameGenerator.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java index b2296e0123..2d499cafce 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameGenerator.java @@ -170,6 +170,7 @@ public class BlameGenerator implements AutoCloseable { * @param blameCache * previously calculated blames. This generator will *not* * populate it, just consume it. + * @since 7.2 */ public BlameGenerator(Repository repository, String path, @Nullable BlameCache blameCache) { @@ -282,6 +283,7 @@ public class BlameGenerator implements AutoCloseable { * Stats about this generator * * @return the stats of this generator + * @since 7.2 */ public Stats getStats() { return stats; @@ -291,9 +293,12 @@ public class BlameGenerator implements AutoCloseable { * Enable/disable the use of cache (if present). Enabled by default. *

* If caller need source line numbers, the generator cannot use the cache - * (source lines are not there). Use this method to disable the cache in that case. + * (source lines are not there). Use this method to disable the cache in + * that case. * - * @param useCache should this generator use the cache. + * @param useCache + * should this generator use the cache. + * @since 7.2 */ public void setUseCache(boolean useCache) { this.useCache = useCache; @@ -651,8 +656,8 @@ public class BlameGenerator implements AutoCloseable { List cachedBlame = blameCache.get(repository, n.sourceCommit, n.sourcePath.getPath()); if (cachedBlame != null) { - BlameRegionMerger rb = new BlameRegionMerger(repository, revPool, - cachedBlame); + BlameRegionMerger rb = new BlameRegionMerger(repository, + revPool, cachedBlame); Candidate fullyBlamed = rb.mergeCandidate(n); if (fullyBlamed != null) { stats.cacheHit = true; @@ -1204,6 +1209,8 @@ public class BlameGenerator implements AutoCloseable { /** * Stats about the work done by the generator + * + * @since 7.2 */ public static class Stats { @@ -1233,6 +1240,5 @@ public class BlameGenerator implements AutoCloseable { public boolean isCacheHit() { return cacheHit; } - } } -- cgit v1.2.3 From fab9b3d961393cd2f0e9e994b0c2827d3f3ac4ee Mon Sep 17 00:00:00 2001 From: Antonio Barone Date: Thu, 13 Feb 2025 13:21:04 +0100 Subject: Fix calculation of pack files and objects since bitmap Fix a logic issue where pack files and objects created since the most recent bitmap were incorrectly counted, ignoring their modification time. Since pack files are processed in order from most recent to oldest, we can reliably stop counting as soon as we encounter the first bitmap. By definition, all subsequent pack files are older and should not be included in the count. This ensures accurate repository statistics and prevents overcounting. Bug: jgit-140 Change-Id: I99d85fb70bc7eb42a8d24c74a1fdb8e03334099e --- .../storage/file/GcSinceBitmapStatisticsTest.java | 31 +++++++++++++++++++--- .../org/eclipse/jgit/internal/storage/file/GC.java | 10 ++++--- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcSinceBitmapStatisticsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcSinceBitmapStatisticsTest.java index 3cd766c4e9..af52e2cb85 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcSinceBitmapStatisticsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/GcSinceBitmapStatisticsTest.java @@ -20,6 +20,7 @@ import java.util.stream.StreamSupport; import org.eclipse.jgit.internal.storage.file.GC.RepoStatistics; import org.eclipse.jgit.lib.PersonIdent; import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.storage.pack.PackConfig; import org.junit.Test; public class GcSinceBitmapStatisticsTest extends GcTestCase { @@ -51,11 +52,19 @@ public class GcSinceBitmapStatisticsTest extends GcTestCase { } @Test - public void testShouldReportNoPacksDirectlyAfterGc() throws Exception { - // given + public void testShouldReportNoPacksFilesSinceBitmapWhenPackfilesAreOlderThanBitmapFile() + throws Exception { addCommit(null); - gc.gc().get(); + configureGC(/* buildBitmap */ false).gc().get(); + assertEquals(1L, gc.getStatistics().numberOfPackFiles); + assertEquals(0L, repositoryBitmapFiles()); + assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); + + addCommit(null); + configureGC(/* buildBitmap */ true).gc().get(); + assertEquals(1L, repositoryBitmapFiles()); + assertEquals(2L, gc.getStatistics().numberOfPackFiles); assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); } @@ -79,8 +88,11 @@ public class GcSinceBitmapStatisticsTest extends GcTestCase { // progress & pack addCommit(parent); - tr.packAndPrune(); + assertEquals(1L, gc.getStatistics().numberOfPackFiles); + assertEquals(0L, gc.getStatistics().numberOfPackFilesSinceBitmap); + tr.packAndPrune(); + assertEquals(2L, gc.getStatistics().numberOfPackFiles); assertEquals(1L, gc.getStatistics().numberOfPackFilesSinceBitmap); } @@ -90,13 +102,17 @@ public class GcSinceBitmapStatisticsTest extends GcTestCase { // commit & gc RevCommit parent = addCommit(null); gc.gc().get(); + assertEquals(0L, gc.getStatistics().numberOfLooseObjects); assertEquals(0L, gc.getStatistics().numberOfObjectsSinceBitmap); // progress & pack addCommit(parent); + assertEquals(1L, gc.getStatistics().numberOfLooseObjects); assertEquals(1L, gc.getStatistics().numberOfObjectsSinceBitmap); tr.packAndPrune(); + assertEquals(0L, gc.getStatistics().numberOfLooseObjects); + // Number of objects contained in the newly created PackFile assertEquals(3L, gc.getStatistics().numberOfObjectsSinceBitmap); } @@ -164,4 +180,11 @@ public class GcSinceBitmapStatisticsTest extends GcTestCase { } }).sum(); } + + private GC configureGC(boolean buildBitmap) { + PackConfig pc = new PackConfig(repo.getObjectDatabase().getConfig()); + pc.setBuildBitmaps(buildBitmap); + gc.setPackConfig(pc); + return gc; + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index b33afed131..3cc43ebb04 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -1579,7 +1579,7 @@ public class GC { public RepoStatistics getStatistics() throws IOException { RepoStatistics ret = new RepoStatistics(); Collection packs = repo.getObjectDatabase().getPacks(); - long latestBitmapTime = Long.MIN_VALUE; + long latestBitmapTime = 0L; for (Pack p : packs) { long packedObjects = p.getIndex().getObjectCount(); ret.numberOfPackedObjects += packedObjects; @@ -1587,9 +1587,11 @@ public class GC { ret.sizeOfPackedObjects += p.getPackFile().length(); if (p.getBitmapIndex() != null) { ret.numberOfBitmaps += p.getBitmapIndex().getBitmapCount(); - latestBitmapTime = p.getFileSnapshot().lastModifiedInstant() - .toEpochMilli(); - } else { + if (latestBitmapTime == 0L) { + latestBitmapTime = p.getFileSnapshot().lastModifiedInstant().toEpochMilli(); + } + } + else if (latestBitmapTime == 0L) { ret.numberOfPackFilesSinceBitmap++; ret.numberOfObjectsSinceBitmap += packedObjects; } -- cgit v1.2.3 From 3a11e6cc930a18ed17135e58fae2ab7489e2a651 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 24 Feb 2025 20:51:32 +0100 Subject: Export new package org.eclipse.jgit.blame.cache and import it in bundle org.eclipse.jgit.test. While we are at it also update uses clauses. Change-Id: I70f381cce3398468e3bb950c57df714ebe1b023a --- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 1 + org.eclipse.jgit/META-INF/MANIFEST.MF | 38 ++++++++++++++++++------------ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index af5fd1c53a..c246d05fed 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -29,6 +29,7 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", org.eclipse.jgit.awtui;version="[7.2.0,7.3.0)", org.eclipse.jgit.blame;version="[7.2.0,7.3.0)", + org.eclipse.jgit.blame.cache;version="[7.2.0,7.3.0)", org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index f5cc16cfe2..5f4894204a 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -34,13 +34,16 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.blame;version="7.2.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, - org.eclipse.jgit.treewalk.filter, - org.eclipse.jgit.diff", + org.eclipse.jgit.blame.cache, + org.eclipse.jgit.diff, + org.eclipse.jgit.treewalk.filter", + org.eclipse.jgit.blame.cache;version="7.2.0"; + uses:="org.eclipse.jgit.lib", org.eclipse.jgit.diff;version="7.2.0"; uses:="org.eclipse.jgit.lib, - org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.patch, + org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", @@ -53,19 +56,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.errors;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, - org.eclipse.jgit.lib, - org.eclipse.jgit.internal.storage.pack", + org.eclipse.jgit.lib", org.eclipse.jgit.events;version="7.2.0"; uses:="org.eclipse.jgit.lib", org.eclipse.jgit.fnmatch;version="7.2.0", org.eclipse.jgit.gitrepo;version="7.2.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, + org.eclipse.jgit.api.errors, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", org.eclipse.jgit.gitrepo.internal;version="7.2.0";x-internal:=true, - org.eclipse.jgit.hooks;version="7.2.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.hooks;version="7.2.0"; + uses:="org.eclipse.jgit.lib, + org.eclipse.jgit.util", org.eclipse.jgit.ignore;version="7.2.0", org.eclipse.jgit.ignore.internal;version="7.2.0"; x-friends:="org.eclipse.jgit.test", @@ -105,7 +110,7 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.pgm", org.eclipse.jgit.internal.storage.memory;version="7.2.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.2.0", + org.eclipse.jgit.internal.storage.midx;version="7.2.0";x-internal:=true, org.eclipse.jgit.internal.storage.pack;version="7.2.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, @@ -128,13 +133,14 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", org.eclipse.jgit.internal.util;version="7.2.0"; - x-friends:=" org.eclipse.jgit.junit", + x-friends:="org.eclipse.jgit.junit", org.eclipse.jgit.lib;version="7.2.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, org.eclipse.jgit.revwalk, org.eclipse.jgit.internal.storage.file, + org.eclipse.jgit.api, org.eclipse.jgit.attributes, org.eclipse.jgit.events, com.googlecode.javaewah, @@ -165,16 +171,18 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.merge", org.eclipse.jgit.patch;version="7.2.0"; uses:="org.eclipse.jgit.lib, + org.eclipse.jgit.revwalk, org.eclipse.jgit.diff", org.eclipse.jgit.revplot;version="7.2.0"; - uses:="org.eclipse.jgit.lib, - org.eclipse.jgit.revwalk", + uses:="org.eclipse.jgit.revwalk, + org.eclipse.jgit.lib", org.eclipse.jgit.revwalk;version="7.2.0"; uses:="org.eclipse.jgit.lib, + org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, - org.eclipse.jgit.revwalk.filter, - org.eclipse.jgit.treewalk", + org.eclipse.jgit.treewalk, + org.eclipse.jgit.internal.storage.commitgraph", org.eclipse.jgit.revwalk.filter;version="7.2.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, @@ -186,17 +194,17 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", uses:="org.eclipse.jgit.lib", org.eclipse.jgit.submodule;version="7.2.0"; uses:="org.eclipse.jgit.lib, - org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, + org.eclipse.jgit.diff, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", org.eclipse.jgit.transport;version="7.2.0"; uses:="javax.crypto, + org.eclipse.jgit.hooks, org.eclipse.jgit.util.io, org.eclipse.jgit.lib, - org.eclipse.jgit.revwalk, org.eclipse.jgit.transport.http, - org.eclipse.jgit.internal.storage.file, + org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.util, org.eclipse.jgit.internal.storage.pack, -- cgit v1.2.3 From 4aae789d285ee94414395f59a408a734a6bc6a36 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 24 Feb 2025 20:52:13 +0100 Subject: MultiPackIndexPrettyPrinter: add missing @since tag and suppress nls warnings. Change-Id: I33be306f4d5894e81fce7b2b34fdff30313417de --- .../jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java index e8428b8fca..795d39e375 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/midx/MultiPackIndexPrettyPrinter.java @@ -21,8 +21,10 @@ import org.eclipse.jgit.util.NB; /** * Prints a multipack index file in a human-readable format. + * + * @since 7.2 */ -@SuppressWarnings("nls") +@SuppressWarnings({ "boxing", "nls" }) public class MultiPackIndexPrettyPrinter { /** -- cgit v1.2.3 From 70a3131d6bb7332f50827335babb194677382d7f Mon Sep 17 00:00:00 2001 From: Ben Rohlfs Date: Thu, 20 Feb 2025 10:53:55 +0100 Subject: Update Change-Id insertion logic to insert after footers Before this change we were inserting the Change-Id at the beginning of the footer block, but after any Bug or Issue footers. After this change we are inserting the Change-Id at the end of the footer block, but before any Signed-off-by footers. The overall goal is to stay consistent with Gerrit's commit-msg hook. Change-Id: Id3a73e901ac3c289f79941d12979459c66cb7a13 --- .../tst/org/eclipse/jgit/util/ChangeIdUtilTest.java | 10 +++++++++- org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java | 7 ++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java index e7f2049bb9..95c2fe3b51 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java @@ -528,7 +528,7 @@ public class ChangeIdUtilTest { } @Test - public void testChangeIdAfterBugOrIssue() throws Exception { + public void testChangeIdAfterOtherFooters() throws Exception { assertEquals("a\n" + // "\n" + // "Bug: 42\n" + // @@ -548,6 +548,14 @@ public class ChangeIdUtilTest { "\n" + // "Issue: 42\n" + // SOB1)); + + assertEquals("a\n" + // + "\n" + // + "Other: none\n" + // + "Change-Id: Ide70e625dea61854206378a377dd12e462ae720f\n",// + call("a\n" + // + "\n" + // + "Other: none\n")); } @Test diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java index 12af374b2e..cd169f9bb7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java @@ -86,8 +86,8 @@ public class ChangeIdUtil { } } - private static final Pattern issuePattern = Pattern - .compile("^(Bug|Issue)[a-zA-Z0-9-]*:.*$"); //$NON-NLS-1$ + private static final Pattern signedOffByPattern = Pattern + .compile("^Signed-off-by:.*$"); //$NON-NLS-1$ private static final Pattern footerPattern = Pattern .compile("(^[a-zA-Z0-9-]+:(?!//).*$)"); //$NON-NLS-1$ @@ -159,7 +159,8 @@ public class ChangeIdUtil { int footerFirstLine = indexOfFirstFooterLine(lines); int insertAfter = footerFirstLine; for (int i = footerFirstLine; i < lines.length; ++i) { - if (issuePattern.matcher(lines[i]).matches()) { + if (footerPattern.matcher(lines[i]).matches() && + !signedOffByPattern.matcher(lines[i]).matches()) { insertAfter = i + 1; continue; } -- cgit v1.2.3 From e10f876b4c08f880c5a26805f974e7fe27770290 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sun, 9 Feb 2025 22:41:31 +0100 Subject: ssh: bump Apache MINA sshd 2.14.0 -> 2.15.0 Brings support for ML-KEM PQC hybrid key exchanges, plus support for using the Bouncy Castle ed25519 provider. Change-Id: Ib44e89ff96799c6e4f6ac546284a0e7c4726898d --- WORKSPACE | 6 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 50 +++++----- .../org.eclipse.jgit.target/jgit-4.32.target | 6 +- .../org.eclipse.jgit.target/jgit-4.33.target | 6 +- .../org.eclipse.jgit.target/jgit-4.34.target | 6 +- .../org.eclipse.jgit.target/jgit-4.35.target | 6 +- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 +- .../META-INF/MANIFEST.MF | 32 +++---- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 104 ++++++++++----------- pom.xml | 2 +- 10 files changed, 111 insertions(+), 111 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index c0e8236998..d6084308d2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -108,18 +108,18 @@ maven_jar( sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850", ) -SSHD_VERS = "2.14.0" +SSHD_VERS = "2.15.0" maven_jar( name = "sshd-osgi", artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS, - sha1 = "6ef66228a088f8ac1383b2ff28f3102f80ebc01a", + sha1 = "aa76898fe47eab7da0878dd60e6f3be5631e076c", ) maven_jar( name = "sshd-sftp", artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS, - sha1 = "c070ac920e72023ae9ab0a3f3a866bece284b470", + sha1 = "2e226055ed060c64ed76256a9c45de6d0109eef8", ) JNA_VERS = "5.16.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index bcd9fbfc81..c8354cf60a 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -8,31 +8,31 @@ Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.apache.sshd.common;version="[2.14.0,2.15.0)", - org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", - org.apache.sshd.common.file.virtualfs;version="[2.14.0,2.15.0)", - org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", - org.apache.sshd.common.io;version="[2.14.0,2.15.0)", - org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", - org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", - org.apache.sshd.common.session;version="[2.14.0,2.15.0)", - org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.threads;version="[2.14.0,2.15.0)", - org.apache.sshd.core;version="[2.14.0,2.15.0)", - org.apache.sshd.server;version="[2.14.0,2.15.0)", - org.apache.sshd.server.auth;version="[2.14.0,2.15.0)", - org.apache.sshd.server.auth.gss;version="[2.14.0,2.15.0)", - org.apache.sshd.server.auth.keyboard;version="[2.14.0,2.15.0)", - org.apache.sshd.server.auth.password;version="[2.14.0,2.15.0)", - org.apache.sshd.server.command;version="[2.14.0,2.15.0)", - org.apache.sshd.server.session;version="[2.14.0,2.15.0)", - org.apache.sshd.server.shell;version="[2.14.0,2.15.0)", - org.apache.sshd.server.subsystem;version="[2.14.0,2.15.0)", - org.apache.sshd.sftp;version="[2.14.0,2.15.0)", - org.apache.sshd.sftp.server;version="[2.14.0,2.15.0)", +Import-Package: org.apache.sshd.common;version="[2.15.0,2.16.0)", + org.apache.sshd.common.config.keys;version="[2.15.0,2.16.0)", + org.apache.sshd.common.file.virtualfs;version="[2.15.0,2.16.0)", + org.apache.sshd.common.helpers;version="[2.15.0,2.16.0)", + org.apache.sshd.common.io;version="[2.15.0,2.16.0)", + org.apache.sshd.common.kex;version="[2.15.0,2.16.0)", + org.apache.sshd.common.keyprovider;version="[2.15.0,2.16.0)", + org.apache.sshd.common.session;version="[2.15.0,2.16.0)", + org.apache.sshd.common.signature;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.buffer;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.logging;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.security;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.threads;version="[2.15.0,2.16.0)", + org.apache.sshd.core;version="[2.15.0,2.16.0)", + org.apache.sshd.server;version="[2.15.0,2.16.0)", + org.apache.sshd.server.auth;version="[2.15.0,2.16.0)", + org.apache.sshd.server.auth.gss;version="[2.15.0,2.16.0)", + org.apache.sshd.server.auth.keyboard;version="[2.15.0,2.16.0)", + org.apache.sshd.server.auth.password;version="[2.15.0,2.16.0)", + org.apache.sshd.server.command;version="[2.15.0,2.16.0)", + org.apache.sshd.server.session;version="[2.15.0,2.16.0)", + org.apache.sshd.server.shell;version="[2.15.0,2.16.0)", + org.apache.sshd.server.subsystem;version="[2.15.0,2.16.0)", + org.apache.sshd.sftp;version="[2.15.0,2.16.0)", + org.apache.sshd.sftp.server;version="[2.15.0,2.16.0)", org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", org.eclipse.jgit.api;version="[7.2.0,7.3.0)", org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index acb7b77ed2..6c69caa51b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.14.0 + 2.15.0 jar org.apache.sshd sshd-sftp - 2.14.0 + 2.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index fcca388967..c8e912be19 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.14.0 + 2.15.0 jar org.apache.sshd sshd-sftp - 2.14.0 + 2.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index e5c93692b7..e2e165d05a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.14.0 + 2.15.0 jar org.apache.sshd sshd-sftp - 2.14.0 + 2.15.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index f9551d5368..43193a74e6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -63,13 +63,13 @@ org.apache.sshd sshd-osgi - 2.14.0 + 2.15.0 jar org.apache.sshd sshd-sftp - 2.14.0 + 2.15.0 jar 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 17d4ad436c..cf7e561764 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 @@ -238,12 +238,12 @@ maven sshd dependency { groupId = "org.apache.sshd" artifactId = "sshd-osgi" - version = "2.14.0" + version = "2.15.0" } dependency { groupId = "org.apache.sshd" artifactId = "sshd-sftp" - version = "2.14.0" + version = "2.15.0" } } diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 32c12a194c..2d4f5445c9 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,21 +8,21 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", - org.apache.sshd.common;version="[2.14.0,2.15.0)", - org.apache.sshd.common.auth;version="[2.14.0,2.15.0)", - org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", - org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", - org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", - org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", - org.apache.sshd.common.session;version="[2.14.0,2.15.0)", - org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", - org.apache.sshd.core;version="[2.14.0,2.15.0)", - org.apache.sshd.server;version="[2.14.0,2.15.0)", - org.apache.sshd.server.forward;version="[2.14.0,2.15.0)", +Import-Package: org.apache.sshd.client.config.hosts;version="[2.15.0,2.16.0)", + org.apache.sshd.common;version="[2.15.0,2.16.0)", + org.apache.sshd.common.auth;version="[2.15.0,2.16.0)", + org.apache.sshd.common.config.keys;version="[2.15.0,2.16.0)", + org.apache.sshd.common.helpers;version="[2.15.0,2.16.0)", + org.apache.sshd.common.kex;version="[2.15.0,2.16.0)", + org.apache.sshd.common.keyprovider;version="[2.15.0,2.16.0)", + org.apache.sshd.common.session;version="[2.15.0,2.16.0)", + org.apache.sshd.common.signature;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.buffer;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.net;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.security;version="[2.15.0,2.16.0)", + org.apache.sshd.core;version="[2.15.0,2.16.0)", + org.apache.sshd.server;version="[2.15.0,2.16.0)", + org.apache.sshd.server.forward;version="[2.15.0,2.16.0)", org.eclipse.jgit.api;version="[7.2.0,7.3.0)", org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.signing.ssh;version="[7.2.0,7.3.0)", @@ -42,4 +42,4 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", org.junit.rules;version="[4.13.0,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13.0,5.0.0)", - org.slf4j;version="[1.7.0,2.0.0)" + org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 822ef55fa2..aae7bf1b1a 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -39,58 +39,58 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends: org.eclipse.jgit.transport.sshd.agent;version="7.2.0", sun.security.x509 Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.14.0,2.15.0)", - org.apache.sshd.client;version="[2.14.0,2.15.0)", - org.apache.sshd.client.auth;version="[2.14.0,2.15.0)", - org.apache.sshd.client.auth.keyboard;version="[2.14.0,2.15.0)", - org.apache.sshd.client.auth.password;version="[2.14.0,2.15.0)", - org.apache.sshd.client.auth.pubkey;version="[2.14.0,2.15.0)", - org.apache.sshd.client.channel;version="[2.14.0,2.15.0)", - org.apache.sshd.client.config.hosts;version="[2.14.0,2.15.0)", - org.apache.sshd.client.config.keys;version="[2.14.0,2.15.0)", - org.apache.sshd.client.future;version="[2.14.0,2.15.0)", - org.apache.sshd.client.keyverifier;version="[2.14.0,2.15.0)", - org.apache.sshd.client.session;version="[2.14.0,2.15.0)", - org.apache.sshd.client.session.forward;version="[2.14.0,2.15.0)", - org.apache.sshd.common;version="[2.14.0,2.15.0)", - org.apache.sshd.common.auth;version="[2.14.0,2.15.0)", - org.apache.sshd.common.channel;version="[2.14.0,2.15.0)", - org.apache.sshd.common.cipher;version="[2.14.0,2.15.0)", - org.apache.sshd.common.compression;version="[2.14.0,2.15.0)", - org.apache.sshd.common.config.keys;version="[2.14.0,2.15.0)", - org.apache.sshd.common.config.keys.loader;version="[2.14.0,2.15.0)", - org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.14.0,2.15.0)", - org.apache.sshd.common.config.keys.u2f;version="[2.14.0,2.15.0)", - org.apache.sshd.common.digest;version="[2.14.0,2.15.0)", - org.apache.sshd.common.forward;version="[2.14.0,2.15.0)", - org.apache.sshd.common.future;version="[2.14.0,2.15.0)", - org.apache.sshd.common.helpers;version="[2.14.0,2.15.0)", - org.apache.sshd.common.io;version="[2.14.0,2.15.0)", - org.apache.sshd.common.kex;version="[2.14.0,2.15.0)", - org.apache.sshd.common.kex.extension;version="[2.14.0,2.15.0)", - org.apache.sshd.common.kex.extension.parser;version="[2.14.0,2.15.0)", - org.apache.sshd.common.keyprovider;version="[2.14.0,2.15.0)", - org.apache.sshd.common.mac;version="[2.14.0,2.15.0)", - org.apache.sshd.common.random;version="[2.14.0,2.15.0)", - org.apache.sshd.common.session;version="[2.14.0,2.15.0)", - org.apache.sshd.common.session.helpers;version="[2.14.0,2.15.0)", - org.apache.sshd.common.signature;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.buffer;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.buffer.keys;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.closeable;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.io;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.io.der;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.io.functors;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.io.resource;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.logging;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.net;version="[2.14.0,2.15.0)", - org.apache.sshd.common.util.security;version="[2.14.0,2.15.0)", - org.apache.sshd.core;version="[2.14.0,2.15.0)", - org.apache.sshd.server.auth;version="[2.14.0,2.15.0)", - org.apache.sshd.sftp;version="[2.14.0,2.15.0)", - org.apache.sshd.sftp.client;version="[2.14.0,2.15.0)", - org.apache.sshd.sftp.common;version="[2.14.0,2.15.0)", + org.apache.sshd.agent;version="[2.15.0,2.16.0)", + org.apache.sshd.client;version="[2.15.0,2.16.0)", + org.apache.sshd.client.auth;version="[2.15.0,2.16.0)", + org.apache.sshd.client.auth.keyboard;version="[2.15.0,2.16.0)", + org.apache.sshd.client.auth.password;version="[2.15.0,2.16.0)", + org.apache.sshd.client.auth.pubkey;version="[2.15.0,2.16.0)", + org.apache.sshd.client.channel;version="[2.15.0,2.16.0)", + org.apache.sshd.client.config.hosts;version="[2.15.0,2.16.0)", + org.apache.sshd.client.config.keys;version="[2.15.0,2.16.0)", + org.apache.sshd.client.future;version="[2.15.0,2.16.0)", + org.apache.sshd.client.keyverifier;version="[2.15.0,2.16.0)", + org.apache.sshd.client.session;version="[2.15.0,2.16.0)", + org.apache.sshd.client.session.forward;version="[2.15.0,2.16.0)", + org.apache.sshd.common;version="[2.15.0,2.16.0)", + org.apache.sshd.common.auth;version="[2.15.0,2.16.0)", + org.apache.sshd.common.channel;version="[2.15.0,2.16.0)", + org.apache.sshd.common.cipher;version="[2.15.0,2.16.0)", + org.apache.sshd.common.compression;version="[2.15.0,2.16.0)", + org.apache.sshd.common.config.keys;version="[2.15.0,2.16.0)", + org.apache.sshd.common.config.keys.loader;version="[2.15.0,2.16.0)", + org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.15.0,2.16.0)", + org.apache.sshd.common.config.keys.u2f;version="[2.15.0,2.16.0)", + org.apache.sshd.common.digest;version="[2.15.0,2.16.0)", + org.apache.sshd.common.forward;version="[2.15.0,2.16.0)", + org.apache.sshd.common.future;version="[2.15.0,2.16.0)", + org.apache.sshd.common.helpers;version="[2.15.0,2.16.0)", + org.apache.sshd.common.io;version="[2.15.0,2.16.0)", + org.apache.sshd.common.kex;version="[2.15.0,2.16.0)", + org.apache.sshd.common.kex.extension;version="[2.15.0,2.16.0)", + org.apache.sshd.common.kex.extension.parser;version="[2.15.0,2.16.0)", + org.apache.sshd.common.keyprovider;version="[2.15.0,2.16.0)", + org.apache.sshd.common.mac;version="[2.15.0,2.16.0)", + org.apache.sshd.common.random;version="[2.15.0,2.16.0)", + org.apache.sshd.common.session;version="[2.15.0,2.16.0)", + org.apache.sshd.common.session.helpers;version="[2.15.0,2.16.0)", + org.apache.sshd.common.signature;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.buffer;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.buffer.keys;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.closeable;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.io;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.io.der;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.io.functors;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.io.resource;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.logging;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.net;version="[2.15.0,2.16.0)", + org.apache.sshd.common.util.security;version="[2.15.0,2.16.0)", + org.apache.sshd.core;version="[2.15.0,2.16.0)", + org.apache.sshd.server.auth;version="[2.15.0,2.16.0)", + org.apache.sshd.sftp;version="[2.15.0,2.16.0)", + org.apache.sshd.sftp.client;version="[2.15.0,2.16.0)", + org.apache.sshd.sftp.common;version="[2.15.0,2.16.0)", org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", diff --git a/pom.xml b/pom.xml index e6ea7488f0..80479ed4b9 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ 7.1.0.202411261347-r 1.10.15 - 2.14.0 + 2.15.0 0.1.55 1.1.3 1.2.3 -- cgit v1.2.3 From 8c801c2a6d4177269fd7a8ae244bf85e5f641a26 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Feb 2025 00:18:00 +0100 Subject: Update maven plugins - gmavenplus-plugin to 4.1.1 - japicmp-plugin to 0.23.1 - maven-artifact-plugin to 3.6.0 - maven-clean-plugin to 3.4.0 - maven-compiler-plugin-version to 3.14.0 - spotbugs-maven-plugin-version to 4.9.1.0 - spring-boot-maven-plugin to 3.4.3 - tycho to 4.0.11 Change-Id: I45d930fd777723b13015e9a694c814ccdcc4930e --- org.eclipse.jgit.packaging/pom.xml | 6 +++--- pom.xml | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 5bc67b458e..8306abc0a5 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -30,7 +30,7 @@ 17 - 4.0.10 + 4.0.11 jgit-4.32 ${git.commit.time} @@ -390,7 +390,7 @@ maven-clean-plugin - 3.4.0 + 3.4.1 org.apache.maven.plugins @@ -410,7 +410,7 @@ org.apache.maven.plugins maven-artifact-plugin - 3.5.3 + 3.6.0 **/*cyclonedx.json true diff --git a/pom.xml b/pom.xml index 80479ed4b9..c6a5fd3981 100644 --- a/pom.xml +++ b/pom.xml @@ -131,19 +131,19 @@ 6.0.0 6.1.0 12.0.16 - 0.23.0 + 0.23.1 4.5.14 4.4.16 1.7.36 3.11.2 2.11.0 1.80 - 4.8.6.6 + 4.9.1.0 3.8.0 3.6.0 3.5.2 ${maven-surefire-plugin-version} - 3.13.0 + 3.14.0 2.13.0 2.2 3.27.3 @@ -208,7 +208,7 @@ maven-clean-plugin - 3.4.0 + 3.4.1 @@ -357,7 +357,7 @@ org.springframework.boot spring-boot-maven-plugin - 3.4.1 + 3.4.3 org.eclipse.dash @@ -372,7 +372,7 @@ org.apache.maven.plugins maven-artifact-plugin - 3.5.3 + 3.6.0 **/*cyclonedx.json true @@ -642,7 +642,7 @@ org.codehaus.gmavenplus gmavenplus-plugin - 4.0.1 + 4.1.1 org.apache.groovy -- cgit v1.2.3 From f2fad1fd1f3162ae4b199996261e7169206ba2ec Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Feb 2025 01:54:14 +0100 Subject: Update ecj to 3.40.0 Change-Id: I66960d838fd9f28211c7341c086ba02cf03d7f4f --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c6a5fd3981..f86282ffb0 100644 --- a/pom.xml +++ b/pom.xml @@ -1116,7 +1116,7 @@ org.eclipse.jdt ecj - 3.38.0 + 3.40.0 -- cgit v1.2.3 From 92583e4815f8c3e80ea1cb2aef2a84c084ee206b Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Feb 2025 01:57:35 +0100 Subject: Update com.google.code.gson:gson to 2.12.1 Change-Id: I64b0c1e29bcd4f653d83813712a04496e17f9cd5 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index d6084308d2..a9e67c8003 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -242,8 +242,8 @@ maven_jar( maven_jar( name = "gson", - artifact = "com.google.code.gson:gson:2.11.0", - sha1 = "527175ca6d81050b53bdd4c457a6d6e017626b0e", + artifact = "com.google.code.gson:gson:2.12.1", + sha1 = "4e773a317740b83b43cfc3d652962856041697cb", ) JETTY_VER = "12.0.16" diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 6c69caa51b..36a1f20c79 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -183,7 +183,7 @@ com.google.code.gson gson - 2.11.0 + 2.12.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index c8e912be19..0ea25409f6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -183,7 +183,7 @@ com.google.code.gson gson - 2.11.0 + 2.12.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index e2e165d05a..1eda144941 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -183,7 +183,7 @@ com.google.code.gson gson - 2.11.0 + 2.12.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 43193a74e6..fc9ee67b20 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -183,7 +183,7 @@ com.google.code.gson gson - 2.11.0 + 2.12.1 jar 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 cf7e561764..8ebd60904b 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 @@ -115,7 +115,7 @@ maven gson dependency { groupId = "com.google.code.gson" artifactId = "gson" - version = "2.11.0" + version = "2.12.1" } } diff --git a/pom.xml b/pom.xml index f86282ffb0..db66d60dc3 100644 --- a/pom.xml +++ b/pom.xml @@ -136,7 +136,7 @@ 4.4.16 1.7.36 3.11.2 - 2.11.0 + 2.12.1 1.80 4.9.1.0 3.8.0 -- cgit v1.2.3 From 6f3abed9d825e6a04115b08316cf0f22ac3b0a5c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Feb 2025 01:59:51 +0100 Subject: Update commons-codec:commons-codec to 1.18.0 Change-Id: I8243ff30bca13b13e1c096ab7072673831ea937c --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index a9e67c8003..53e001d91b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -138,8 +138,8 @@ maven_jar( maven_jar( name = "commons-codec", - artifact = "commons-codec:commons-codec:1.17.2", - sha1 = "cd6bb9d856db5f61871a94d5801efd0b93b7fcb2", + artifact = "commons-codec:commons-codec:1.18.0", + sha1 = "ee45d1cf6ec2cc2b809ff04b4dc7aec858e0df8f", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index 36a1f20c79..ce919b661c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.2 + 1.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 0ea25409f6..df82bdae87 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.2 + 1.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 1eda144941..9b71eb9ac8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.2 + 1.18.0 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index fc9ee67b20..c265cfac85 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -257,7 +257,7 @@ commons-codec commons-codec - 1.17.2 + 1.18.0 jar 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 8ebd60904b..c87b351d12 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 @@ -10,7 +10,7 @@ maven apache dependency { groupId = "commons-codec" artifactId = "commons-codec" - version = "1.17.2" + version = "1.18.0" } dependency { groupId = "org.apache.commons" diff --git a/pom.xml b/pom.xml index db66d60dc3..4369754515 100644 --- a/pom.xml +++ b/pom.xml @@ -886,7 +886,7 @@ commons-codec commons-codec - 1.17.2 + 1.18.0 -- cgit v1.2.3 From 74aff4635883e45475820313c339583250cb51a5 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Feb 2025 02:01:26 +0100 Subject: Update commons-logging:commons-logging to 1.3.5 Change-Id: I7745294b95a8e6d778bb4b650b2407fbc18282c3 --- WORKSPACE | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 4 ++-- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target | 4 ++-- .../org.eclipse.jgit.target/maven/dependencies.tpd | 2 +- pom.xml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 53e001d91b..8cac41bd0d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -144,8 +144,8 @@ maven_jar( maven_jar( name = "commons-logging", - artifact = "commons-logging:commons-logging:1.3.4", - sha1 = "b9fc14968d63a8b8a8a2c1885fe3e90564239708", + artifact = "commons-logging:commons-logging:1.3.5", + sha1 = "a3fcc5d3c29b2b03433aa2d2f2d2c1b1638924a1", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index ce919b661c..b38b2364f2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.4 + 1.3.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index df82bdae87..551efc10d5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.4 + 1.3.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 9b71eb9ac8..1a0c9e0d4c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.4 + 1.3.5 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index c265cfac85..bfd96d3b7a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -281,7 +281,7 @@ commons-logging commons-logging - 1.3.4 + 1.3.5 jar 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 c87b351d12..d89d8800a7 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 @@ -30,7 +30,7 @@ maven apache dependency { groupId = "commons-logging" artifactId = "commons-logging" - version = "1.3.4" + version = "1.3.5" } } diff --git a/pom.xml b/pom.xml index 4369754515..83d9caab4a 100644 --- a/pom.xml +++ b/pom.xml @@ -904,7 +904,7 @@ commons-logging commons-logging - 1.3.4 + 1.3.5 -- cgit v1.2.3 From 7c1f4fde04e0c3ca1c5e45f9e9d073feac90e3bf Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Feb 2025 02:03:33 +0100 Subject: Update byte-buddy to 1.17.1 Change-Id: I9fc7afa1b44847bc0c321d38d6c19ee1e14fa3cc --- WORKSPACE | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target | 6 +++--- org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target | 6 +++--- .../org.eclipse.jgit.target/maven/dependencies.tpd | 4 ++-- pom.xml | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8cac41bd0d..dea15ed7ab 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -220,18 +220,18 @@ maven_jar( sha1 = "31f5d58a202bd5df4993fb10fa2cffd610c20d6f", ) -BYTE_BUDDY_VERSION = "1.16.1" +BYTE_BUDDY_VERSION = "1.17.1" maven_jar( name = "bytebuddy", artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION, - sha1 = "f95f4d5efa5e07706129048a62b38a0acb35592c", + sha1 = "8b5205fad48196a88d3d66dddff5a7417bce3596", ) maven_jar( name = "bytebuddy-agent", artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION, - sha1 = "22bb84b3bda45a329d17930809683484a5ac2db2", + sha1 = "0669a13b59d5ffd8198a79e4dc99018a9278e457", ) maven_jar( diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index b38b2364f2..d6888137cf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.16.1 + 1.17.1 jar net.bytebuddy byte-buddy-agent - 1.16.1 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index 551efc10d5..b911f80b0e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.16.1 + 1.17.1 jar net.bytebuddy byte-buddy-agent - 1.16.1 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 1a0c9e0d4c..09b39c4375 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.16.1 + 1.17.1 jar net.bytebuddy byte-buddy-agent - 1.16.1 + 1.17.1 jar diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index bfd96d3b7a..3ae26bc1dd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,7 +1,7 @@ - + @@ -193,13 +193,13 @@ net.bytebuddy byte-buddy - 1.16.1 + 1.17.1 jar net.bytebuddy byte-buddy-agent - 1.16.1 + 1.17.1 jar 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 d89d8800a7..b292cf5e84 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 @@ -97,12 +97,12 @@ maven bytebuddy dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy" - version = "1.16.1" + version = "1.17.1" } dependency { groupId = "net.bytebuddy" artifactId = "byte-buddy-agent" - version = "1.16.1" + version = "1.17.1" } } diff --git a/pom.xml b/pom.xml index 83d9caab4a..7c1a1d7336 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ 2.2 3.27.3 5.16.0 - 1.16.1 + 1.17.1 jacoco -- cgit v1.2.3 From 8720b352a924e321df299e1308eca490e6aa5f68 Mon Sep 17 00:00:00 2001 From: Ben Rohlfs Date: Tue, 25 Feb 2025 10:01:37 +0100 Subject: Insert the Change-Id at the end of the footer block This is a follow-up of change 1208616. The goal is to get even closer to consistency with Gerrit's commit-msg hook. The modified test cases were all verified against what the commit-msg hook would do with the same commit message. The substantial change is that within the footer block we are putting the Change-Id also after lines matching `includeInFooterPattern`, not just after lines matching `footerPattern`. That are lines that start either with a space or with an opening bracket. Change-Id: I39305154e653f8f5adb6b75ca0f6b349b720e9d8 --- .../org/eclipse/jgit/util/ChangeIdUtilTest.java | 24 ++++++++++++++++------ .../src/org/eclipse/jgit/util/ChangeIdUtil.java | 3 +-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java index 95c2fe3b51..44e8632228 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/ChangeIdUtilTest.java @@ -220,23 +220,23 @@ public class ChangeIdUtilTest { @Test public void testACommitWithSubjectBodyBugBrackersAndSob() throws Exception { assertEquals( - "a commit with subject body, bug. brackers and sob\n\nText\n\nBug: 33\nChange-Id: I90ecb589bef766302532c3e00915e10114b00f62\n[bracket]\nSigned-off-by: me@you.too\n", - call("a commit with subject body, bug. brackers and sob\n\nText\n\nBug: 33\n[bracket]\nSigned-off-by: me@you.too\n\n")); + "a commit with subject body, bug, brackers and sob\n\nText\n\nBug: 33\n[bracket]\nChange-Id: I94dc6ed919a4baaa7c1bf8712717b888c6b90363\nSigned-off-by: me@you.too\n", + call("a commit with subject body, bug, brackers and sob\n\nText\n\nBug: 33\n[bracket]\nSigned-off-by: me@you.too\n\n")); } @Test public void testACommitWithSubjectBodyBugLineWithASpaceAndSob() throws Exception { assertEquals( - "a commit with subject body, bug. line with a space and sob\n\nText\n\nBug: 33\nChange-Id: I864e2218bdee033c8ce9a7f923af9e0d5dc16863\n \nSigned-off-by: me@you.too\n", - call("a commit with subject body, bug. line with a space and sob\n\nText\n\nBug: 33\n \nSigned-off-by: me@you.too\n\n")); + "a commit with subject body, bug, line with a space and sob\n\nText\n\nBug: 33\n \nChange-Id: I126b472d2e0e64ad8187d61857f0169f9ccdae86\nSigned-off-by: me@you.too\n", + call("a commit with subject body, bug, line with a space and sob\n\nText\n\nBug: 33\n \nSigned-off-by: me@you.too\n\n")); } @Test public void testACommitWithSubjectBodyBugEmptyLineAndSob() throws Exception { assertEquals( - "a commit with subject body, bug. empty line and sob\n\nText\n\nBug: 33\nChange-Id: I33f119f533313883e6ada3df600c4f0d4db23a76\n \nSigned-off-by: me@you.too\n", - call("a commit with subject body, bug. empty line and sob\n\nText\n\nBug: 33\n \nSigned-off-by: me@you.too\n\n")); + "a commit with subject body, bug, empty line and sob\n\nText\n\nBug: 33\n\nChange-Id: Ic3b61b6e39a0815669b65302e9e75e6a5a019a26\nSigned-off-by: me@you.too\n", + call("a commit with subject body, bug, empty line and sob\n\nText\n\nBug: 33\n\nSigned-off-by: me@you.too\n\n")); } @Test @@ -539,6 +539,18 @@ public class ChangeIdUtilTest { "Bug: 42\n" + // SOB1)); + assertEquals("a\n" + // + "\n" + // + "Bug: 42\n" + // + " multi-line Bug footer\n" + // + "Change-Id: Icc953ef35f1a4ee5eb945132aefd603ae3d9dd9f\n" + // + SOB1,// + call("a\n" + // + "\n" + // + "Bug: 42\n" + // + " multi-line Bug footer\n" + // + SOB1)); + assertEquals("a\n" + // "\n" + // "Issue: 42\n" + // diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java index cd169f9bb7..c8421d6012 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/ChangeIdUtil.java @@ -159,8 +159,7 @@ public class ChangeIdUtil { int footerFirstLine = indexOfFirstFooterLine(lines); int insertAfter = footerFirstLine; for (int i = footerFirstLine; i < lines.length; ++i) { - if (footerPattern.matcher(lines[i]).matches() && - !signedOffByPattern.matcher(lines[i]).matches()) { + if (!signedOffByPattern.matcher(lines[i]).matches()) { insertAfter = i + 1; continue; } -- cgit v1.2.3 From 68f454af418224b1ba654337c073bfb06cfb16c6 Mon Sep 17 00:00:00 2001 From: Jonathing Date: Sun, 23 Feb 2025 18:11:01 -0500 Subject: DescribeCommand: Add exclusion matches using setExclude() As of right now, the describe command in JGit only supports adding matches for tag inclusion. It does not support adding matches for excluding tags, which is something that can be done with git on the command line using the "--excludes" flag. This change adds a sister method to setMatches(), called setExcludes(), which does exactly that. A few preliminary tests have also been included in DescribeCommandTest. Change-Id: Id1449c7b83c42f1d875eabd5796c748507d69362 Signed-off-by: Jonathing --- .../org/eclipse/jgit/api/DescribeCommandTest.java | 22 +++++++++ .../src/org/eclipse/jgit/api/DescribeCommand.java | 57 +++++++++++++++++++--- 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java index ab87fa9662..060e6d3e84 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/DescribeCommandTest.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.api; import static java.nio.charset.StandardCharsets.UTF_8; import static org.eclipse.jgit.lib.Constants.OBJECT_ID_ABBREV_STRING_LENGTH; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -87,6 +88,9 @@ public class DescribeCommandTest extends RepositoryTestCase { assertEquals("alice-t1", describe(c2, "alice*")); assertEquals("alice-t1", describe(c2, "a*", "b*", "c*")); + assertNotEquals("alice-t1", describeExcluding(c2, "alice*")); + assertNotEquals("alice-t1", describeCommand(c2).setMatch("*").setExclude("alice*").call()); + assertEquals("bob-t2", describe(c3)); assertEquals("bob-t2-0-g44579eb", describe(c3, true, false)); assertEquals("alice-t1-1-g44579eb", describe(c3, "alice*")); @@ -95,6 +99,15 @@ public class DescribeCommandTest extends RepositoryTestCase { assertEquals("bob-t2", describe(c3, "?ob*")); assertEquals("bob-t2", describe(c3, "a*", "b*", "c*")); + assertNotEquals("alice-t1-1-g44579eb", describeExcluding(c3, "alice*")); + assertNotEquals("alice-t1-1-g44579eb", describeCommand(c3).setMatch("*").setExclude("alice*").call()); + assertNotEquals("alice-t1-1-g44579eb", describeExcluding(c3, "a??c?-t*")); + assertNotEquals("alice-t1-1-g44579eb", describeCommand(c3).setMatch("bob*").setExclude("a??c?-t*").call()); + assertNotEquals("bob-t2", describeExcluding(c3, "bob*")); + assertNotEquals("bob-t2", describeCommand(c3).setMatch("alice*").setExclude("bob*")); + assertNotEquals("bob-t2", describeExcluding(c3, "?ob*")); + assertNotEquals("bob-t2", describeCommand(c3).setMatch("a??c?-t*").setExclude("?ob*")); + // the value verified with git-describe(1) assertEquals("bob-t2-1-g3e563c5", describe(c4)); assertEquals("bob-t2-1-g3e563c5", describe(c4, true, false)); @@ -518,6 +531,15 @@ public class DescribeCommandTest extends RepositoryTestCase { .setMatch(patterns).call(); } + private String describeExcluding(ObjectId c1, String... patterns) throws Exception { + return git.describe().setTarget(c1).setTags(describeUseAllTags) + .setExclude(patterns).call(); + } + + private DescribeCommand describeCommand(ObjectId c1) throws Exception { + return git.describe().setTarget(c1).setTags(describeUseAllTags); + } + private static void assertNameStartsWith(ObjectId c4, String prefix) { assertTrue(c4.name(), c4.name().startsWith(prefix)); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java index 934245781f..898f4464fd 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java @@ -75,6 +75,11 @@ public class DescribeCommand extends GitCommand { */ private List matchers = new ArrayList<>(); + /** + * Pattern matchers to be applied to tags for exclusion. + */ + private List excludeMatchers = new ArrayList<>(); + /** * Whether to use all refs in the refs/ namespace */ @@ -263,6 +268,27 @@ public class DescribeCommand extends GitCommand { return this; } + /** + * Sets one or more {@code glob(7)} patterns that tags must not match to be + * considered. If multiple patterns are provided, they will all be applied. + * + * @param patterns + * the {@code glob(7)} pattern or patterns + * @return {@code this} + * @throws org.eclipse.jgit.errors.InvalidPatternException + * if the pattern passed in was invalid. + * @see Git documentation about describe + * @since 7.2 + */ + public DescribeCommand setExclude(String... patterns) throws InvalidPatternException { + for (String p : patterns) { + excludeMatchers.add(new FileNameMatcher(p, null)); + } + return this; + } + private final Comparator TAG_TIE_BREAKER = new Comparator<>() { @Override @@ -284,22 +310,39 @@ public class DescribeCommand extends GitCommand { private Optional getBestMatch(List tags) { if (tags == null || tags.isEmpty()) { return Optional.empty(); - } else if (matchers.isEmpty()) { + } else if (matchers.isEmpty() && excludeMatchers.isEmpty()) { Collections.sort(tags, TAG_TIE_BREAKER); return Optional.of(tags.get(0)); } else { - // Find the first tag that matches in the stream of all tags - // filtered by matchers ordered by tie break order - Stream matchingTags = Stream.empty(); - for (FileNameMatcher matcher : matchers) { - Stream m = tags.stream().filter( + Stream matchingTags; + if (!matchers.isEmpty()) { + // Find the first tag that matches in the stream of all tags + // filtered by matchers ordered by tie break order + matchingTags = Stream.empty(); + for (FileNameMatcher matcher : matchers) { + Stream m = tags.stream().filter( tag -> { matcher.append(formatRefName(tag.getName())); boolean result = matcher.isMatch(); matcher.reset(); return result; }); - matchingTags = Stream.of(matchingTags, m).flatMap(i -> i); + matchingTags = Stream.of(matchingTags, m).flatMap(i -> i); + } + } else { + // If there are no matchers, there are only excluders + // Assume all tags match for now before applying excluders + matchingTags = tags.stream(); + } + + for (FileNameMatcher matcher : excludeMatchers) { + matchingTags = matchingTags.filter( + tag -> { + matcher.append(formatRefName(tag.getName())); + boolean result = matcher.isMatch(); + matcher.reset(); + return !result; + }); } return matchingTags.sorted(TAG_TIE_BREAKER).findFirst(); } -- cgit v1.2.3 From 8501e5d6ae374f779ab60abe2ad2eaa7ed07b071 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Feb 2025 10:02:34 +0100 Subject: DescribeCommand: remove unnecessary else clause and reduce indentation. Change-Id: I60a6f721eed051d67aa385a143e2bd3a950485f7 --- .../src/org/eclipse/jgit/api/DescribeCommand.java | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java index 898f4464fd..d2526287f9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/DescribeCommand.java @@ -313,39 +313,39 @@ public class DescribeCommand extends GitCommand { } else if (matchers.isEmpty() && excludeMatchers.isEmpty()) { Collections.sort(tags, TAG_TIE_BREAKER); return Optional.of(tags.get(0)); - } else { - Stream matchingTags; - if (!matchers.isEmpty()) { - // Find the first tag that matches in the stream of all tags - // filtered by matchers ordered by tie break order - matchingTags = Stream.empty(); - for (FileNameMatcher matcher : matchers) { - Stream m = tags.stream().filter( + } + + Stream matchingTags; + if (!matchers.isEmpty()) { + // Find the first tag that matches in the stream of all tags + // filtered by matchers ordered by tie break order + matchingTags = Stream.empty(); + for (FileNameMatcher matcher : matchers) { + Stream m = tags.stream().filter( // tag -> { matcher.append(formatRefName(tag.getName())); boolean result = matcher.isMatch(); matcher.reset(); return result; }); - matchingTags = Stream.of(matchingTags, m).flatMap(i -> i); - } - } else { - // If there are no matchers, there are only excluders - // Assume all tags match for now before applying excluders - matchingTags = tags.stream(); + matchingTags = Stream.of(matchingTags, m).flatMap(i -> i); } + } else { + // If there are no matchers, there are only excluders + // Assume all tags match for now before applying excluders + matchingTags = tags.stream(); + } - for (FileNameMatcher matcher : excludeMatchers) { - matchingTags = matchingTags.filter( + for (FileNameMatcher matcher : excludeMatchers) { + matchingTags = matchingTags.filter( // tag -> { matcher.append(formatRefName(tag.getName())); boolean result = matcher.isMatch(); matcher.reset(); return !result; }); - } - return matchingTags.sorted(TAG_TIE_BREAKER).findFirst(); } + return matchingTags.sorted(TAG_TIE_BREAKER).findFirst(); } private ObjectId getObjectIdFromRef(Ref r) throws JGitInternalException { -- cgit v1.2.3 From 6108fd8a29f445599d4b764967c53c65a229cd34 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 25 Feb 2025 09:45:15 +0100 Subject: Add --exclude option to describe CLI command Change-Id: I905f40750985571822e726cb6677aff45eeb5c49 --- .../tst/org/eclipse/jgit/pgm/DescribeTest.java | 20 ++++++++++++++++++++ .../org/eclipse/jgit/pgm/internal/CLIText.properties | 1 + .../src/org/eclipse/jgit/pgm/Describe.java | 4 ++++ 3 files changed, 25 insertions(+) diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DescribeTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DescribeTest.java index c78544309b..595767d3a0 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DescribeTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/DescribeTest.java @@ -122,6 +122,15 @@ public class DescribeTest extends CLIRepositoryTestCase { execute("git describe --match v1.*")); } + @Test + public void testDescribeExclude() throws Exception { + initialCommitAndTag(); + secondCommit(); + git.tag().setName("v2.0").call(); + assertArrayEquals(new String[] { "v1.0-1-g56f6ceb", "" }, + execute("git describe --exclude v2.*")); + } + @Test public void testDescribeCommitMultiMatch() throws Exception { initialCommitAndTag(); @@ -132,6 +141,17 @@ public class DescribeTest extends CLIRepositoryTestCase { execute("git describe --match v2.0* --match v2.1.*")); } + @Test + public void testDescribeCommitMultiExclude() throws Exception { + initialCommitAndTag(); + secondCommit(); + git.tag().setName("v2.0.0").call(); + git.tag().setName("v2.1.1").call(); + git.tag().setName("v2.2").call(); + assertArrayEquals("git yields v2.2", new String[] { "v2.2", "" }, + execute("git describe --exclude v2.0* --exclude v2.1.*")); + } + @Test public void testDescribeCommitNoMatch() throws Exception { initialCommitAndTag(); diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index f8b71c3046..80829b6638 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -279,6 +279,7 @@ usage_CreateAnEmptyGitRepository=Create an empty git repository usage_Describe=Show the most recent tag that is reachable from a commit usage_DiffAlgorithms=Test performance of jgit's diff algorithms usage_DisplayTheVersionOfJgit=Display the version of jgit +usage_Exclude=Do not consider tags matching the given glob(7) pattern, excluding the "refs/tags/" prefix usage_Gc=Cleanup unnecessary files and optimize the local repository usage_Glog=View commit history as a graph usage_DiffGuiTool=When git-difftool is invoked with the -g or --gui option the default diff tool will be read from the configured diff.guitool variable instead of diff.tool. diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java index 913d7c790d..2633336e12 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Describe.java @@ -44,6 +44,9 @@ class Describe extends TextBuiltin { @Option(name = "--match", usage = "usage_Match", metaVar = "metaVar_pattern") private List patterns = new ArrayList<>(); + @Option(name = "--exclude", usage = "usage_Exclude", metaVar = "metaVar_pattern") + private List excludes = new ArrayList<>(); + @Option(name = "--abbrev", usage = "usage_Abbrev") private Integer abbrev; @@ -59,6 +62,7 @@ class Describe extends TextBuiltin { cmd.setTags(useTags); cmd.setAlways(always); cmd.setMatch(patterns.toArray(new String[0])); + cmd.setExclude(excludes.toArray(new String[0])); if (abbrev != null) { cmd.setAbbrev(abbrev.intValue()); } -- cgit v1.2.3 From adab727fdaf77d96302ef8637f14d139409221fb Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Tue, 25 Feb 2025 11:34:49 -0800 Subject: StringUtils: new #trim method In [1] we could use a "trim" function to remove leading/trailing '/' from paths. [1] https://gerrithub.io/q/I1f2a07327d1a1d8149ee482bc2529b7e1a5303db Change-Id: I490e6afe5c8e6c164d07442b1b388f8a131b4c50 --- .../tst/org/eclipse/jgit/util/StringUtilsTest.java | 19 +++++++++++ .../src/org/eclipse/jgit/util/StringUtils.java | 38 ++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/StringUtilsTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/StringUtilsTest.java index 015da164c3..9a1c710752 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/StringUtilsTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/StringUtilsTest.java @@ -12,6 +12,7 @@ package org.eclipse.jgit.util; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; @@ -172,4 +173,22 @@ public class StringUtilsTest { assertEquals("foo bar ", StringUtils.commonPrefix("foo bar 42", "foo bar 24")); } + + @Test + public void testTrim() { + assertEquals("a", StringUtils.trim("a", '/')); + assertEquals("aaaa", StringUtils.trim("aaaa", '/')); + assertEquals("aaa", StringUtils.trim("/aaa", '/')); + assertEquals("aaa", StringUtils.trim("aaa/", '/')); + assertEquals("aaa", StringUtils.trim("/aaa/", '/')); + assertEquals("aa/aa", StringUtils.trim("/aa/aa/", '/')); + assertEquals("aa/aa", StringUtils.trim("aa/aa", '/')); + + assertEquals("", StringUtils.trim("", '/')); + assertEquals("", StringUtils.trim("/", '/')); + assertEquals("", StringUtils.trim("//", '/')); + assertEquals("", StringUtils.trim("///", '/')); + + assertNull(StringUtils.trim(null, '/')); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java index 2fbd12dcc5..e381a3bcc9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/StringUtils.java @@ -277,6 +277,44 @@ public final class StringUtils { return sb.toString(); } + /** + * Remove the specified character from beginning and end of a string + *

+ * If the character repeats, all copies + * + * @param str input string + * @param c character to remove + * @return the input string with c + * @since 7.2 + */ + public static String trim(String str, char c) { + if (str == null || str.length() == 0) { + return str; + } + + int endPos = str.length()-1; + while (endPos >= 0 && str.charAt(endPos) == c) { + endPos--; + } + + // Whole string is c + if (endPos == -1) { + return EMPTY; + } + + int startPos = 0; + while (startPos < endPos && str.charAt(startPos) == c) { + startPos++; + } + + if (startPos == 0 && endPos == str.length()-1) { + // No need to copy + return str; + } + + return str.substring(startPos, endPos+1); + } + /** * Appends {@link Constants#DOT_GIT_EXT} unless the given name already ends * with that suffix. -- cgit v1.2.3 From e328d203f20b8cd0a9b55678bfe3678ffd5d8179 Mon Sep 17 00:00:00 2001 From: Martin Fick Date: Thu, 13 Feb 2025 15:38:14 -0800 Subject: Do not load bitmap indexes during directory scans Previously, if a bitmap index had not been loaded yet, it would get loaded during a directory scan. Loading a bitmap file can be expensive and there is no immediate need to do so during a scan. Fix this by simply setting bitmap index file names on the Packs during directory scans so that bitmaps can be lazily loaded at some later point if they are needed. This change has the side affect of no longer marking a Pack valid if it is currently invalid simply because a bitmap file has been found, as there is no valid reason to do so and this can incorrectly mark a Pack without an index, or with other issues valid. Since the initial lack of a bitmap file, or an invalid one, or the deletion of one, would not result in the Pack being marked invalid, there is no need to overturn the invalid flag when a new bitmap file is found. Change-Id: I056acc09e7ae6a0982acd81b552d524190ebb4be Signed-off-by: Martin Fick --- .../resources/org/eclipse/jgit/internal/JGitText.properties | 2 -- .../src/org/eclipse/jgit/internal/JGitText.java | 2 -- .../src/org/eclipse/jgit/internal/storage/file/Pack.java | 13 ++----------- .../eclipse/jgit/internal/storage/file/PackDirectory.java | 9 +++------ 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 19c90086aa..c54c811b57 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -64,8 +64,6 @@ binaryHunkDecodeError=Binary hunk, line {0}: invalid input binaryHunkInvalidLength=Binary hunk, line {0}: input corrupt; expected length byte, got 0x{1} binaryHunkLineTooShort=Binary hunk, line {0}: input ended prematurely binaryHunkMissingNewline=Binary hunk, line {0}: input line not terminated by newline -bitmapAccessErrorForPackfile=Error whilst trying to access bitmap file for {} -bitmapFailedToGet=Failed to get bitmap index file {} bitmapMissingObject=Bitmap at {0} is missing {1}. bitmapsMustBePrepared=Bitmaps must be prepared before they may be written. bitmapUseNoopNoListener=Use NOOP instance for no listener diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 700b54a7a6..b7175508ee 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -94,8 +94,6 @@ public class JGitText extends TranslationBundle { /***/ public String binaryHunkInvalidLength; /***/ public String binaryHunkLineTooShort; /***/ public String binaryHunkMissingNewline; - /***/ public String bitmapAccessErrorForPackfile; - /***/ public String bitmapFailedToGet; /***/ public String bitmapMissingObject; /***/ public String bitmapsMustBePrepared; /***/ public String bitmapUseNoopNoListener; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java index 122d800582..5813d39e9a 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/Pack.java @@ -116,7 +116,7 @@ public class Pack implements Iterable { private volatile Exception invalidatingCause; @Nullable - private PackFile bitmapIdxFile; + private volatile PackFile bitmapIdxFile; private AtomicInteger transientErrorCount = new AtomicInteger(); @@ -1213,17 +1213,8 @@ public class Pack implements Iterable { return null; } - synchronized void refreshBitmapIndex(PackFile bitmapIndexFile) { - this.bitmapIdx = Optionally.empty(); - this.invalid = false; + void setBitmapIndexFile(PackFile bitmapIndexFile) { this.bitmapIdxFile = bitmapIndexFile; - try { - getBitmapIndex(); - } catch (IOException e) { - LOG.warn(JGitText.get().bitmapFailedToGet, bitmapIdxFile, e); - this.bitmapIdx = Optionally.empty(); - this.bitmapIdxFile = null; - } } private synchronized PackReverseIndex getReverseIdx() throws IOException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java index e31126f027..5cc7be4f98 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/PackDirectory.java @@ -459,12 +459,9 @@ class PackDirectory { && !oldPack.getFileSnapshot().isModified(packFile)) { forReuse.remove(packFile.getName()); list.add(oldPack); - try { - if(oldPack.getBitmapIndex() == null) { - oldPack.refreshBitmapIndex(packFilesByExt.get(BITMAP_INDEX)); - } - } catch (IOException e) { - LOG.warn(JGitText.get().bitmapAccessErrorForPackfile, oldPack.getPackName(), e); + PackFile bitMaps = packFilesByExt.get(BITMAP_INDEX); + if (bitMaps != null) { + oldPack.setBitmapIndexFile(bitMaps); } continue; } -- cgit v1.2.3 From 46d742588bb037a4a18f0a85e0e4f6834e654cd5 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 8 Feb 2025 20:10:47 +0100 Subject: AddCommand: implement --all/--no-all Command-line git stages deletions if file paths are given. (i.e., --all is implied.) File paths are also optional if --update or --all (or --no-all) are given. Add a setter and getter for an "all" flag on AddCommand. Check consistency with the "update" flag in call(). Make file paths optional (imply a "." path) if update is set or if setAll() had been called. If file paths are given, set the all flag. Stage deletions if update is set, or if the "all" flag is set. Add the C git command-line options for the "all" flag to jgit.pgm.Add. Bug: jgit-122 Change-Id: Iedddedcaa2d7a2e75162454ea047f34ec1cf3660 --- .../tst/org/eclipse/jgit/pgm/AddTest.java | 55 +++++++++++-- .../eclipse/jgit/pgm/internal/CLIText.properties | 5 +- .../src/org/eclipse/jgit/pgm/Add.java | 23 +++++- .../src/org/eclipse/jgit/pgm/internal/CLIText.java | 3 +- .../tst/org/eclipse/jgit/api/AddCommandTest.java | 18 ++++- .../tst/org/eclipse/jgit/lib/IndexDiffTest.java | 16 +++- .../src/org/eclipse/jgit/api/AddCommand.java | 89 ++++++++++++++++++++-- 7 files changed, 183 insertions(+), 26 deletions(-) diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java index 6d6374f172..a48fcbcd5a 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/AddTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Google Inc. and others + * Copyright (C) 2012, 2025 Google Inc. and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -12,7 +12,10 @@ package org.eclipse.jgit.pgm; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; + +import java.io.File; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.dircache.DirCache; @@ -32,12 +35,7 @@ public class AddTest extends CLIRepositoryTestCase { @Test public void testAddNothing() throws Exception { - try { - execute("git add"); - fail("Must die"); - } catch (Die e) { - // expected, requires argument - } + assertThrows(Die.class, () -> execute("git add")); } @Test @@ -45,6 +43,17 @@ public class AddTest extends CLIRepositoryTestCase { execute("git add --help"); } + @Test + public void testAddInvalidOptionCombinations() throws Exception { + writeTrashFile("greeting", "Hello, world!"); + assertThrows(Die.class, () -> execute("git add -u -A greeting")); + assertThrows(Die.class, + () -> execute("git add -u --ignore-removed greeting")); + // --renormalize implies -u + assertThrows(Die.class, + () -> execute("git add --renormalize --all greeting")); + } + @Test public void testAddAFile() throws Exception { writeTrashFile("greeting", "Hello, world!"); @@ -78,4 +87,34 @@ public class AddTest extends CLIRepositoryTestCase { assertNotNull(cache.getEntry("greeting")); assertEquals(1, cache.getEntryCount()); } + + @Test + public void testAddDeleted() throws Exception { + File greeting = writeTrashFile("greeting", "Hello, world!"); + git.add().addFilepattern("greeting").call(); + DirCache cache = db.readDirCache(); + assertNotNull(cache.getEntry("greeting")); + assertEquals(1, cache.getEntryCount()); + assertTrue(greeting.delete()); + assertArrayEquals(new String[] { "" }, // + execute("git add greeting")); + + cache = db.readDirCache(); + assertEquals(0, cache.getEntryCount()); + } + + @Test + public void testAddDeleted2() throws Exception { + File greeting = writeTrashFile("greeting", "Hello, world!"); + git.add().addFilepattern("greeting").call(); + DirCache cache = db.readDirCache(); + assertNotNull(cache.getEntry("greeting")); + assertEquals(1, cache.getEntryCount()); + assertTrue(greeting.delete()); + assertArrayEquals(new String[] { "" }, // + execute("git add -A")); + + cache = db.readDirCache(); + assertEquals(0, cache.getEntryCount()); + } } diff --git a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties index 80829b6638..e9630e9499 100644 --- a/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties +++ b/org.eclipse.jgit.pgm/resources/org/eclipse/jgit/pgm/internal/CLIText.properties @@ -12,6 +12,7 @@ ARGS=ARGS # default meta variable defined in the org.kohsuke.args4j.spi.OneArgumentOptionHandler N=N +addIncompatibleOptions=--update/-u cannot be combined with --all/-A/--no-ignore-removal or --no-all/--ignore-removal. Note that --renormalize implies --update. alreadyOnBranch=Already on ''{0}'' alreadyUpToDate=Already up-to-date. answerNo=n @@ -255,7 +256,9 @@ unsupportedOperation=Unsupported operation: {0} untrackedFiles=Untracked files: updating=Updating {0}..{1} usage_Abbrev=Instead of using the default number of hexadecimal digits (which will vary according to the number of objects in the repository with a default of 7) of the abbreviated object name, use digits, or as many digits as needed to form a unique object name. An of 0 will suppress long format, only showing the closest tag. -usage_addRenormalize=Apply the "clean" process freshly to tracked files to forcibly add them again to the index. This implies -u. +usage_addRenormalize=Apply the "clean" process freshly to tracked files to forcibly add them again to the index. This implies --update/-u. +usage_addStageDeletions=Add, modify, or remove index entries to match the working tree. Cannot be used with --update/-u. +usage_addDontStageDeletions=Only add or modify index entries, but do not remove index entries for which there is no file. (Don''t stage deletions.) Cannot be used with --update/-u. usage_Aggressive=This option will cause gc to more aggressively optimize the repository at the expense of taking much more time usage_All=Pack all refs, except hidden refs, broken refs, and symbolic refs. usage_AlwaysFallback=Show uniquely abbreviated commit object as fallback diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java index 2ebab5e5d2..dc9d77df35 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Add.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010, Sasa Zivkov and others + * Copyright (C) 2010, 2025 Sasa Zivkov and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -16,6 +16,7 @@ import java.util.List; import org.eclipse.jgit.api.AddCommand; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.pgm.internal.CLIText; import org.kohsuke.args4j.Argument; import org.kohsuke.args4j.Option; @@ -28,17 +29,33 @@ class Add extends TextBuiltin { @Option(name = "--update", aliases = { "-u" }, usage = "usage_onlyMatchAgainstAlreadyTrackedFiles") private boolean update = false; - @Argument(required = true, metaVar = "metaVar_filepattern", usage = "usage_filesToAddContentFrom") + @Option(name = "--all", aliases = { "-A", + "--no-ignore-removal" }, usage = "usage_addStageDeletions") + private Boolean all; + + @Option(name = "--no-all", aliases = { + "--ignore-removal" }, usage = "usage_addDontStageDeletions") + private void noAll(@SuppressWarnings("unused") boolean ignored) { + all = Boolean.FALSE; + } + + @Argument(metaVar = "metaVar_filepattern", usage = "usage_filesToAddContentFrom") private List filepatterns = new ArrayList<>(); @Override protected void run() throws Exception { try (Git git = new Git(db)) { - AddCommand addCmd = git.add(); if (renormalize) { update = true; } + if (update && all != null) { + throw die(CLIText.get().addIncompatibleOptions); + } + AddCommand addCmd = git.add(); addCmd.setUpdate(update).setRenormalize(renormalize); + if (all != null) { + addCmd.setAll(all.booleanValue()); + } for (String p : filepatterns) { addCmd.addFilepattern(p); } diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java index b5bf6d2bc3..bb1e950542 100644 --- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java +++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/internal/CLIText.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2010, 2013 Sasa Zivkov - * Copyright (C) 2013, 2021 Obeo and others + * Copyright (C) 2013, 2025 Obeo and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -91,6 +91,7 @@ public class CLIText extends TranslationBundle { } // @formatter:off + /***/ public String addIncompatibleOptions; /***/ public String alreadyOnBranch; /***/ public String alreadyUpToDate; /***/ public String answerNo; diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java index 1c2e995bbb..226677229c 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/AddCommandTest.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2010, Stefan Lay - * Copyright (C) 2010, Christian Halstrick and others + * Copyright (C) 2010, 2025 Christian Halstrick and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -665,11 +665,13 @@ public class AddCommandTest extends RepositoryTestCase { FileUtils.delete(file); // is supposed to do nothing - dc = git.add().addFilepattern("a.txt").call(); + dc = git.add().addFilepattern("a.txt").setAll(false).call(); assertEquals(oid, dc.getEntry(0).getObjectId()); assertEquals( "[a.txt, mode:100644, content:content]", indexState(CONTENT)); + git.add().addFilepattern("a.txt").call(); + assertEquals("", indexState(CONTENT)); } } @@ -690,11 +692,13 @@ public class AddCommandTest extends RepositoryTestCase { FileUtils.delete(file); // is supposed to do nothing - dc = git.add().addFilepattern("a.txt").call(); + dc = git.add().addFilepattern("a.txt").setAll(false).call(); assertEquals(oid, dc.getEntry(0).getObjectId()); assertEquals( "[a.txt, mode:100644, content:content]", indexState(CONTENT)); + git.add().addFilepattern("a.txt").call(); + assertEquals("", indexState(CONTENT)); } } @@ -964,7 +968,7 @@ public class AddCommandTest extends RepositoryTestCase { // file sub/b.txt is deleted FileUtils.delete(file2); - git.add().addFilepattern("sub").call(); + git.add().addFilepattern("sub").setAll(false).call(); // change in sub/a.txt is staged // deletion of sub/b.txt is not staged // sub/c.txt is staged @@ -973,6 +977,12 @@ public class AddCommandTest extends RepositoryTestCase { "[sub/b.txt, mode:100644, content:content b]" + "[sub/c.txt, mode:100644, content:content c]", indexState(CONTENT)); + git.add().addFilepattern("sub").call(); + // deletion of sub/b.txt is staged + assertEquals( + "[sub/a.txt, mode:100644, content:modified content]" + + "[sub/c.txt, mode:100644, content:content c]", + indexState(CONTENT)); } } diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java index 2b7b6ca76c..cd98606e53 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java @@ -2,7 +2,7 @@ * Copyright (C) 2007, Dave Watson * Copyright (C) 2008, Robin Rosenberg * Copyright (C) 2008, Shawn O. Pearce - * Copyright (C) 2013, Robin Stocker and others + * Copyright (C) 2013, 2025 Robin Stocker and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -539,7 +539,7 @@ public class IndexDiffTest extends RepositoryTestCase { assertTrue(diff.getAssumeUnchanged().contains("file3")); assertTrue(diff.getModified().contains("file")); - git.add().addFilepattern(".").call(); + git.add().addFilepattern(".").setAll(false).call(); iterator = new FileTreeIterator(db); diff = new IndexDiff(db, Constants.HEAD, iterator); @@ -551,6 +551,18 @@ public class IndexDiffTest extends RepositoryTestCase { assertTrue(diff.getAssumeUnchanged().contains("file3")); assertTrue(diff.getChanged().contains("file")); assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders()); + + git.add().addFilepattern(".").call(); + + iterator = new FileTreeIterator(db); + diff = new IndexDiff(db, Constants.HEAD, iterator); + diff.diff(); + assertEquals(1, diff.getAssumeUnchanged().size()); + assertEquals(0, diff.getModified().size()); + assertEquals(1, diff.getChanged().size()); + assertTrue(diff.getAssumeUnchanged().contains("file2")); + assertTrue(diff.getChanged().contains("file")); + assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders()); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java index c895dc9aaa..fd2ed37bb8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java @@ -1,6 +1,6 @@ /* * Copyright (C) 2010, Christian Halstrick - * Copyright (C) 2010, Stefan Lay and others + * Copyright (C) 2010, 2025 Stefan Lay and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -17,6 +17,7 @@ import static org.eclipse.jgit.lib.FileMode.TYPE_TREE; import java.io.IOException; import java.io.InputStream; +import java.text.MessageFormat; import java.time.Instant; import java.util.ArrayList; import java.util.List; @@ -59,8 +60,15 @@ public class AddCommand extends GitCommand { private WorkingTreeIterator workingTreeIterator; + // Update only known index entries, don't add new ones. If there's no file + // for an index entry, remove it: stage deletions. private boolean update = false; + // If TRUE, also stage deletions, otherwise only update and add index + // entries. + // If not set explicitly + private Boolean all; + // This defaults to true because it's what JGit has been doing // traditionally. The C git default would be false. private boolean renormalize = true; @@ -82,6 +90,17 @@ public class AddCommand extends GitCommand { * A directory name (e.g. dir to add dir/file1 and * dir/file2) can also be given to add all files in the * directory, recursively. Fileglobs (e.g. *.c) are not yet supported. + *

+ *

+ * If a pattern {@code "."} is added, all changes in the git repository's + * working tree will be added. + *

+ *

+ * File patterns are required unless {@code isUpdate() == true} or + * {@link #setAll(boolean)} is called. If so and no file patterns are given, + * all changes will be added (i.e., a file pattern of {@code "."} is + * implied). + *

* * @param filepattern * repository-relative path of file/directory to add (with @@ -113,15 +132,41 @@ public class AddCommand extends GitCommand { * Executes the {@code Add} command. Each instance of this class should only * be used for one invocation of the command. Don't call this method twice * on an instance. + *

+ * + * @throws JGitInternalException + * on errors, but also if {@code isUpdate() == true} _and_ + * {@link #setAll(boolean)} had been called + * @throws NoFilepatternException + * if no file patterns are given if {@code isUpdate() == false} + * and {@link #setAll(boolean)} was not called */ @Override public DirCache call() throws GitAPIException, NoFilepatternException { - - if (filepatterns.isEmpty()) - throw new NoFilepatternException(JGitText.get().atLeastOnePatternIsRequired); checkCallable(); + + if (update && all != null) { + throw new JGitInternalException(MessageFormat.format( + JGitText.get().illegalCombinationOfArguments, + "--update", "--all/--no-all")); //$NON-NLS-1$ //$NON-NLS-2$ + } + boolean addAll; + if (filepatterns.isEmpty()) { + if (update || all != null) { + addAll = true; + } else { + throw new NoFilepatternException( + JGitText.get().atLeastOnePatternIsRequired); + } + } else { + addAll = filepatterns.contains("."); //$NON-NLS-1$ + if (all == null && !update) { + all = Boolean.TRUE; + } + } + boolean stageDeletions = update || all != null && all.booleanValue(); + DirCache dc = null; - boolean addAll = filepatterns.contains("."); //$NON-NLS-1$ try (ObjectInserter inserter = repo.newObjectInserter(); NameConflictTreeWalk tw = new NameConflictTreeWalk(repo)) { @@ -181,7 +226,8 @@ public class AddCommand extends GitCommand { if (f == null) { // working tree file does not exist if (entry != null - && (!update || GITLINK == entry.getFileMode())) { + && (!stageDeletions + || GITLINK == entry.getFileMode())) { builder.add(entry); } continue; @@ -252,7 +298,8 @@ public class AddCommand extends GitCommand { } /** - * Set whether to only match against already tracked files + * Set whether to only match against already tracked files. If + * {@code update == true}, re-sets a previous {@link #setAll(boolean)}. * * @param update * If set to true, the command only matches {@code filepattern} @@ -314,4 +361,32 @@ public class AddCommand extends GitCommand { public boolean isRenormalize() { return renormalize; } + + /** + * Defines whether the command will use '--all' mode: update existing index + * entries, add new entries, and remove index entries for which there is no + * file. (In other words: also stage deletions.) + *

+ * The setting is independent of {@link #setUpdate(boolean)}. + *

+ * + * @param all + * whether to enable '--all' mode + * @return {@code this} + * @since 7.2 + */ + public AddCommand setAll(boolean all) { + this.all = Boolean.valueOf(all); + return this; + } + + /** + * Tells whether '--all' has been set for this command. + * + * @return {@code true} if it was set; {@code false} otherwise + * @since 7.2 + */ + public boolean isAll() { + return all != null && all.booleanValue(); + } } -- cgit v1.2.3 From 04ff530a2988976ad3016c36fb43f94ca7e21af8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 26 Feb 2025 02:16:41 +0100 Subject: AddCommand: Use parenthesis to make the operator precedence explicit Fixes errorprone error [OperatorPrecedence], see https://errorprone.info/bugpattern/OperatorPrecedence Change-Id: I3086ac0238bcf4661de6a69b1c133a4f64a3a8d4 --- org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java index fd2ed37bb8..b4d1cab513 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/AddCommand.java @@ -164,7 +164,7 @@ public class AddCommand extends GitCommand { all = Boolean.TRUE; } } - boolean stageDeletions = update || all != null && all.booleanValue(); + boolean stageDeletions = update || (all != null && all.booleanValue()); DirCache dc = null; -- cgit v1.2.3 From 4bd76e6bc91b588b925120945669db1e2b48ab45 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 15 Feb 2025 17:46:41 +0100 Subject: [ssh, releng] Remove net.i2p.crypto.eddsa It's no longer needed; Apache MINA sshd now can work with the Bouncy Castle ed25519 implementation. Get rid of the unmaintained net.i2p bundle as dependency and drop it from the p2 repository. Also remove the hacky export of sun.security.x509 in oej.ssh.apache; it was added because of buggy test (sic!) dependency in net.i2p. In the bazel build make the Bouncy Castle libraries available to the ssh tests so that they have ed25519 even without the net.i2p library. Remove the net.i2p (eddsa) library throughout. Change-Id: I8e79afa84b8cce62ac8c3436c36fb02507af75b3 --- WORKSPACE | 6 ------ lib/BUILD | 16 ++++++---------- .../org.eclipse.jgit.repository/category.xml | 6 ------ .../org.eclipse.jgit.target/jgit-4.32.target | 4 +--- .../org.eclipse.jgit.target/jgit-4.33.target | 4 +--- .../org.eclipse.jgit.target/jgit-4.34.target | 4 +--- .../org.eclipse.jgit.target/jgit-4.35.target | 4 +--- .../org.eclipse.jgit.target/orbit/orbit-4.32.tpd | 2 -- .../org.eclipse.jgit.target/orbit/orbit-4.33.tpd | 2 -- .../org.eclipse.jgit.target/orbit/orbit-4.34.tpd | 2 -- .../org.eclipse.jgit.target/orbit/orbit-4.35.tpd | 2 -- org.eclipse.jgit.ssh.apache.test/BUILD | 4 +++- org.eclipse.jgit.ssh.apache/BUILD | 1 - org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 6 ++---- org.eclipse.jgit.ssh.apache/pom.xml | 7 ------- .../src/sun/security/x509/README.md | 3 --- org.eclipse.jgit.ssh.jsch.test/BUILD | 4 +++- 17 files changed, 18 insertions(+), 59 deletions(-) delete mode 100644 org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md diff --git a/WORKSPACE b/WORKSPACE index dea15ed7ab..505141c472 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -72,12 +72,6 @@ maven_jar( sha1 = "e4ba98f1d4b3c80ec46392f25e094a6a2e58fcbf", ) -maven_jar( - name = "eddsa", - artifact = "net.i2p.crypto:eddsa:0.3.0", - sha1 = "1901c8d4d8bffb7d79027686cfb91e704217c3e1", -) - maven_jar( name = "jsch", artifact = "com.jcraft:jsch:0.1.55", diff --git a/lib/BUILD b/lib/BUILD index d26ccae4eb..d236b3a8ee 100644 --- a/lib/BUILD +++ b/lib/BUILD @@ -54,16 +54,6 @@ java_library( exports = ["@commons-logging//jar"], ) -java_library( - name = "eddsa", - visibility = [ - "//org.eclipse.jgit.ssh.apache:__pkg__", - "//org.eclipse.jgit.ssh.apache.test:__pkg__", - "//org.eclipse.jgit.ssh.jsch.test:__pkg__", - ], - exports = ["@eddsa//jar"], -) - java_library( name = "gson", visibility = [ @@ -218,6 +208,8 @@ java_library( visibility = [ "//org.eclipse.jgit.gpg.bc:__pkg__", "//org.eclipse.jgit.gpg.bc.test:__pkg__", + "//org.eclipse.jgit.ssh.apache.test:__pkg__", + "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], exports = ["@bcprov//jar"], @@ -228,6 +220,8 @@ java_library( visibility = [ "//org.eclipse.jgit.gpg.bc:__pkg__", "//org.eclipse.jgit.gpg.bc.test:__pkg__", + "//org.eclipse.jgit.ssh.apache.test:__pkg__", + "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], exports = ["@bcutil//jar"], @@ -237,6 +231,8 @@ java_library( name = "bcpkix", visibility = [ "//org.eclipse.jgit.gpg.bc:__pkg__", + "//org.eclipse.jgit.ssh.apache.test:__pkg__", + "//org.eclipse.jgit.ssh.jsch.test:__pkg__", "//org.eclipse.jgit.test:__pkg__", ], exports = ["@bcpkix//jar"], 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 de5477203e..eef699cfa1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/category.xml @@ -123,12 +123,6 @@ - - - - - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target index d6888137cf..60baf0b7cf 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.32.target @@ -1,15 +1,13 @@ - + - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target index b911f80b0e..1558ad68fc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.33.target @@ -1,15 +1,13 @@ - + - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target index 09b39c4375..bc35d2c7eb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.34.target @@ -1,15 +1,13 @@ - + - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target index 3ae26bc1dd..15cabc3d1f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.35.target @@ -1,15 +1,13 @@ - + - - diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd index 480e96e2e8..59fcd8745a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.32.tpd @@ -6,8 +6,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd index 8dca4cb681..2cfa0a8e7c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.33.tpd @@ -6,8 +6,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd index 15931db8c7..d3e15bba6d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.34.tpd @@ -6,8 +6,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd index 9e47c1c0d8..ec6996e427 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.35.tpd @@ -6,8 +6,6 @@ location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025 com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] org.apache.ant [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.ant.source [1.10.15.v20240901-1000,1.10.15.v20240901-1000] org.apache.httpcomponents.httpclient [4.5.14,4.5.14] diff --git a/org.eclipse.jgit.ssh.apache.test/BUILD b/org.eclipse.jgit.ssh.apache.test/BUILD index dfc059f0a3..bf796c058e 100644 --- a/org.eclipse.jgit.ssh.apache.test/BUILD +++ b/org.eclipse.jgit.ssh.apache.test/BUILD @@ -8,7 +8,9 @@ load( ) DEPS = [ - "//lib:eddsa", + "//lib:bcpkix", + "//lib:bcprov", + "//lib:bcutil", "//lib:junit", "//lib:slf4j-api", "//lib:sshd-osgi", diff --git a/org.eclipse.jgit.ssh.apache/BUILD b/org.eclipse.jgit.ssh.apache/BUILD index fd88a8a88a..83709c35cb 100644 --- a/org.eclipse.jgit.ssh.apache/BUILD +++ b/org.eclipse.jgit.ssh.apache/BUILD @@ -12,7 +12,6 @@ java_library( resource_strip_prefix = "org.eclipse.jgit.ssh.apache/resources", resources = RESOURCES, deps = [ - "//lib:eddsa", "//lib:slf4j-api", "//lib:sshd-osgi", "//lib:sshd-sftp", diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index aae7bf1b1a..71460f72cf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -36,10 +36,8 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends: org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.2.0", - sun.security.x509 -Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)", - org.apache.sshd.agent;version="[2.15.0,2.16.0)", + org.eclipse.jgit.transport.sshd.agent;version="7.2.0" +Import-Package: org.apache.sshd.agent;version="[2.15.0,2.16.0)", org.apache.sshd.client;version="[2.15.0,2.16.0)", org.apache.sshd.client.auth;version="[2.15.0,2.16.0)", org.apache.sshd.client.auth.keyboard;version="[2.15.0,2.16.0)", diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index a002290378..8b9ff5034c 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -30,7 +30,6 @@ ${project.build.directory}/META-INF/SOURCE-MANIFEST.MF - 0.3.0 @@ -62,12 +61,6 @@ - - net.i2p.crypto - eddsa - ${eddsa-version} - - org.slf4j slf4j-api diff --git a/org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md b/org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md deleted file mode 100644 index a84ee37ffb..0000000000 --- a/org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This dummy package is used to fix the error -"Missing requirement: net.i2p.crypto.eddsa 0.3.0 requires 'java.package; sun.security.x509 0.0.0'" -raised since eddsa falsely requires this import \ No newline at end of file diff --git a/org.eclipse.jgit.ssh.jsch.test/BUILD b/org.eclipse.jgit.ssh.jsch.test/BUILD index 4a8b92518e..d4e6875ed8 100644 --- a/org.eclipse.jgit.ssh.jsch.test/BUILD +++ b/org.eclipse.jgit.ssh.jsch.test/BUILD @@ -8,7 +8,9 @@ junit_tests( srcs = glob(["tst/**/*.java"]), tags = ["jsch"], deps = [ - "//lib:eddsa", + "//lib:bcpkix", + "//lib:bcprov", + "//lib:bcutil", "//lib:jsch", "//lib:junit", "//org.eclipse.jgit:jgit", -- cgit v1.2.3 From ce3b62c417f3db0a7a3ed25de23af7c73008c923 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 10 Feb 2025 18:53:42 +0100 Subject: [ssh known_hosts] Add tests and fix problems Add tests for known_hosts handling and fix two problems uncovered. When host patterns from different known_host files matched, but none had the key wanted, and the user said to accept the new key and store it, we'd try to always update a line read from the second file in the first file. As a result the new host key was not stored. Fix this by ensuring that we always try to modify the file the matching line was read from. When adding a new key (no host patterns matched), the new line would have duplicates in the host patterns, for instance, twice the same hostname. It did not have the IP address, though. Fix this by making sure we also add the IP address to the candidates to check against host patterns, and avoid writing duplicates when the new line is added to the file. Change-Id: I4c61050422ea635fb9bc30f585f00287fc437486 --- .../META-INF/MANIFEST.MF | 3 + .../sshd/OpenSshServerKeyDatabaseTest.java | 410 +++++++++++++++++++++ .../transport/sshd/OpenSshServerKeyDatabase.java | 68 ++-- 3 files changed, 455 insertions(+), 26 deletions(-) create mode 100644 org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 2d4f5445c9..f497975979 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -11,6 +11,7 @@ Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: org.apache.sshd.client.config.hosts;version="[2.15.0,2.16.0)", org.apache.sshd.common;version="[2.15.0,2.16.0)", org.apache.sshd.common.auth;version="[2.15.0,2.16.0)", + org.apache.sshd.common.cipher;version="[2.15.0,2.16.0)", org.apache.sshd.common.config.keys;version="[2.15.0,2.16.0)", org.apache.sshd.common.helpers;version="[2.15.0,2.16.0)", org.apache.sshd.common.kex;version="[2.15.0,2.16.0)", @@ -23,8 +24,10 @@ Import-Package: org.apache.sshd.client.config.hosts;version="[2.15.0,2.16.0)", org.apache.sshd.core;version="[2.15.0,2.16.0)", org.apache.sshd.server;version="[2.15.0,2.16.0)", org.apache.sshd.server.forward;version="[2.15.0,2.16.0)", + org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", org.eclipse.jgit.api;version="[7.2.0,7.3.0)", org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.signing.ssh;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", org.eclipse.jgit.internal.transport.sshd;version="[7.2.0,7.3.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java new file mode 100644 index 0000000000..ab39e0ed9b --- /dev/null +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java @@ -0,0 +1,410 @@ +/* + * Copyright (C) 2025 Thomas Wolf and others + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. + * + * SPDX-License-Identifier: BSD-3-Clause + */ +package org.eclipse.jgit.internal.transport.sshd; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.nio.file.Files; +import java.nio.file.Path; +import java.security.KeyPairGenerator; +import java.security.PublicKey; +import java.util.ArrayList; +import java.util.List; + +import org.apache.sshd.common.SshConstants; +import org.apache.sshd.common.cipher.ECCurves; +import org.apache.sshd.common.config.keys.KeyUtils; +import org.apache.sshd.common.config.keys.PublicKeyEntry; +import org.apache.sshd.common.util.security.SecurityUtils; +import org.eclipse.jgit.annotations.NonNull; +import org.eclipse.jgit.errors.UnsupportedCredentialItem; +import org.eclipse.jgit.transport.CredentialItem; +import org.eclipse.jgit.transport.CredentialsProvider; +import org.eclipse.jgit.transport.URIish; +import org.eclipse.jgit.transport.sshd.ServerKeyDatabase; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + +/** + * Tests for {@link OpenSshServerKeyDatabase}. + */ +public class OpenSshServerKeyDatabaseTest { + + private static final InetSocketAddress LOCAL = new InetSocketAddress( + InetAddress.getLoopbackAddress(), SshConstants.DEFAULT_PORT); + + private static final InetSocketAddress LOCAL_29418 = new InetSocketAddress( + InetAddress.getLoopbackAddress(), 29418); + + private static PublicKey rsa1024; + private static PublicKey rsa2048; + private static PublicKey ec256; + private static PublicKey ec384; + + @BeforeClass + public static void initKeys() throws Exception { + // Generate a few keys that we can use + KeyPairGenerator gen = SecurityUtils.getKeyPairGenerator(KeyUtils.RSA_ALGORITHM); + gen.initialize(1024); + rsa1024 = gen.generateKeyPair().getPublic(); + gen.initialize(2048); + rsa2048 = gen.generateKeyPair().getPublic(); + gen = SecurityUtils.getKeyPairGenerator(KeyUtils.EC_ALGORITHM); + ECCurves curve = ECCurves.fromCurveSize(256); + gen.initialize(curve.getParameters()); + ec256 = gen.generateKeyPair().getPublic(); + curve = ECCurves.fromCurveSize(384); + gen.initialize(curve.getParameters()); + ec384 = gen.generateKeyPair().getPublic(); + } + + @Rule + public TemporaryFolder tmp = new TemporaryFolder(); + + private Path knownHosts; + private Path knownHosts2; + private ServerKeyDatabase database; + + @Before + public void setupDatabase() throws Exception { + Path root = tmp.getRoot().toPath(); + knownHosts = root.resolve("known_hosts"); + knownHosts2 = root.resolve("known_hosts2"); + database = new OpenSshServerKeyDatabase(false, List.of(knownHosts, knownHosts2)); + } + + @Test + public void testFindInSecondFile() throws Exception { + Files.write(knownHosts, + List.of( + "some.other.host " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384))); + Files.write(knownHosts2, + List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(ec256), + "some.other.com " + PublicKeyEntry.toString(rsa2048))); + assertTrue(database.accept("localhost", LOCAL, ec256, + new KnownHostsConfig(), null)); + assertFalse(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + + @Test + public void testNoFirstFile() throws Exception { + Files.write(knownHosts2, + List.of("localhost,127.0.0.1 " + PublicKeyEntry.toString(ec256), + "some.other.com " + PublicKeyEntry.toString(rsa2048))); + assertTrue(database.accept("localhost", LOCAL, ec256, + new KnownHostsConfig(), null)); + } + + @Test + public void testFind() throws Exception { + Files.write(knownHosts, + List.of("localhost,127.0.0.1 " + + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384))); + Files.write(knownHosts2, + List.of("localhost,127.0.0.1 " + PublicKeyEntry.toString(ec256), + "some.other.com " + PublicKeyEntry.toString(rsa2048))); + assertTrue(database.accept("localhost", LOCAL, ec256, + new KnownHostsConfig(), null)); + assertTrue(database.accept("localhost:22", LOCAL, ec256, + new KnownHostsConfig(), null)); + assertTrue(database.accept("127.0.0.1", LOCAL, rsa1024, + new KnownHostsConfig(), null)); + assertTrue(database.accept("[127.0.0.1]:22", LOCAL, rsa1024, + new KnownHostsConfig(), null)); + assertFalse(database.accept("localhost:29418", LOCAL_29418, ec256, + new KnownHostsConfig(), null)); + assertFalse(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + + @Test + public void testModifyFile() throws Exception { + List initialKnownHosts = List.of( + "some.other.host " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384)); + Files.write(knownHosts, initialKnownHosts); + List initialKnownHosts2 = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(ec256), + "some.other.com " + PublicKeyEntry.toString(rsa2048)); + Files.write(knownHosts2, initialKnownHosts2); + assertFalse(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig(), null)); + assertFile(knownHosts, initialKnownHosts); + assertFile(knownHosts2, initialKnownHosts2); + assertFalse(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ACCEPT_NEW), + null)); + assertFile(knownHosts, initialKnownHosts); + assertFile(knownHosts2, initialKnownHosts2); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ACCEPT_ANY), + null)); + assertFile(knownHosts, initialKnownHosts); + assertFile(knownHosts2, initialKnownHosts2); + assertFalse(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + null)); + assertFile(knownHosts, initialKnownHosts); + assertFile(knownHosts2, initialKnownHosts2); + + TestCredentialsProvider ui = new TestCredentialsProvider(true, false); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + assertFile(knownHosts, initialKnownHosts); + assertFile(knownHosts2, initialKnownHosts2); + + ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + assertFile(knownHosts, initialKnownHosts); + assertFile(knownHosts2, List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(ec384), + "some.other.com " + PublicKeyEntry.toString(rsa2048))); + assertTrue(database.accept("127.0.0.1", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + + @Test + public void testModifyFirstFile() throws Exception { + List initialKnownHosts = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384)); + Files.write(knownHosts, initialKnownHosts); + List initialKnownHosts2 = List.of( + "some.other.host " + PublicKeyEntry.toString(ec256), + "some.other.com " + PublicKeyEntry.toString(rsa2048)); + Files.write(knownHosts2, initialKnownHosts2); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + assertFile(knownHosts, + List.of("localhost,127.0.0.1 " + PublicKeyEntry.toString(ec384), + "some.other.com " + PublicKeyEntry.toString(ec384))); + assertFile(knownHosts2, initialKnownHosts2); + assertTrue(database.accept("127.0.0.1:22", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + + @Test + public void testModifySecondFile() throws Exception { + List initialKnownHosts = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384)); + Files.write(knownHosts, initialKnownHosts); + List initialKnownHosts2 = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(ec256), + "some.other.com " + PublicKeyEntry.toString(rsa2048)); + Files.write(knownHosts2, initialKnownHosts2); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + assertFile(knownHosts, initialKnownHosts); + assertFile(knownHosts2, + List.of("localhost,127.0.0.1 " + PublicKeyEntry.toString(ec384), + "some.other.com " + PublicKeyEntry.toString(rsa2048))); + assertTrue(database.accept("127.0.0.1:22", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + + @Test + public void testAddNewKey() throws Exception { + List initialKnownHosts = List.of( + "some.other.host " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec256)); + Files.write(knownHosts, initialKnownHosts); + List initialKnownHosts2 = List + .of("some.other.com " + PublicKeyEntry.toString(rsa2048)); + Files.write(knownHosts2, initialKnownHosts2); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + List expected = new ArrayList<>(initialKnownHosts); + expected.add("localhost,127.0.0.1 " + PublicKeyEntry.toString(ec384)); + assertFile(knownHosts, expected); + assertFile(knownHosts2, initialKnownHosts2); + assertTrue(database.accept("127.0.0.1:22", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + + @Test + public void testCreateNewFile() throws Exception { + List initialKnownHosts2 = List + .of("some.other.com " + PublicKeyEntry.toString(ec256)); + Files.write(knownHosts2, initialKnownHosts2); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + assertFile(knownHosts, List + .of("localhost,127.0.0.1 " + PublicKeyEntry.toString(ec384))); + assertFile(knownHosts2, initialKnownHosts2); + assertTrue(database.accept("127.0.0.1:22", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + + @Test + public void testAddNewKey2() throws Exception { + List initialKnownHosts = List.of( + "some.other.host " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec256)); + Files.write(knownHosts, initialKnownHosts); + List initialKnownHosts2 = List + .of("some.other.com " + PublicKeyEntry.toString(rsa2048)); + Files.write(knownHosts2, initialKnownHosts2); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("127.0.0.1:29418", LOCAL_29418, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + List expected = new ArrayList<>(initialKnownHosts); + expected.add("[127.0.0.1]:29418,[localhost]:29418 " + + PublicKeyEntry.toString(ec384)); + assertFile(knownHosts, expected); + assertFile(knownHosts2, initialKnownHosts2); + assertTrue(database.accept("localhost:29418", LOCAL_29418, ec384, + new KnownHostsConfig(), null)); + } + + @Test + public void testAddNewKey3() throws Exception { + List initialKnownHosts = List.of( + "some.other.host " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec256)); + Files.write(knownHosts, initialKnownHosts); + List initialKnownHosts2 = List + .of("some.other.com " + PublicKeyEntry.toString(rsa2048)); + Files.write(knownHosts2, initialKnownHosts2); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost:29418", LOCAL_29418, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + List expected = new ArrayList<>(initialKnownHosts); + expected.add("[localhost]:29418,[127.0.0.1]:29418 " + + PublicKeyEntry.toString(ec384)); + assertFile(knownHosts, expected); + assertFile(knownHosts2, initialKnownHosts2); + assertTrue(database.accept("127.0.0.1:29418", LOCAL_29418, ec384, + new KnownHostsConfig(), null)); + } + + private void assertFile(Path path, List lines) throws Exception { + assertEquals(lines, Files.readAllLines(path).stream() + .filter(s -> !s.isBlank()).toList()); + } + + private static class TestCredentialsProvider extends CredentialsProvider { + + private final boolean[] values; + + int invocations = 0; + + TestCredentialsProvider(boolean accept, boolean store) { + values = new boolean[] { accept, store }; + } + + @Override + public boolean isInteractive() { + return true; + } + + @Override + public boolean supports(CredentialItem... items) { + return true; + } + + @Override + public boolean get(URIish uri, CredentialItem... items) + throws UnsupportedCredentialItem { + invocations++; + int i = 0; + for (CredentialItem item : items) { + if (item instanceof CredentialItem.YesNoType) { + ((CredentialItem.YesNoType) item) + .setValue(i < values.length && values[i++]); + } + } + return true; + } + } + + private static class KnownHostsConfig implements ServerKeyDatabase.Configuration { + + @NonNull + private final StrictHostKeyChecking check; + + KnownHostsConfig() { + this(StrictHostKeyChecking.REQUIRE_MATCH); + } + + KnownHostsConfig(@NonNull StrictHostKeyChecking check) { + this.check = check; + } + + @Override + public List getUserKnownHostsFiles() { + return List.of(); + } + + @Override + public List getGlobalKnownHostsFiles() { + return List.of(); + } + + @Override + public StrictHostKeyChecking getStrictHostKeyChecking() { + return check; + } + + @Override + public boolean getHashKnownHosts() { + return false; + } + + @Override + public String getUsername() { + return "user"; + } + + } +} diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java index 2b4f7e50ff..b57f9f4867 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018, 2021 Thomas Wolf and others + * Copyright (C) 2018, 2025 Thomas Wolf and others * * This program and the accompanying materials are made available under the * terms of the Eclipse Distribution License v. 1.0 which is available at @@ -31,9 +31,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Random; +import java.util.Set; import java.util.TreeSet; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; @@ -45,6 +47,7 @@ import org.apache.sshd.client.config.hosts.KnownHostHashValue; import org.apache.sshd.client.keyverifier.KnownHostsServerKeyVerifier.HostEntryPair; import org.apache.sshd.client.session.ClientSession; import org.apache.sshd.common.NamedFactory; +import org.apache.sshd.common.SshConstants; import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; import org.apache.sshd.common.config.keys.KeyUtils; import org.apache.sshd.common.config.keys.PublicKeyEntry; @@ -204,6 +207,7 @@ public class OpenSshServerKeyDatabase Collection candidates = getCandidates(connectAddress, remoteAddress); for (HostKeyFile file : filesToUse) { + HostEntryPair lastModified = modified[0]; try { if (find(candidates, serverKey, file.get(), modified)) { return true; @@ -212,14 +216,14 @@ public class OpenSshServerKeyDatabase ask.revokedKey(remoteAddress, serverKey, file.getPath()); return false; } - if (path == null && modified[0] != null) { + if (modified[0] != lastModified) { // Remember the file in which we might need to update the // entry path = file.getPath(); } } if (modified[0] != null) { - // We found an entry, but with a different key + // We found an entry, but with a different key. AskUser.ModifiedKeyHandling toDo = ask.acceptModifiedServerKey( remoteAddress, modified[0].getServerKey(), serverKey, path); @@ -274,24 +278,21 @@ public class OpenSshServerKeyDatabase HostEntryPair[] modified) throws RevokedKeyException { for (HostEntryPair current : entries) { KnownHostEntry entry = current.getHostEntry(); - for (SshdSocketAddress host : candidates) { - if (entry.isHostMatch(host.getHostName(), host.getPort())) { - boolean revoked = isRevoked(entry); - if (KeyUtils.compareKeys(serverKey, - current.getServerKey())) { - // Exact match - if (revoked) { - throw new RevokedKeyException(); - } - modified[0] = null; - return true; - } else if (!revoked) { - // Server sent a different key - modified[0] = current; - // Keep going -- maybe there's another entry for this - // host + if (candidates.stream().anyMatch(host -> entry + .isHostMatch(host.getHostName(), host.getPort()))) { + boolean revoked = isRevoked(entry); + if (KeyUtils.compareKeys(serverKey, current.getServerKey())) { + // Exact match + if (revoked) { + throw new RevokedKeyException(); } - break; + modified[0] = null; + return true; + } else if (!revoked) { + // Server sent a different key. + modified[0] = current; + // Keep going -- maybe there's another entry for this + // host } } } @@ -625,7 +626,7 @@ public class OpenSshServerKeyDatabase private SshdSocketAddress toSshdSocketAddress(@NonNull String address) { String host = null; - int port = 0; + int port = SshConstants.DEFAULT_PORT; if (HostPatternsHolder.NON_STANDARD_PORT_PATTERN_ENCLOSURE_START_DELIM == address .charAt(0)) { int end = address.indexOf( @@ -665,12 +666,23 @@ public class OpenSshServerKeyDatabase if (address != null) { candidates.add(address); } - return candidates; + List result = new ArrayList<>(); + result.addAll(candidates); + if (!remoteAddress.isUnresolved()) { + SshdSocketAddress ip = new SshdSocketAddress( + remoteAddress.getAddress().getHostAddress(), + remoteAddress.getPort()); + if (candidates.add(ip)) { + result.add(ip); + } + } + return result; } private String createHostKeyLine(Collection patterns, PublicKey key, Configuration config) throws Exception { StringBuilder result = new StringBuilder(); + Set knownNames = new HashSet<>(); if (config.getHashKnownHosts()) { // SHA1 is the only algorithm for host name hashing known to OpenSSH // or to Apache MINA sshd. @@ -680,10 +692,10 @@ public class OpenSshServerKeyDatabase prng = new SecureRandom(); } byte[] salt = new byte[mac.getDefaultBlockSize()]; - for (SshdSocketAddress address : patterns) { - if (result.length() > 0) { - result.append(','); - } + // For hashed hostnames, only one hashed pattern is allowed per + // https://man.openbsd.org/sshd.8#SSH_KNOWN_HOSTS_FILE_FORMAT + if (!patterns.isEmpty()) { + SshdSocketAddress address = patterns.iterator().next(); prng.nextBytes(salt); KnownHostHashValue.append(result, digester, salt, KnownHostHashValue.calculateHashValue( @@ -692,6 +704,10 @@ public class OpenSshServerKeyDatabase } } else { for (SshdSocketAddress address : patterns) { + String tgt = address.getHostName() + ':' + address.getPort(); + if (!knownNames.add(tgt)) { + continue; + } if (result.length() > 0) { result.append(','); } -- cgit v1.2.3 From 7c6b51cef016aa5ccdcebb8d2b1a1cf5ec963967 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 10 Feb 2025 19:12:14 +0100 Subject: [ssh known_hosts] Improve updating modified keys If there are several keys for a host in the known_hosts files, prefer reporting and updating a line for the same key type as the host key received from the server. For instance, if there's an RSA and an EC key for a server but neither match an EC host key received from that server, report and overwrite the EC key, not the RSA key. And vice versa: if the server sent an RSA key, report an update the line for the RSA key, not the one for the EC key. Change-Id: I30c8a23ffe15242469bc538edba68ac3e38c6a55 --- .../sshd/OpenSshServerKeyDatabaseTest.java | 49 ++++++++++++++++++++++ .../transport/sshd/OpenSshServerKeyDatabase.java | 42 ++++++++++++++++++- 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java index ab39e0ed9b..bdd044cbf1 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java @@ -215,6 +215,55 @@ public class OpenSshServerKeyDatabaseTest { new KnownHostsConfig(), null)); } + @Test + public void testModifyMatchingKeyType() throws Exception { + List initialKnownHosts = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384)); + Files.write(knownHosts, initialKnownHosts); + List initialKnownHosts2 = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(ec256), + "some.other.com " + PublicKeyEntry.toString(rsa2048)); + Files.write(knownHosts2, initialKnownHosts2); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost", LOCAL, rsa2048, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + assertFile(knownHosts, + List.of("localhost,127.0.0.1 " + + PublicKeyEntry.toString(rsa2048), + "some.other.com " + PublicKeyEntry.toString(ec384))); + assertFile(knownHosts2, initialKnownHosts2); + assertTrue(database.accept("127.0.0.1:22", LOCAL, rsa2048, + new KnownHostsConfig(), null)); + } + + @Test + public void testModifyMatchingKeyType2() throws Exception { + List initialKnownHosts = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(ec256), + "some.other.com " + PublicKeyEntry.toString(ec384)); + Files.write(knownHosts, initialKnownHosts); + List initialKnownHosts2 = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(rsa2048)); + Files.write(knownHosts2, initialKnownHosts2); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + assertFile(knownHosts, + List.of("localhost,127.0.0.1 " + PublicKeyEntry.toString(ec384), + "some.other.com " + PublicKeyEntry.toString(ec384))); + assertFile(knownHosts2, initialKnownHosts2); + assertTrue(database.accept("127.0.0.1:22", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + @Test public void testModifySecondFile() throws Exception { List initialKnownHosts = List.of( diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java index b57f9f4867..40f78ef8ca 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java @@ -276,6 +276,12 @@ public class OpenSshServerKeyDatabase private boolean find(Collection candidates, PublicKey serverKey, List entries, HostEntryPair[] modified) throws RevokedKeyException { + String keyType = KeyUtils.getKeyType(serverKey); + String modifiedKeyType = null; + if (modified[0] != null) { + modifiedKeyType = modified[0].getHostEntry().getKeyEntry() + .getKeyType(); + } for (HostEntryPair current : entries) { KnownHostEntry entry = current.getHostEntry(); if (candidates.stream().anyMatch(host -> entry @@ -290,7 +296,20 @@ public class OpenSshServerKeyDatabase return true; } else if (!revoked) { // Server sent a different key. - modified[0] = current; + if (modifiedKeyType == null) { + modified[0] = current; + modifiedKeyType = entry.getKeyEntry().getKeyType(); + } else if (!keyType.equals(modifiedKeyType)) { + String thisKeyType = entry.getKeyEntry().getKeyType(); + if (isBetterMatch(keyType, thisKeyType, + modifiedKeyType)) { + // Since we may replace the modified[0] key, + // prefer to report a key of the same key type + // as having been modified. + modified[0] = current; + modifiedKeyType = keyType; + } + } // Keep going -- maybe there's another entry for this // host } @@ -299,6 +318,27 @@ public class OpenSshServerKeyDatabase return false; } + private static boolean isBetterMatch(String keyType, String thisType, + String modifiedType) { + if (keyType.equals(thisType)) { + return true; + } + // EC keys are a bit special because they encode the curve in the key + // type. If we have no exactly matching EC key type in known_hosts, we + // still prefer to update an existing EC key type over some other key + // type. + if (!keyType.startsWith("ecdsa") || !thisType.startsWith("ecdsa")) { //$NON-NLS-1$ //$NON-NLS-2$ + return false; + } + if (!modifiedType.startsWith("ecdsa")) { //$NON-NLS-1$ + return true; + } + // All three are EC keys. thisType doesn't match the size of keyType + // (otherwise the two would have compared equal above already), so it is + // not better than modifiedType. + return false; + } + private List addUserHostKeyFiles(List fileNames) { if (fileNames == null || fileNames.isEmpty()) { return Collections.emptyList(); -- cgit v1.2.3 From c5bf0fba157dad5ce91d97a6c506ef7b86f5c374 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 10 Feb 2025 20:07:06 +0100 Subject: [ssh known_hosts] Handle host certificates Implement the "@cert-authority" marker and its handling: if the server sent an OpenSshCertificate, consider only entries marked as CA and look for the certificate's CA key. If the CA key cannot be found, just return false, rejecting the certificate. Never ask to add such keys to the file. Certificate authorities must always be added manually. Checking that the certificate is a valid host certificate and lists a matching principal is beyond the scope of the ServerKeyDatabase and is done in the key exchange even before the database is queried. In lookup(), skip CA keys. The purpose of lookup() is to do an early re-ordering of the signatures proposal in the initial key exchange, but since a CA key can be used to sign any other key of any key type it has no real benefit in this case. Also, the return value of lookup() is just a list of PublicKeys, so the caller couldn't distinguish CA keys from other keys anyway. Change-Id: I92c2c9d69d73cc4b125e8cad0262a48d2ec3c466 --- .../META-INF/MANIFEST.MF | 3 +- .../sshd/OpenSshServerKeyDatabaseTest.java | 101 +++++++++++++++++++++ .../internal/transport/sshd/SshdText.properties | 1 + .../transport/sshd/OpenSshServerKeyDatabase.java | 52 ++++++++--- .../jgit/internal/transport/sshd/SshdText.java | 1 + 5 files changed, 145 insertions(+), 13 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index f497975979..3ef870bca5 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -8,7 +8,8 @@ Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" -Import-Package: org.apache.sshd.client.config.hosts;version="[2.15.0,2.16.0)", +Import-Package: org.apache.sshd.certificate;version="[2.15.0,2.16.0)", + org.apache.sshd.client.config.hosts;version="[2.15.0,2.16.0)", org.apache.sshd.common;version="[2.15.0,2.16.0)", org.apache.sshd.common.auth;version="[2.15.0,2.16.0)", org.apache.sshd.common.cipher;version="[2.15.0,2.16.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java index bdd044cbf1..b2e6401816 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java @@ -17,11 +17,14 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.nio.file.Files; import java.nio.file.Path; +import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.PublicKey; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.TimeUnit; +import org.apache.sshd.certificate.OpenSshCertificateBuilder; import org.apache.sshd.common.SshConstants; import org.apache.sshd.common.cipher.ECCurves; import org.apache.sshd.common.config.keys.KeyUtils; @@ -54,6 +57,8 @@ public class OpenSshServerKeyDatabaseTest { private static PublicKey rsa2048; private static PublicKey ec256; private static PublicKey ec384; + private static PublicKey caKey; + private static PublicKey certificate; @BeforeClass public static void initKeys() throws Exception { @@ -67,9 +72,23 @@ public class OpenSshServerKeyDatabaseTest { ECCurves curve = ECCurves.fromCurveSize(256); gen.initialize(curve.getParameters()); ec256 = gen.generateKeyPair().getPublic(); + PublicKey certKey = gen.generateKeyPair().getPublic(); curve = ECCurves.fromCurveSize(384); gen.initialize(curve.getParameters()); ec384 = gen.generateKeyPair().getPublic(); + // Generate a certificate for some key + gen.initialize(curve.getParameters()); + KeyPair ca = gen.generateKeyPair(); + caKey = ca.getPublic(); + certificate = OpenSshCertificateBuilder + .hostCertificate() + .serial(System.currentTimeMillis()) + .publicKey(certKey) + .id("test-host-cert") + .validBefore( + System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1)) + .principals(List.of("localhost", "127.0.0.1")) + .sign(ca, "ecdsa-sha2-nistp384"); } @Rule @@ -135,6 +154,88 @@ public class OpenSshServerKeyDatabaseTest { new KnownHostsConfig(), null)); } + @Test + public void testFindCertificate() throws Exception { + Files.write(knownHosts, + List.of("localhost,127.0.0.1 " + + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384), + "@cert-authority localhost,127.0.0.1 " + + PublicKeyEntry.toString(caKey))); + assertTrue(database.accept("localhost", LOCAL, certificate, + new KnownHostsConfig(), null)); + } + + @Test + public void testCaKeyNotConsidered() throws Exception { + Files.write(knownHosts, + List.of("localhost,127.0.0.1 " + + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384), + "@cert-authority localhost,127.0.0.1 " + + PublicKeyEntry.toString(ec256))); + assertFalse(database.accept("localhost", LOCAL, ec256, + new KnownHostsConfig(), null)); + } + + @Test + public void testkeyPlainAndCa() throws Exception { + Files.write(knownHosts, List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384), + "@cert-authority localhost,127.0.0.1 " + + PublicKeyEntry.toString(ec256), + "localhost,127.0.0.1 " + PublicKeyEntry.toString(ec256))); + // ec256 is a CA key, but also a valid direct host key for localhost + assertTrue(database.accept("localhost", LOCAL, ec256, + new KnownHostsConfig(), null)); + } + + @Test + public void testLookupCertificate() throws Exception { + List keys = database.lookup("localhost", LOCAL, + new KnownHostsConfig()); + // Certificates or CA keys are not reported via lookup. + assertTrue(keys.isEmpty()); + } + + @Test + public void testCertificateNotAdded() throws Exception { + List initialKnownHosts = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(rsa1024), + "some.other.com " + PublicKeyEntry.toString(ec384)); + Files.write(knownHosts, initialKnownHosts); + assertFalse(database.accept("localhost", LOCAL, certificate, + new KnownHostsConfig(), null)); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertFalse( + database.accept("localhost", LOCAL, certificate, + new KnownHostsConfig( + KnownHostsConfig.StrictHostKeyChecking.ASK), + ui)); + assertEquals(0, ui.invocations); + assertFile(knownHosts, initialKnownHosts); + } + + @Test + public void testCertificateNotModified() throws Exception { + List initialKnownHosts = List.of( + "@cert-authority localhost,127.0.0.1 " + + PublicKeyEntry.toString(ec384), + "some.other.com " + PublicKeyEntry.toString(ec256)); + Files.write(knownHosts, initialKnownHosts); + assertFalse(database.accept("localhost", LOCAL, certificate, + new KnownHostsConfig(), null)); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertFalse( + database.accept("localhost", LOCAL, certificate, + new KnownHostsConfig( + KnownHostsConfig.StrictHostKeyChecking.ASK), + ui)); + assertEquals(0, ui.invocations); + assertFile(knownHosts, initialKnownHosts); + } + @Test public void testModifyFile() throws Exception { List initialKnownHosts = List.of( diff --git a/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties b/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties index 6048239391..773c4b9432 100644 --- a/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties +++ b/org.eclipse.jgit.ssh.apache/resources/org/eclipse/jgit/internal/transport/sshd/SshdText.properties @@ -61,6 +61,7 @@ The expected {1} key for host ''{2}'' has the fingerprints:\n\ The {0} key actually received has the fingerprints:\n\ {5}\n\ {6} +knownHostsRevokedCertificateMsg=Host ''{0}'' sent a certificate with a CA key that is marked as revoked in the known hosts file {1}. knownHostsRevokedKeyMsg=Host ''{0}'' sent a key that is marked as revoked in the known hosts file {1}. knownHostsUnknownKeyMsg=The authenticity of host ''{0}'' cannot be established. knownHostsUnknownKeyPrompt=Accept and store this key, and continue connecting? diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java index 40f78ef8ca..40d8d3f04c 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java @@ -50,6 +50,7 @@ import org.apache.sshd.common.NamedFactory; import org.apache.sshd.common.SshConstants; import org.apache.sshd.common.config.keys.AuthorizedKeyEntry; import org.apache.sshd.common.config.keys.KeyUtils; +import org.apache.sshd.common.config.keys.OpenSshCertificate; import org.apache.sshd.common.config.keys.PublicKeyEntry; import org.apache.sshd.common.config.keys.PublicKeyEntryResolver; import org.apache.sshd.common.digest.BuiltinDigests; @@ -129,6 +130,9 @@ public class OpenSshServerKeyDatabase /** Can be used to mark revoked known host lines. */ private static final String MARKER_REVOKED = "revoked"; //$NON-NLS-1$ + /** Marks CA keys used for SSH certificates. */ + private static final String MARKER_CA = "cert-authority"; //$NON-NLS-1$ + private final boolean askAboutNewFile; private final Map knownHostsFiles = new ConcurrentHashMap<>(); @@ -181,7 +185,7 @@ public class OpenSshServerKeyDatabase for (HostKeyFile file : filesToUse) { for (HostEntryPair current : file.get()) { KnownHostEntry entry = current.getHostEntry(); - if (!isRevoked(entry)) { + if (!isRevoked(entry) && !isCertificateAuthority(entry)) { for (SshdSocketAddress host : candidates) { if (entry.isHostMatch(host.getHostName(), host.getPort())) { @@ -222,6 +226,9 @@ public class OpenSshServerKeyDatabase path = file.getPath(); } } + if (serverKey instanceof OpenSshCertificate) { + return false; + } if (modified[0] != null) { // We found an entry, but with a different key. AskUser.ModifiedKeyHandling toDo = ask.acceptModifiedServerKey( @@ -269,32 +276,46 @@ public class OpenSshServerKeyDatabase private static final long serialVersionUID = 1L; } - private boolean isRevoked(KnownHostEntry entry) { + private static boolean isRevoked(KnownHostEntry entry) { return MARKER_REVOKED.equals(entry.getMarker()); } + private static boolean isCertificateAuthority(KnownHostEntry entry) { + return MARKER_CA.equals(entry.getMarker()); + } + private boolean find(Collection candidates, PublicKey serverKey, List entries, HostEntryPair[] modified) throws RevokedKeyException { - String keyType = KeyUtils.getKeyType(serverKey); + PublicKey keyToCheck = serverKey; + boolean isCert = false; + String keyType = KeyUtils.getKeyType(keyToCheck); String modifiedKeyType = null; if (modified[0] != null) { modifiedKeyType = modified[0].getHostEntry().getKeyEntry() .getKeyType(); } + if (serverKey instanceof OpenSshCertificate) { + keyToCheck = ((OpenSshCertificate) serverKey).getCaPubKey(); + isCert = true; + } for (HostEntryPair current : entries) { KnownHostEntry entry = current.getHostEntry(); if (candidates.stream().anyMatch(host -> entry .isHostMatch(host.getHostName(), host.getPort()))) { boolean revoked = isRevoked(entry); - if (KeyUtils.compareKeys(serverKey, current.getServerKey())) { + boolean haveCert = isCertificateAuthority(entry); + if (KeyUtils.compareKeys(keyToCheck, current.getServerKey())) { // Exact match if (revoked) { throw new RevokedKeyException(); } - modified[0] = null; - return true; - } else if (!revoked) { + if (haveCert == isCert) { + modified[0] = null; + return true; + } + } + if (haveCert == isCert && !haveCert && !revoked) { // Server sent a different key. if (modifiedKeyType == null) { modified[0] = current; @@ -494,15 +515,22 @@ public class OpenSshServerKeyDatabase return; } InetSocketAddress remote = (InetSocketAddress) remoteAddress; + boolean isCert = serverKey instanceof OpenSshCertificate; + PublicKey keyToReport = isCert + ? ((OpenSshCertificate) serverKey).getCaPubKey() + : serverKey; URIish uri = JGitUserInteraction.toURI(config.getUsername(), remote); String sha256 = KeyUtils.getFingerPrint(BuiltinDigests.sha256, - serverKey); - String md5 = KeyUtils.getFingerPrint(BuiltinDigests.md5, serverKey); - String keyAlgorithm = serverKey.getAlgorithm(); + keyToReport); + String md5 = KeyUtils.getFingerPrint(BuiltinDigests.md5, + keyToReport); + String keyAlgorithm = keyToReport.getAlgorithm(); + String msg = isCert + ? SshdText.get().knownHostsRevokedCertificateMsg + : SshdText.get().knownHostsRevokedKeyMsg; askUser(provider, uri, null, // - format(SshdText.get().knownHostsRevokedKeyMsg, - remote.getHostString(), path), + format(msg, remote.getHostString(), path), format(SshdText.get().knownHostsKeyFingerprints, keyAlgorithm), md5, sha256); diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java index 0533b651e0..e40137870b 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/SshdText.java @@ -83,6 +83,7 @@ public final class SshdText extends TranslationBundle { /***/ public String knownHostsModifiedKeyDenyMsg; /***/ public String knownHostsModifiedKeyStorePrompt; /***/ public String knownHostsModifiedKeyWarning; + /***/ public String knownHostsRevokedCertificateMsg; /***/ public String knownHostsRevokedKeyMsg; /***/ public String knownHostsUnknownKeyMsg; /***/ public String knownHostsUnknownKeyPrompt; -- cgit v1.2.3 From 63d7416692baf406b78c3b42f5c17f6c8fb65d38 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 26 Feb 2025 19:23:19 +0100 Subject: JGit v7.2.0.202502261823-rc1 Signed-off-by: Matthias Sohn Change-Id: I2b1209fe339ae6e7dd3c4291e21f97602fc2308d --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0069b09467..c3f8a9d3e5 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c6c81648ae..61239fda03 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 3af82e4759..ef2bb65058 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 89d05be73b..9382d0225f 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 11806f15c6..84a3863376 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index b142a66a8c..746950f2d9 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 3ca6590f02..eec6492602 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 27a2bba5a2..586e8fa4eb 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index c92fa9f156..e45be47be2 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 9493c07dbc..720ba7d85e 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.test - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 35294256e1..736b6198af 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 245ba7e127..22346dffbc 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 2120439e51..0d03a77049 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 532e749cb2..e5fabff716 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f94e2b27b1..516ff22325 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 7d23d53614..a6ee258132 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 679252de34..a2560158e7 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index c390d8f5ee..e58494d539 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 39dc2ef42a..9c52cea904 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.2.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index e7940bd358..7645371352 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 3f79f8b82d..8b110b4ad0 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 3550501dba..4794688dab 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 2f25191fee..2052ff60d0 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 4ba595901b..d75ef717dc 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 5abd7d6d51..c3d7af29c6 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ea38ae31ba..2f6d24f831 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index c8354cf60a..ca4284e2e5 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index b8f22cea5d..8cf336cdbe 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index f937748212..9f3417db66 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 6488a887fb..cb64ded079 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 9d494cb2e0..9230ccdb7b 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9f43ced73b..b10f981907 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 77749c8d89..e6b36eeddf 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 98e63b0f1e..3005c1de45 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 1973b26477..321e2656d0 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 73f5cab59d..2c8f436a16 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 0dd0786050..d354c315ea 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index f27377447c..79e905d410 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index eff7e0b7eb..3c0492f695 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index fb211cc89c..6705a4cd36 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.2.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 4ca03a3f72..68fbdbe0b5 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 329740085e..065d970f85 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 43980f06ae..691058b750 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 59345e75f9..575e1290c8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index ae91bd5405..a61c0eaf27 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index aa88700423..1526df9550 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 57d7d8dd69..326318508f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 2038cfd58c..95d2d56f6c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index d9a9db307d..e25fd72b07 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index d98990c532..f6a8923d59 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8f0c532a4a..75eb1adb19 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 7e1b0c8226..24edab4596 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 78867c96c0..f99bf09065 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 02435b6c08..65029b46d4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index d3773f54f3..c3e9a0b35f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index b8f402e4f0..8c2df93d6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 4eee8255cc..461310ec63 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 811beafca6..503d64bd1f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 025844c6b0..56c75d6937 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index a0cd57bcbb..0d3adbecd7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 81c9651fd9..b83884a7c2 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 8306abc0a5..750e94586f 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 60a60bb51d..14fad8d287 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 9195a369e7..7585720261 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 2ced4db133..756aed114f 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 0101464c82..0650377635 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 81efa44cc6..9024c4b6a7 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 6eeb24d6b4..b915c87450 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 30437f25ee..993c0fe0dc 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index feec706a25..a6a34f3f62 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 3ef870bca5..6b54831690 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2df07f7ea1..a09ac12e82 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 71460f72cf..eb83ab9c29 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index c19e0aa253..6ea7150e01 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 8b9ff5034c..4f047dd0cc 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 9cf812ce3b..6f7b9d70bd 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e84ac4d574..adb7e3a4b0 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index ed6115b046..8757e3e686 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 4e8da25752..9f871500c1 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index fdc5ffb8b3..a64e1321ce 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index c246d05fed..7f4ed5e071 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index c936b09fd7..6d410bcfef 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 423d22b748..9c5f7852e3 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.2.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 12363f802e..71528bcb71 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index ada06ed656..60903aa214 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 5f4894204a..774782a2c1 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202502261823-rc1 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 0f9ec1fb22..a39f21e229 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202502261823-rc1 +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202502261823-rc1";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index df7ae83647..ee532558eb 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 7c1a1d7336..4e68db439a 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0-SNAPSHOT + 7.2.0.202502261823-rc1 JGit - Parent ${jgit-url} -- cgit v1.2.3 From 9ad4310db312ccaca1db80738334df5d3b0b817f Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Sat, 15 Feb 2025 14:25:36 +0100 Subject: [releng] Remove unused target platform definitions Remove all unused Orbit definition files. Change-Id: I9ee73e0e6ef8364685b9ac84961eefa80315d5bb --- .../orbit/R20200831200620-2020-09.tpd | 66 ------------------- .../orbit/R20201130205003-2020-12.tpd | 66 ------------------- .../orbit/R20210223232630-2021-03.tpd | 66 ------------------- .../orbit/R20210602031627-2021-06.tpd | 66 ------------------- .../orbit/R20210825222808-2021-09.tpd | 73 ---------------------- .../orbit/R20211122181901-2021-12.tpd | 71 --------------------- .../orbit/R20211213173813-2021-12.tpd | 69 -------------------- .../orbit/R20220302172233-2022-03.tpd | 69 -------------------- .../orbit/R20220531185310-2022-06.tpd | 69 -------------------- .../orbit/R20220830213456-2022-09.tpd | 69 -------------------- .../orbit/R20221123021534-2022-12.tpd | 69 -------------------- .../orbit/R20230302014618-2023-03.tpd | 27 -------- .../orbit/R20230531010532-2023-06.tpd | 25 -------- .../org.eclipse.jgit.target/orbit/orbit-4.29.tpd | 27 -------- .../org.eclipse.jgit.target/orbit/orbit-4.30.tpd | 27 -------- .../org.eclipse.jgit.target/orbit/orbit-4.31.tpd | 27 -------- 16 files changed, 886 deletions(-) delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20200831200620-2020-09.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20201130205003-2020-12.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210223232630-2021-03.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210602031627-2021-06.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210825222808-2021-09.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211122181901-2021-12.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211213173813-2021-12.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220302172233-2022-03.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220531185310-2022-06.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220830213456-2022-09.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20221123021534-2022-12.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.29.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.30.tpd delete mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20200831200620-2020-09.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20200831200620-2020-09.tpd deleted file mode 100644 index 22e2b01207..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20200831200620-2020-09.tpd +++ /dev/null @@ -1,66 +0,0 @@ -target "R20200831200620-2020-09" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20200831200620/repository" { - com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110] - com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110] - 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] - javaewah [1.1.7.v20200107-0831,1.1.7.v20200107-0831] - javaewah.source [1.1.7.v20200107-0831,1.1.7.v20200107-0831] - javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] - javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] - 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.v20181102-1323,0.3.0.v20181102-1323] - net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323] - org.apache.ant [1.10.8.v20200515-1239,1.10.8.v20200515-1239] - org.apache.ant.source [1.10.8.v20200515-1239,1.10.8.v20200515-1239] - 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.19.0.v20200106-2343,1.19.0.v20200106-2343] - org.apache.commons.compress.source [1.19.0.v20200106-2343,1.19.0.v20200106-2343] - 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.10.v20200830-2311,4.5.10.v20200830-2311] - org.apache.httpcomponents.httpclient.source [4.5.10.v20200830-2311,4.5.10.v20200830-2311] - org.apache.httpcomponents.httpcore [4.4.12.v20200108-1212,4.4.12.v20200108-1212] - org.apache.httpcomponents.httpcore.source [4.4.12.v20200108-1212,4.4.12.v20200108-1212] - org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.sshd.osgi [2.4.0.v20200318-1614,2.4.0.v20200318-1614] - org.apache.sshd.osgi.source [2.4.0.v20200318-1614,2.4.0.v20200318-1614] - org.apache.sshd.sftp [2.4.0.v20200319-1547,2.4.0.v20200319-1547] - org.apache.sshd.sftp.source [2.4.0.v20200319-1547,2.4.0.v20200319-1547] - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.bouncycastle.bcpg [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpg.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpkix [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpkix.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcprov [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.bouncycastle.bcprov.source [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - 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.0.v20200204-1500,4.13.0.v20200204-1500] - org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500] - 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.2.v20121108-1250,1.7.2.v20121108-1250] - org.slf4j.api.source [1.7.2.v20121108-1250,1.7.2.v20121108-1250] - org.slf4j.impl.log4j12 [1.7.2.v20131105-2200,1.7.2.v20131105-2200] - org.slf4j.impl.log4j12.source [1.7.2.v20131105-2200,1.7.2.v20131105-2200] - org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613] - org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20201130205003-2020-12.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20201130205003-2020-12.tpd deleted file mode 100644 index 08a0846de7..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20201130205003-2020-12.tpd +++ /dev/null @@ -1,66 +0,0 @@ -target "R20201130205003-2020-12" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20201130205003/repository" { - com.google.gson [2.8.2.v20180104-1110,2.8.2.v20180104-1110] - com.google.gson.source [2.8.2.v20180104-1110,2.8.2.v20180104-1110] - 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] - javaewah [1.1.7.v20200107-0831,1.1.7.v20200107-0831] - javaewah.source [1.1.7.v20200107-0831,1.1.7.v20200107-0831] - javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] - javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] - 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.v20181102-1323,0.3.0.v20181102-1323] - net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323] - org.apache.ant [1.10.9.v20201106-1946,1.10.9.v20201106-1946] - org.apache.ant.source [1.10.9.v20201106-1946,1.10.9.v20201106-1946] - 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.19.0.v20200106-2343,1.19.0.v20200106-2343] - org.apache.commons.compress.source [1.19.0.v20200106-2343,1.19.0.v20200106-2343] - 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.10.v20200830-2311,4.5.10.v20200830-2311] - org.apache.httpcomponents.httpclient.source [4.5.10.v20200830-2311,4.5.10.v20200830-2311] - org.apache.httpcomponents.httpcore [4.4.12.v20200108-1212,4.4.12.v20200108-1212] - org.apache.httpcomponents.httpcore.source [4.4.12.v20200108-1212,4.4.12.v20200108-1212] - org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.sshd.osgi [2.4.0.v20200318-1614,2.4.0.v20200318-1614] - org.apache.sshd.osgi.source [2.4.0.v20200318-1614,2.4.0.v20200318-1614] - org.apache.sshd.sftp [2.4.0.v20200319-1547,2.4.0.v20200319-1547] - org.apache.sshd.sftp.source [2.4.0.v20200319-1547,2.4.0.v20200319-1547] - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.bouncycastle.bcpg [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpg.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpkix [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpkix.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcprov [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.bouncycastle.bcprov.source [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - 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.0.v20200204-1500,4.13.0.v20200204-1500] - org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500] - 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.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613] - org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210223232630-2021-03.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210223232630-2021-03.tpd deleted file mode 100644 index 605a43bb13..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210223232630-2021-03.tpd +++ /dev/null @@ -1,66 +0,0 @@ -target "R20210223232630-2021-03" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository" { - com.google.gson [2.8.6.v20201231-1626,2.8.6.v20201231-1626] - com.google.gson.source [2.8.6.v20201231-1626,2.8.6.v20201231-1626] - 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] - javaewah [1.1.7.v20200107-0831,1.1.7.v20200107-0831] - javaewah.source [1.1.7.v20200107-0831,1.1.7.v20200107-0831] - javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] - javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] - 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.v20181102-1323,0.3.0.v20181102-1323] - net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323] - org.apache.ant [1.10.9.v20201106-1946,1.10.9.v20201106-1946] - org.apache.ant.source [1.10.9.v20201106-1946,1.10.9.v20201106-1946] - 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.19.0.v20200106-2343,1.19.0.v20200106-2343] - org.apache.commons.compress.source [1.19.0.v20200106-2343,1.19.0.v20200106-2343] - 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.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.sshd.osgi [2.6.0.v20210201-2003,2.6.0.v20210201-2003] - org.apache.sshd.osgi.source [2.6.0.v20210201-2003,2.6.0.v20210201-2003] - org.apache.sshd.sftp [2.6.0.v20210201-2003,2.6.0.v20210201-2003] - org.apache.sshd.sftp.source [2.6.0.v20210201-2003,2.6.0.v20210201-2003] - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.bouncycastle.bcpg [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpg.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpkix [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpkix.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcprov [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.bouncycastle.bcprov.source [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - 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.0.v20200204-1500,4.13.0.v20200204-1500] - org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500] - 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.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613] - org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210602031627-2021-06.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210602031627-2021-06.tpd deleted file mode 100644 index 83b5bb3fd2..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210602031627-2021-06.tpd +++ /dev/null @@ -1,66 +0,0 @@ -target "R20210602031627-2021-06" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210602031627/repository" { - com.google.gson [2.8.6.v20201231-1626,2.8.6.v20201231-1626] - com.google.gson.source [2.8.6.v20201231-1626,2.8.6.v20201231-1626] - 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] - javaewah [1.1.7.v20200107-0831,1.1.7.v20200107-0831] - javaewah.source [1.1.7.v20200107-0831,1.1.7.v20200107-0831] - javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] - javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] - 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.v20181102-1323,0.3.0.v20181102-1323] - net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323] - org.apache.ant [1.10.10.v20210426-1926,1.10.10.v20210426-1926] - org.apache.ant.source [1.10.10.v20210426-1926,1.10.10.v20210426-1926] - 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.19.0.v20200106-2343,1.19.0.v20200106-2343] - org.apache.commons.compress.source [1.19.0.v20200106-2343,1.19.0.v20200106-2343] - 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.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.sshd.osgi [2.6.0.v20210201-2003,2.6.0.v20210201-2003] - org.apache.sshd.osgi.source [2.6.0.v20210201-2003,2.6.0.v20210201-2003] - org.apache.sshd.sftp [2.6.0.v20210201-2003,2.6.0.v20210201-2003] - org.apache.sshd.sftp.source [2.6.0.v20210201-2003,2.6.0.v20210201-2003] - org.assertj [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.assertj.source [3.14.0.v20200120-1926,3.14.0.v20200120-1926] - org.bouncycastle.bcpg [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpg.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpkix [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcpkix.source [1.65.0.v20200527-1955,1.65.0.v20200527-1955] - org.bouncycastle.bcprov [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.bouncycastle.bcprov.source [1.65.1.v20200529-1514,1.65.1.v20200529-1514] - org.hamcrest [1.1.0.v20090501071000,1.1.0.v20090501071000] - 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.0.v20200204-1500,4.13.0.v20200204-1500] - org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500] - 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.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.tukaani.xz [1.8.0.v20180207-1613,1.8.0.v20180207-1613] - org.tukaani.xz.source [1.8.0.v20180207-1613,1.8.0.v20180207-1613] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210825222808-2021-09.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210825222808-2021-09.tpd deleted file mode 100644 index 99f352011b..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20210825222808-2021-09.tpd +++ /dev/null @@ -1,73 +0,0 @@ -target "R20210825222808-2021-09" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20210825222808/repository" { - com.google.gson [2.8.7.v20210624-1215,2.8.7.v20210624-1215] - com.google.gson.source [2.8.7.v20210624-1215,2.8.7.v20210624-1215] - 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.12.v20210622-2206,1.1.12.v20210622-2206] - javaewah.source [1.1.12.v20210622-2206,1.1.12.v20210622-2206] - javax.servlet [3.1.0.v201410161800,3.1.0.v201410161800] - javax.servlet.source [3.1.0.v201410161800,3.1.0.v201410161800] - 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.v20181102-1323,0.3.0.v20181102-1323] - net.i2p.crypto.eddsa.source [0.3.0.v20181102-1323,0.3.0.v20181102-1323] - org.apache.ant [1.10.11.v20210720-1445,1.10.11.v20210720-1445] - org.apache.ant.source [1.10.11.v20210720-1445,1.10.11.v20210720-1445] - 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.20.0.v20210713-1928,1.20.0.v20210713-1928] - org.apache.commons.compress.source [1.20.0.v20210713-1928,1.20.0.v20210713-1928] - 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.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - 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.v20210713-1924,1.69.0.v20210713-1924] - org.bouncycastle.bcprov.source [1.69.0.v20210713-1924,1.69.0.v20210713-1924] - 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.0.v20200204-1500,4.13.0.v20200204-1500] - org.junit.source [4.13.0.v20200204-1500,4.13.0.v20200204-1500] - 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.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - 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.packaging/org.eclipse.jgit.target/orbit/R20211122181901-2021-12.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211122181901-2021-12.tpd deleted file mode 100644 index cd1d1c08fa..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211122181901-2021-12.tpd +++ /dev/null @@ -1,71 +0,0 @@ -target "R20211122181901-2021-12" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20211122181901/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.log4j [1.2.15.v201012070815,1.2.15.v201012070815] - org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] - 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.log4j12 [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - org.slf4j.binding.log4j12.source [1.7.30.v20201108-2042,1.7.30.v20201108-2042] - 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.packaging/org.eclipse.jgit.target/orbit/R20211213173813-2021-12.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211213173813-2021-12.tpd deleted file mode 100644 index 0c7c846738..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20211213173813-2021-12.tpd +++ /dev/null @@ -1,69 +0,0 @@ -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] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220302172233-2022-03.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220302172233-2022-03.tpd deleted file mode 100644 index fafc689268..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220302172233-2022-03.tpd +++ /dev/null @@ -1,69 +0,0 @@ -target "R20220302172233" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository" { - com.google.gson [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - com.google.gson.source [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - 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.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.httpcomponents.httpcore.source [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.sshd.osgi [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.osgi.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - 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.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcpg.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcpkix [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcpkix.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcprov [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcprov.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcutil [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcutil.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - 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] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220531185310-2022-06.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220531185310-2022-06.tpd deleted file mode 100644 index 3c74497c21..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220531185310-2022-06.tpd +++ /dev/null @@ -1,69 +0,0 @@ -target "R20220531185310-2022-06" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository" { - com.google.gson [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - com.google.gson.source [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - 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.3.v20220502-1820,1.1.3.v20220502-1820] - com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - 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.v20220506-1020,0.3.0.v20220506-1020] - net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - 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.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.httpcomponents.httpcore.source [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.sshd.osgi [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.osgi.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - 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.70.0.v20220507-1208,1.70.0.v20220507-1208] - org.bouncycastle.bcpg.source [1.70.0.v20220507-1208,1.70.0.v20220507-1208] - org.bouncycastle.bcpkix [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcpkix.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcprov [1.70.0.v20220507-1208,1.70.0.v20220507-1208] - org.bouncycastle.bcprov.source [1.70.0.v20220507-1208,1.70.0.v20220507-1208] - org.bouncycastle.bcutil [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - org.bouncycastle.bcutil.source [1.70.0.v20220105-1522,1.70.0.v20220105-1522] - 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] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220830213456-2022-09.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220830213456-2022-09.tpd deleted file mode 100644 index 8db1018ffb..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20220830213456-2022-09.tpd +++ /dev/null @@ -1,69 +0,0 @@ -target "R20220830213456-2022-09" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20220830213456/repository" { - com.google.gson [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - com.google.gson.source [2.8.9.v20220111-1409,2.8.9.v20220111-1409] - 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.3.v20220502-1820,1.1.3.v20220502-1820] - com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - 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.v20220506-1020,0.3.0.v20220506-1020] - net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - 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.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.httpcomponents.httpcore.source [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.sshd.osgi [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.osgi.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - org.apache.sshd.sftp.source [2.8.0.v20211227-1750,2.8.0.v20211227-1750] - 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.71.0.v20220723-1943,1.71.0.v20220723-1943] - org.bouncycastle.bcpg.source [1.71.0.v20220723-1943,1.71.0.v20220723-1943] - org.bouncycastle.bcpkix [1.71.0.v20220723-1943,1.71.0.v20220723-1943] - org.bouncycastle.bcpkix.source [1.71.0.v20220723-1943,1.71.0.v20220723-1943] - org.bouncycastle.bcprov [1.71.0.v20220723-1943,1.71.0.v20220723-1943] - org.bouncycastle.bcprov.source [1.71.0.v20220723-1943,1.71.0.v20220723-1943] - org.bouncycastle.bcutil [1.71.0.v20220723-1943,1.71.0.v20220723-1943] - org.bouncycastle.bcutil.source [1.71.0.v20220723-1943,1.71.0.v20220723-1943] - 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] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20221123021534-2022-12.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20221123021534-2022-12.tpd deleted file mode 100644 index 378b84873f..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20221123021534-2022-12.tpd +++ /dev/null @@ -1,69 +0,0 @@ -target "S20230101190934" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository" { - com.google.gson [2.9.1.v20220915-1632,2.9.1.v20220915-1632] - com.google.gson.source [2.9.1.v20220915-1632,2.9.1.v20220915-1632] - com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] - com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] - com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - com.sun.jna [5.12.1.v20221103-2317,5.12.1.v20221103-2317] - com.sun.jna.source [5.12.1.v20221103-2317,5.12.1.v20221103-2317] - com.sun.jna.platform [5.12.1.v20221103-2317,5.12.1.v20221103-2317] - com.sun.jna.platform.source [5.12.1.v20221103-2317,5.12.1.v20221103-2317] - 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.12.18.v20221114-2102,1.12.18.v20221114-2102] - net.bytebuddy.byte-buddy.source [1.12.18.v20221114-2102,1.12.18.v20221114-2102] - net.bytebuddy.byte-buddy-agent [1.12.18.v20221114-2102,1.12.18.v20221114-2102] - net.bytebuddy.byte-buddy-agent.source [1.12.18.v20221114-2102,1.12.18.v20221114-2102] - net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - 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.v20221112-0806,1.14.0.v20221112-0806] - org.apache.commons.codec.source [1.14.0.v20221112-0806,1.14.0.v20221112-0806] - 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.v20221112-0806,4.5.13.v20221112-0806] - org.apache.httpcomponents.httpclient.source [4.5.13.v20221112-0806,4.5.13.v20221112-0806] - org.apache.httpcomponents.httpcore [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.httpcomponents.httpcore.source [4.4.15.v20220209-2345,4.4.15.v20220209-2345] - org.apache.sshd.osgi [2.9.2.v20221117-1942,2.9.2.v20221117-1942] - org.apache.sshd.osgi.source [2.9.2.v20221117-1942,2.9.2.v20221117-1942] - org.apache.sshd.sftp [2.9.2.v20221117-1942,2.9.2.v20221117-1942] - org.apache.sshd.sftp.source [2.9.2.v20221117-1942,2.9.2.v20221117-1942] - 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.72.0.v20221013-1810,1.72.0.v20221013-1810] - org.bouncycastle.bcpg.source [1.72.0.v20221013-1810,1.72.0.v20221013-1810] - org.bouncycastle.bcpkix [1.72.0.v20221013-1810,1.72.0.v20221013-1810] - org.bouncycastle.bcpkix.source [1.72.0.v20221013-1810,1.72.0.v20221013-1810] - org.bouncycastle.bcprov [1.72.0.v20221013-1810,1.72.0.v20221013-1810] - org.bouncycastle.bcprov.source [1.72.0.v20221013-1810,1.72.0.v20221013-1810] - org.bouncycastle.bcutil [1.72.0.v20221013-1810,1.72.0.v20221013-1810] - org.bouncycastle.bcutil.source [1.72.0.v20221013-1810,1.72.0.v20221013-1810] - 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.mockito-core [4.8.1.v20221103-2317,4.8.1.v20221103-2317] - 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.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd deleted file mode 100644 index 8578b2cdf5..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230302014618-2023-03.tpd +++ /dev/null @@ -1,27 +0,0 @@ -target "R20230302014618-2023-03" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230302014618/repository" { - com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] - com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] - com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - 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.httpcomponents.httpclient [4.5.14.v20221207-1049,4.5.14.v20221207-1049] - org.apache.httpcomponents.httpclient.source [4.5.14.v20221207-1049,4.5.14.v20221207-1049] - org.apache.httpcomponents.httpcore [4.4.16.v20221207-1049,4.4.16.v20221207-1049] - org.apache.httpcomponents.httpcore.source [4.4.16.v20221207-1049,4.4.16.v20221207-1049] - 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.mockito.mockito-core [4.8.1.v20221103-2317,4.8.1.v20221103-2317] - 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] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd deleted file mode 100644 index 46055d3728..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20230531010532-2023-06.tpd +++ /dev/null @@ -1,25 +0,0 @@ -target "R20230531010532-2023-06" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository" { - com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] - com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] - com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - 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.httpcomponents.httpclient [4.5.14.v20230516-1249,4.5.14.v20230516-1249] - org.apache.httpcomponents.httpclient.source [4.5.14.v20230516-1249,4.5.14.v20230516-1249] - org.apache.httpcomponents.httpcore [4.4.16.v20221207-1049,4.4.16.v20221207-1049] - org.apache.httpcomponents.httpcore.source [4.4.16.v20221207-1049,4.4.16.v20221207-1049] - 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.objenesis [3.3.0.v20221103-2317,3.3.0.v20221103-2317] - org.objenesis.source [3.3.0.v20221103-2317,3.3.0.v20221103-2317] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.29.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.29.tpd deleted file mode 100644 index 70a17a1ddc..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.29.tpd +++ /dev/null @@ -1,27 +0,0 @@ -target "orbit-4.29" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0" { - com.jcraft.jsch [0.1.55.v20221112-0806,0.1.55.v20221112-0806] - com.jcraft.jsch.source [0.1.55.v20221112-0806,0.1.55.v20221112-0806] - com.jcraft.jzlib [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - com.jcraft.jzlib.source [1.1.3.v20220502-1820,1.1.3.v20220502-1820] - net.i2p.crypto.eddsa [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - net.i2p.crypto.eddsa.source [0.3.0.v20220506-1020,0.3.0.v20220506-1020] - 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.httpcomponents.httpclient [4.5.14,4.5.14] - org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] - org.apache.httpcomponents.httpcore [4.4.16,4.4.16] - org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.objenesis [3.3,3.3] - org.objenesis.source [3.3,3.3] - org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.30.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.30.tpd deleted file mode 100644 index 0554a8578c..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.30.tpd +++ /dev/null @@ -1,27 +0,0 @@ -target "orbit-4.30" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12" { - com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] - org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.httpcomponents.httpclient [4.5.14,4.5.14] - org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] - org.apache.httpcomponents.httpcore [4.4.16,4.4.16] - org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.objenesis [3.3,3.3] - org.objenesis.source [3.3,3.3] - org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] -} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd deleted file mode 100644 index 9d00cb4c4f..0000000000 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.31.tpd +++ /dev/null @@ -1,27 +0,0 @@ -target "orbit-4.31" with source configurePhase -// see https://download.eclipse.org/tools/orbit/downloads/ - -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12" { - com.jcraft.jsch [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jsch.source [0.1.55.v20230916-1400,0.1.55.v20230916-1400] - com.jcraft.jzlib [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - com.jcraft.jzlib.source [1.1.3.v20230916-1400,1.1.3.v20230916-1400] - net.i2p.crypto.eddsa [0.3.0,0.3.0] - net.i2p.crypto.eddsa.source [0.3.0,0.3.0] - org.apache.ant [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.ant.source [1.10.14.v20230922-1200,1.10.14.v20230922-1200] - org.apache.httpcomponents.httpclient [4.5.14,4.5.14] - org.apache.httpcomponents.httpclient.source [4.5.14,4.5.14] - org.apache.httpcomponents.httpcore [4.4.16,4.4.16] - org.apache.httpcomponents.httpcore.source [4.4.16,4.4.16] - org.hamcrest.core [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.core.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.hamcrest.library.source [1.3.0.v20230809-1000,1.3.0.v20230809-1000] - org.junit [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.junit.source [4.13.2.v20230809-1000,4.13.2.v20230809-1000] - org.objenesis [3.3,3.3] - org.objenesis.source [3.3,3.3] - org.osgi.service.cm [1.6.1.202109301733,1.6.1.202109301733] - org.osgi.service.cm.source [1.6.1.202109301733,1.6.1.202109301733] -} -- cgit v1.2.3 From 3edab4e9fd1b29fe676d8f66b99c93a2db482ad6 Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 10 Feb 2025 20:41:50 +0100 Subject: [ssh known_hosts] Handle unknown keys better Ignoring host keys that cannot be read means we may ask the user whether to accept a host key for a hitherto unknown server. This is subtly different from asking the user whether to accept a new or modified host key for a server for which a different host key is already known. So do not ignore such keys but store them as UnsupportedSshPublicKey. That enables us to give the user the correct feedback. If the user allows connecting and wants the new key to be stored, do not replace the line with the unknown key type as it might be perfectly fine for some other SSH program the user uses outside of JGit. Instead, add the new key as a new line. Change-Id: I304cb877d37b926c25a39acc16844088f54e0bde --- .../sshd/OpenSshServerKeyDatabaseTest.java | 26 ++++++++++ .../transport/sshd/OpenSshServerKeyDatabase.java | 56 ++++++++++++++-------- 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java index b2e6401816..6b61821a0f 100644 --- a/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java +++ b/org.eclipse.jgit.ssh.apache.test/tst/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabaseTest.java @@ -478,6 +478,29 @@ public class OpenSshServerKeyDatabaseTest { new KnownHostsConfig(), null)); } + @Test + public void testUnknownKeyType() throws Exception { + List initialKnownHosts = List.of( + "localhost,127.0.0.1 " + PublicKeyEntry.toString(ec384) + .replace("ecdsa", "foo"), + "some.other.com " + PublicKeyEntry.toString(ec384)); + Files.write(knownHosts, initialKnownHosts); + TestCredentialsProvider ui = new TestCredentialsProvider(true, true); + assertTrue(database.accept("localhost", LOCAL, ec384, + new KnownHostsConfig( + ServerKeyDatabase.Configuration.StrictHostKeyChecking.ASK), + ui)); + assertEquals(1, ui.invocations); + // The "modified key" dialog has two questions; whereas the "add new + // key" is just a simple question. + assertEquals(2, ui.questions); + List expected = new ArrayList<>(initialKnownHosts); + expected.add("localhost,127.0.0.1 " + PublicKeyEntry.toString(ec384)); + assertFile(knownHosts, expected); + assertTrue(database.accept("127.0.0.1:22", LOCAL, ec384, + new KnownHostsConfig(), null)); + } + private void assertFile(Path path, List lines) throws Exception { assertEquals(lines, Files.readAllLines(path).stream() .filter(s -> !s.isBlank()).toList()); @@ -489,6 +512,8 @@ public class OpenSshServerKeyDatabaseTest { int invocations = 0; + int questions = 0; + TestCredentialsProvider(boolean accept, boolean store) { values = new boolean[] { accept, store }; } @@ -512,6 +537,7 @@ public class OpenSshServerKeyDatabaseTest { if (item instanceof CredentialItem.YesNoType) { ((CredentialItem.YesNoType) item) .setValue(i < values.length && values[i++]); + questions++; } } return true; diff --git a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java index 40d8d3f04c..acb77c5bb7 100644 --- a/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java +++ b/org.eclipse.jgit.ssh.apache/src/org/eclipse/jgit/internal/transport/sshd/OpenSshServerKeyDatabase.java @@ -53,6 +53,7 @@ import org.apache.sshd.common.config.keys.KeyUtils; import org.apache.sshd.common.config.keys.OpenSshCertificate; import org.apache.sshd.common.config.keys.PublicKeyEntry; import org.apache.sshd.common.config.keys.PublicKeyEntryResolver; +import org.apache.sshd.common.config.keys.UnsupportedSshPublicKey; import org.apache.sshd.common.digest.BuiltinDigests; import org.apache.sshd.common.mac.Mac; import org.apache.sshd.common.util.io.ModifiableFileWatcher; @@ -185,6 +186,9 @@ public class OpenSshServerKeyDatabase for (HostKeyFile file : filesToUse) { for (HostEntryPair current : file.get()) { KnownHostEntry entry = current.getHostEntry(); + if (current.getServerKey() instanceof UnsupportedSshPublicKey) { + continue; + } if (!isRevoked(entry) && !isCertificateAuthority(entry)) { for (SshdSocketAddress host : candidates) { if (entry.isHostMatch(host.getHostName(), @@ -235,12 +239,20 @@ public class OpenSshServerKeyDatabase remoteAddress, modified[0].getServerKey(), serverKey, path); if (toDo == AskUser.ModifiedKeyHandling.ALLOW_AND_STORE) { - try { - updateModifiedServerKey(serverKey, modified[0], path); - knownHostsFiles.get(path).resetReloadAttributes(); - } catch (IOException e) { - LOG.warn(format(SshdText.get().knownHostsCouldNotUpdate, - path)); + if (modified[0] + .getServerKey() instanceof UnsupportedSshPublicKey) { + // Never update a line containing an unknown key type, + // always add. + addKeyToFile(filesToUse.get(0), candidates, serverKey, ask, + config); + } else { + try { + updateModifiedServerKey(serverKey, modified[0], path); + knownHostsFiles.get(path).resetReloadAttributes(); + } catch (IOException e) { + LOG.warn(format(SshdText.get().knownHostsCouldNotUpdate, + path)); + } } } if (toDo == AskUser.ModifiedKeyHandling.DENY) { @@ -253,19 +265,8 @@ public class OpenSshServerKeyDatabase return true; } else if (ask.acceptUnknownKey(remoteAddress, serverKey)) { if (!filesToUse.isEmpty()) { - HostKeyFile toUpdate = filesToUse.get(0); - path = toUpdate.getPath(); - try { - if (Files.exists(path) || !askAboutNewFile - || ask.createNewFile(path)) { - updateKnownHostsFile(candidates, serverKey, path, - config); - toUpdate.resetReloadAttributes(); - } - } catch (Exception e) { - LOG.warn(format(SshdText.get().knownHostsCouldNotUpdate, - path), e); - } + addKeyToFile(filesToUse.get(0), candidates, serverKey, ask, + config); } return true; } @@ -379,6 +380,21 @@ public class OpenSshServerKeyDatabase return userFiles; } + private void addKeyToFile(HostKeyFile file, + Collection candidates, PublicKey serverKey, + AskUser ask, Configuration config) { + Path path = file.getPath(); + try { + if (Files.exists(path) || !askAboutNewFile + || ask.createNewFile(path)) { + updateKnownHostsFile(candidates, serverKey, path, config); + file.resetReloadAttributes(); + } + } catch (Exception e) { + LOG.warn(format(SshdText.get().knownHostsCouldNotUpdate, path), e); + } + } + private void updateKnownHostsFile(Collection candidates, PublicKey serverKey, Path path, Configuration config) throws Exception { @@ -663,7 +679,7 @@ public class OpenSshServerKeyDatabase } try { PublicKey serverKey = keyPart.resolvePublicKey(null, - PublicKeyEntryResolver.IGNORING); + PublicKeyEntryResolver.UNSUPPORTED); if (serverKey == null) { LOG.warn(format( SshdText.get().knownHostsUnknownKeyType, -- cgit v1.2.3 From 1b70d59fcd6e1d30c39317689c68c441aac7356c Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 26 Feb 2025 20:46:31 +0100 Subject: Prepare 7.2.0-SNAPSHOT builds Change-Id: I92dea20a60d0b03e295a4215656e2686bfa9a294 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index c3f8a9d3e5..0069b09467 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 61239fda03..c6c81648ae 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index ef2bb65058..3af82e4759 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 9382d0225f..89d05be73b 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 84a3863376..11806f15c6 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 746950f2d9..b142a66a8c 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index eec6492602..3ca6590f02 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 586e8fa4eb..27a2bba5a2 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e45be47be2..c92fa9f156 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 720ba7d85e..9493c07dbc 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 736b6198af..35294256e1 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 22346dffbc..245ba7e127 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 0d03a77049..2120439e51 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index e5fabff716..532e749cb2 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 516ff22325..f94e2b27b1 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index a6ee258132..7d23d53614 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index a2560158e7..679252de34 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index e58494d539..c390d8f5ee 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 9c52cea904..39dc2ef42a 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.2.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 7645371352..e7940bd358 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 8b110b4ad0..3f79f8b82d 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 4794688dab..3550501dba 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 2052ff60d0..2f25191fee 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index d75ef717dc..4ba595901b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index c3d7af29c6..5abd7d6d51 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 2f6d24f831..ea38ae31ba 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index ca4284e2e5..c8354cf60a 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 8cf336cdbe..b8f22cea5d 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 9f3417db66..f937748212 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index cb64ded079..6488a887fb 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 9230ccdb7b..9d494cb2e0 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index b10f981907..9f43ced73b 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index e6b36eeddf..77749c8d89 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 3005c1de45..98e63b0f1e 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 321e2656d0..1973b26477 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 2c8f436a16..73f5cab59d 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index d354c315ea..0dd0786050 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 79e905d410..f27377447c 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 3c0492f695..eff7e0b7eb 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 6705a4cd36..fb211cc89c 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.2.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 68fbdbe0b5..4ca03a3f72 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 065d970f85..329740085e 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 691058b750..43980f06ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 575e1290c8..59345e75f9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index a61c0eaf27..ae91bd5405 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 1526df9550..aa88700423 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 326318508f..57d7d8dd69 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 95d2d56f6c..2038cfd58c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index e25fd72b07..d9a9db307d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index f6a8923d59..d98990c532 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 75eb1adb19..8f0c532a4a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 24edab4596..7e1b0c8226 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index f99bf09065..78867c96c0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 65029b46d4..02435b6c08 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index c3e9a0b35f..d3773f54f3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 8c2df93d6b..b8f402e4f0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 461310ec63..4eee8255cc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 503d64bd1f..811beafca6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 56c75d6937..025844c6b0 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 0d3adbecd7..a0cd57bcbb 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index b83884a7c2..81c9651fd9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 750e94586f..8306abc0a5 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 14fad8d287..60a60bb51d 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 7585720261..9195a369e7 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 756aed114f..2ced4db133 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 0650377635..0101464c82 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 9024c4b6a7..81efa44cc6 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index b915c87450..6eeb24d6b4 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 993c0fe0dc..30437f25ee 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index a6a34f3f62..feec706a25 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 6b54831690..3ef870bca5 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index a09ac12e82..2df07f7ea1 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index eb83ab9c29..71460f72cf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 6ea7150e01..c19e0aa253 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 4f047dd0cc..8b9ff5034c 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 6f7b9d70bd..9cf812ce3b 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index adb7e3a4b0..e84ac4d574 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 8757e3e686..ed6115b046 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 9f871500c1..4e8da25752 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index a64e1321ce..fdc5ffb8b3 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 7f4ed5e071..c246d05fed 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 6d410bcfef..c936b09fd7 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 9c5f7852e3..423d22b748 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.2.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 71528bcb71..12363f802e 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 60903aa214..ada06ed656 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 774782a2c1..5f4894204a 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.202502261823-rc1 +Bundle-Version: 7.2.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index a39f21e229..0f9ec1fb22 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202502261823-rc1 -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202502261823-rc1";roots="." +Bundle-Version: 7.2.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index ee532558eb..df7ae83647 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 4e68db439a..7c1a1d7336 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0.202502261823-rc1 + 7.2.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 5db57fe2a932fc05d28e057df9ff9d6a0bd6abe3 Mon Sep 17 00:00:00 2001 From: Ivan Frade Date: Wed, 26 Feb 2025 19:05:53 -0800 Subject: BlameRegionMerger: report invalid regions with checked exception. If the cached regions are invalid the merger throws an IllegalStateException. This is too strict. The caller can just continue working as if there was no cache. Report the error as IOException, that the caller can catch and handle. Change-Id: I19a1061225533b46d3a17936912a11000430f2ce --- .../tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java | 2 +- org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java index cf0dc452e7..1b28676fbf 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/blame/BlameRegionMergerTest.java @@ -174,7 +174,7 @@ public class BlameRegionMergerTest extends RepositoryTestCase { public void blame_corruptedIndex() { Region outOfRange = new Region(0, 43, 4); // This region is out of the blamed area - assertThrows(IllegalStateException.class, + assertThrows(IOException.class, () -> blamer.mergeOneRegion(outOfRange)); } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java index bf7e0ff736..67bc6fb789 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/BlameRegionMerger.java @@ -72,7 +72,7 @@ class BlameRegionMerger { List mergeOneRegion(Region region) throws IOException { List overlaps = findOverlaps(region); if (overlaps.isEmpty()) { - throw new IllegalStateException( + throw new IOException( "Cached blame should cover all lines"); } /* -- cgit v1.2.3 From 1ff9c2a1cbd5ac718559eef152d954755f257bc8 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Fri, 15 Nov 2024 08:37:10 +0100 Subject: FileReftableDatabase: consider ref updates by another process FileReftableDatabase didn't consider that refs might be changed by another process e.g. using git (which started supporting reftable with version 2.45). Add a test creating a light-weight tag which is updated using git running in another process and assert that FileReftableDatabase recognizes the tag modification. FileReftableStack#addReftable checks if the stack is up-to-date while it holds the FileLock for tables.list, if it is not up-to-date the RefUpdate fails with a LOCK_FAILURE to protect against lost ref updates if another instance of FileReftableDatabase or another thread or process updated the reftable stack since we last read it. If option `reftable.autoRefresh = true` or `setAutoRefresh(true)` was called check before each ref resolution if the reftable stack is up-to-date and, if necessary, reload the reftable stack automatically. Calling `setAutoRefresh(true)` takes precedence over the configured value for option `reftable.autoRefresh`. Add a testConcurrentRacyReload which tests that updates still abort ref updates if the reftable stack the update is based on was outdated. Bug: jgit-102 Change-Id: I1f9faa2afdbfff27e83ff295aef6d572babed4fe --- Documentation/config-options.md | 7 ++ org.eclipse.jgit.benchmarks/pom.xml | 4 + .../eclipse/jgit/benchmarks/GetRefsBenchmark.java | 15 +++ .../internal/storage/file/FileReftableTest.java | 134 ++++++++++++++++++++- .../storage/file/FileReftableDatabase.java | 54 +++++++++ .../src/org/eclipse/jgit/lib/ConfigConstants.java | 14 +++ 6 files changed, 227 insertions(+), 1 deletion(-) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index 807d4a8002..1dfe95f850 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -134,6 +134,13 @@ Proxy configuration uses the standard Java mechanisms via class `java.net.ProxyS | `pack.window` | `10` | ✅ | Number of objects to try when looking for a delta base per thread searching for deltas. | | `pack.windowMemory` | `0` (unlimited) | ✅ | Maximum number of bytes to put into the delta search window. | +## reftable options + +| option | default | git option | description | +|---------|---------|------------|-------------| +| `reftable.autoRefresh` | `false` | ⃞ | Whether to auto-refresh the reftable stack if it is out of date. | + + ## __repack__ options | option | default | git option | description | diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index c92fa9f156..e531245971 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -52,6 +52,10 @@ org.eclipse.jgit.junit ${project.version} + + junit + junit + diff --git a/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/GetRefsBenchmark.java b/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/GetRefsBenchmark.java index ea279fbba9..44e862e7c8 100644 --- a/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/GetRefsBenchmark.java +++ b/org.eclipse.jgit.benchmarks/src/org/eclipse/jgit/benchmarks/GetRefsBenchmark.java @@ -24,6 +24,7 @@ import java.util.stream.IntStream; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.errors.GitAPIException; +import org.eclipse.jgit.internal.storage.file.FileReftableDatabase; import org.eclipse.jgit.internal.storage.file.FileRepository; import org.eclipse.jgit.lib.BatchRefUpdate; import org.eclipse.jgit.lib.ConfigConstants; @@ -39,8 +40,10 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.transport.ReceiveCommand; import org.eclipse.jgit.util.FS; import org.eclipse.jgit.util.FileUtils; +import org.junit.Assume; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; import org.openjdk.jmh.annotations.Mode; import org.openjdk.jmh.annotations.OutputTimeUnit; @@ -67,6 +70,9 @@ public class GetRefsBenchmark { @Param({ "true", "false" }) boolean useRefTable; + @Param({ "true", "false" }) + boolean autoRefresh; + @Param({ "100", "1000", "10000", "100000" }) int numBranches; @@ -82,6 +88,9 @@ public class GetRefsBenchmark { @Setup @SuppressWarnings("boxing") public void setupBenchmark() throws IOException, GitAPIException { + // if we use RefDirectory skip autoRefresh = false + Assume.assumeTrue(useRefTable || autoRefresh); + String firstBranch = "firstbranch"; testDir = Files.createDirectory(Paths.get("testrepos")); String repoName = "branches-" + numBranches + "-trustStat-" @@ -98,6 +107,9 @@ public class GetRefsBenchmark { ((FileRepository) git.getRepository()).convertRefStorage( ConfigConstants.CONFIG_REF_STORAGE_REFTABLE, false, false); + FileReftableDatabase refdb = (FileReftableDatabase) git + .getRepository().getRefDatabase(); + refdb.setAutoRefresh(autoRefresh); } else { cfg.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null, ConfigConstants.CONFIG_KEY_TRUST_STAT, @@ -113,6 +125,7 @@ public class GetRefsBenchmark { System.out.println("Preparing test"); System.out.println("- repository: \t\t" + repoPath); System.out.println("- refDatabase: \t\t" + refDatabaseType()); + System.out.println("- autoRefresh: \t\t" + autoRefresh); System.out.println("- trustStat: \t" + trustStat); System.out.println("- branches: \t\t" + numBranches); @@ -154,6 +167,7 @@ public class GetRefsBenchmark { @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS) @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(2) public void testGetExactRef(Blackhole blackhole, BenchmarkState state) throws IOException { String branchName = state.branches @@ -166,6 +180,7 @@ public class GetRefsBenchmark { @OutputTimeUnit(TimeUnit.MICROSECONDS) @Warmup(iterations = 2, time = 100, timeUnit = TimeUnit.MILLISECONDS) @Measurement(iterations = 2, time = 5, timeUnit = TimeUnit.SECONDS) + @Fork(2) public void testGetRefsByPrefix(Blackhole blackhole, BenchmarkState state) throws IOException { String branchPrefix = "refs/heads/branch/" + branchIndex.nextInt(100) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java index 758ee93c30..5756b41442 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/file/FileReftableTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeTrue; import java.io.File; import java.io.FileOutputStream; @@ -33,8 +34,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; - import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +import org.eclipse.jgit.api.Git; import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.NullProgressMonitor; @@ -51,6 +59,10 @@ import org.eclipse.jgit.lib.RepositoryCache; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase; import org.eclipse.jgit.transport.ReceiveCommand; +import org.eclipse.jgit.util.FS; +import org.eclipse.jgit.util.FS.ExecutionResult; +import org.eclipse.jgit.util.RawParseUtils; +import org.eclipse.jgit.util.TemporaryBuffer; import org.junit.Test; public class FileReftableTest extends SampleDataRepositoryTestCase { @@ -64,6 +76,30 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { db.convertToReftable(false, false); } + @SuppressWarnings("boxing") + @Test + public void testReloadIfNecessary() throws Exception { + ObjectId id = db.resolve("master"); + try (FileRepository repo1 = new FileRepository(db.getDirectory()); + FileRepository repo2 = new FileRepository(db.getDirectory())) { + ((FileReftableDatabase) repo1.getRefDatabase()) + .setAutoRefresh(true); + ((FileReftableDatabase) repo2.getRefDatabase()) + .setAutoRefresh(true); + FileRepository repos[] = { repo1, repo2 }; + for (int i = 0; i < 10; i++) { + for (int j = 0; j < 2; j++) { + FileRepository repo = repos[j]; + RefUpdate u = repo.getRefDatabase().newUpdate( + String.format("branch%d", i * 10 + j), false); + u.setNewObjectId(id); + RefUpdate.Result r = u.update(); + assertEquals(Result.NEW, r); + } + } + } + } + @SuppressWarnings("boxing") @Test public void testRacyReload() throws Exception { @@ -97,6 +133,54 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { } } + @Test + public void testConcurrentRacyReload() throws Exception { + ObjectId id = db.resolve("master"); + final CyclicBarrier barrier = new CyclicBarrier(2); + + class UpdateRef implements Callable { + + private RefUpdate u; + + UpdateRef(FileRepository repo, String branchName) + throws IOException { + u = repo.getRefDatabase().newUpdate(branchName, + false); + u.setNewObjectId(id); + } + + @Override + public RefUpdate.Result call() throws Exception { + barrier.await(); // wait for the other thread to prepare + return u.update(); + } + } + + ExecutorService pool = Executors.newFixedThreadPool(2); + try (FileRepository repo1 = new FileRepository(db.getDirectory()); + FileRepository repo2 = new FileRepository(db.getDirectory())) { + ((FileReftableDatabase) repo1.getRefDatabase()) + .setAutoRefresh(true); + ((FileReftableDatabase) repo2.getRefDatabase()) + .setAutoRefresh(true); + for (int i = 0; i < 10; i++) { + String branchName = String.format("branch%d", + Integer.valueOf(i)); + Future ru1 = pool + .submit(new UpdateRef(repo1, branchName)); + Future ru2 = pool + .submit(new UpdateRef(repo2, branchName)); + assertTrue((ru1.get() == Result.NEW + && ru2.get() == Result.LOCK_FAILURE) + || (ru1.get() == Result.LOCK_FAILURE + && ru2.get() == Result.NEW)); + } + } finally { + pool.shutdown(); + pool.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS); + } + } + @Test public void testCompactFully() throws Exception { ObjectId c1 = db.resolve("master^^"); @@ -651,6 +735,54 @@ public class FileReftableTest extends SampleDataRepositoryTestCase { checkContainsRef(refs, db.exactRef("HEAD")); } + @Test + public void testExternalUpdate_bug_102() throws Exception { + ((FileReftableDatabase) db.getRefDatabase()).setAutoRefresh(true); + assumeTrue(atLeastGitVersion(2, 45)); + Git git = Git.wrap(db); + git.tag().setName("foo").call(); + Ref ref = db.exactRef("refs/tags/foo"); + assertNotNull(ref); + runGitCommand("tag", "--force", "foo", "e"); + Ref e = db.exactRef("refs/heads/e"); + Ref foo = db.exactRef("refs/tags/foo"); + assertEquals(e.getObjectId(), foo.getObjectId()); + } + + private String toString(TemporaryBuffer b) throws IOException { + return RawParseUtils.decode(b.toByteArray()); + } + + private ExecutionResult runGitCommand(String... args) + throws IOException, InterruptedException { + FS fs = db.getFS(); + ProcessBuilder pb = fs.runInShell("git", args); + pb.directory(db.getWorkTree()); + System.err.println("PATH=" + pb.environment().get("PATH")); + ExecutionResult result = fs.execute(pb, null); + assertEquals(0, result.getRc()); + String err = toString(result.getStderr()); + if (!err.isEmpty()) { + System.err.println(err); + } + String out = toString(result.getStdout()); + if (!out.isEmpty()) { + System.out.println(out); + } + return result; + } + + private boolean atLeastGitVersion(int minMajor, int minMinor) + throws IOException, InterruptedException { + String version = toString(runGitCommand("version").getStdout()) + .split(" ")[2]; + System.out.println(version); + String[] digits = version.split("\\."); + int major = Integer.parseInt(digits[0]); + int minor = Integer.parseInt(digits[1]); + return (major >= minMajor) && (minor >= minMinor); + } + private RefUpdate updateRef(String name) throws IOException { final RefUpdate ref = db.updateRef(name); ref.setNewObjectId(db.resolve(Constants.HEAD)); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java index 6040ad554d..d70fa839e9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java @@ -16,6 +16,7 @@ import static org.eclipse.jgit.lib.Ref.Storage.PACKED; import java.io.File; import java.io.IOException; +import java.io.UncheckedIOException; import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -37,6 +38,7 @@ import org.eclipse.jgit.internal.storage.reftable.ReftableBatchRefUpdate; import org.eclipse.jgit.internal.storage.reftable.ReftableDatabase; import org.eclipse.jgit.internal.storage.reftable.ReftableWriter; import org.eclipse.jgit.lib.BatchRefUpdate; +import org.eclipse.jgit.lib.ConfigConstants; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef; @@ -70,6 +72,8 @@ public class FileReftableDatabase extends RefDatabase { private final FileReftableStack reftableStack; + private boolean autoRefresh; + FileReftableDatabase(FileRepository repo) throws IOException { this(repo, new File(new File(repo.getCommonDirectory(), Constants.REFTABLE), Constants.TABLES_LIST)); @@ -77,6 +81,9 @@ public class FileReftableDatabase extends RefDatabase { FileReftableDatabase(FileRepository repo, File refstackName) throws IOException { this.fileRepository = repo; + this.autoRefresh = repo.getConfig().getBoolean( + ConfigConstants.CONFIG_REFTABLE_SECTION, + ConfigConstants.CONFIG_KEY_AUTOREFRESH, false); this.reftableStack = new FileReftableStack(refstackName, new File(fileRepository.getCommonDirectory(), Constants.REFTABLE), () -> fileRepository.fireEvent(new RefsChangedEvent()), @@ -183,6 +190,7 @@ public class FileReftableDatabase extends RefDatabase { @Override public Ref exactRef(String name) throws IOException { + autoRefresh(); return reftableDatabase.exactRef(name); } @@ -193,6 +201,7 @@ public class FileReftableDatabase extends RefDatabase { @Override public Map getRefs(String prefix) throws IOException { + autoRefresh(); List refs = reftableDatabase.getRefsByPrefix(prefix); RefList.Builder builder = new RefList.Builder<>(refs.size()); for (Ref r : refs) { @@ -205,6 +214,7 @@ public class FileReftableDatabase extends RefDatabase { @Override public List getRefsByPrefixWithExclusions(String include, Set excludes) throws IOException { + autoRefresh(); return reftableDatabase.getRefsByPrefixWithExclusions(include, excludes); } @@ -223,6 +233,50 @@ public class FileReftableDatabase extends RefDatabase { } + /** + * Whether to auto-refresh the reftable stack if it is out of date. + * + * @param autoRefresh + * whether to auto-refresh the reftable stack if it is out of + * date. + */ + public void setAutoRefresh(boolean autoRefresh) { + this.autoRefresh = autoRefresh; + } + + /** + * Whether the reftable stack is auto-refreshed if it is out of date. + * + * @return whether the reftable stack is auto-refreshed if it is out of + * date. + */ + public boolean isAutoRefresh() { + return autoRefresh; + } + + private void autoRefresh() { + if (autoRefresh) { + refresh(); + } + } + + /** + * Check if the reftable stack is up to date, and if not, reload it. + *

+ * {@inheritDoc} + */ + @Override + public void refresh() { + try { + if (!reftableStack.isUpToDate()) { + reftableDatabase.clearCache(); + reftableStack.reload(); + } + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + private Ref doPeel(Ref leaf) throws IOException { try (RevWalk rw = new RevWalk(fileRepository)) { RevObject obj = rw.parseAny(leaf.getObjectId()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index 30e7de47c3..f62bf161a7 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -1093,4 +1093,18 @@ public final class ConfigConstants { * @since 7.1 */ public static final String CONFIG_KEY_LOAD_REV_INDEX_IN_PARALLEL = "loadRevIndexInParallel"; + + /** + * The "reftable" section + * + * @since 7.2 + */ + public static final String CONFIG_REFTABLE_SECTION = "reftable"; + + /** + * The "autorefresh" key + * + * @since 7.2 + */ + public static final String CONFIG_KEY_AUTOREFRESH = "autorefresh"; } -- cgit v1.2.3 From ac5146ffbf9d331e852059b2eb14841927f301a1 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Wed, 8 Jan 2025 18:38:31 +0100 Subject: FileReftableStack: use FileSnapshot to detect modification Reading file attributes is faster than reading file content hence use FileSnapshot to speedup detecting if FileReftableStack is up-to-date. Introduce new option "core.trustTablesListStat" allowing to configure if we can trust file attributes of the "tables.list" file to speedup detection of file modifications. This file is used to store the list of filenames of the files storing Reftables in FileReftableDatabase. If this option is set to "ALWAYS" we trust File attributes and use them to speedup detection of file modifications. If set to "NEVER" the content of the "tables.list" file is always read unconditionally. This can help to avoid caching issues on some filesystems. If set to "AFTER_OPEN" we will open a FileInputStream to refresh File attributes of the "tables.list" file before relying on the refreshed File attributes to detect modifications. This works on some NFS filesystems and is faster than using "NEVER". Change-Id: I3e288d90fb07edf4fa2a03c707a333b26f0c458d --- Documentation/config-options.md | 3 +- .../internal/storage/file/FileReftableStack.java | 40 ++++++++++++++++++++-- .../src/org/eclipse/jgit/lib/ConfigConstants.java | 8 +++++ .../src/org/eclipse/jgit/lib/CoreConfig.java | 24 +++++++++++++ 4 files changed, 71 insertions(+), 4 deletions(-) diff --git a/Documentation/config-options.md b/Documentation/config-options.md index 1dfe95f850..4dde8f8c15 100644 --- a/Documentation/config-options.md +++ b/Documentation/config-options.md @@ -58,9 +58,10 @@ For details on native git options see also the official [git config documentatio | ~~`core.trustFolderStat`~~ | `true` | ⃞ | __Deprecated__, use `core.trustStat` instead. If set to `true` translated to `core.trustStat=always`, if `false` translated to `core.trustStat=never`, see below. If both `core.trustFolderStat` and `core.trustStat` are configured then `trustStat` takes precedence and `trustFolderStat` is ignored. | | `core.trustLooseRefStat` | `inherit` | ⃞ | Whether to trust the file attributes of loose refs and its fan-out parent directory. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `trustStat`. | | `core.trustPackedRefsStat` | `inherit` | ⃞ | Whether to trust the file attributes of the packed-refs file. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `core.trustStat`. | +| `core.trustTablesListStat` | `inherit` | ⃞ | Whether to trust the file attributes of the `tables.list` file used by the reftable ref storage backend to store the list of reftable filenames. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `core.trustStat`. The reftable backend is used if `extensions.refStorage = reftable`. | | `core.trustLooseObjectStat` | `inherit` | ⃞ | Whether to trust the file attributes of the loose object file and its fan-out parent directory. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `core.trustStat`. | | `core.trustPackStat` | `inherit` | ⃞ | Whether to trust the file attributes of the `objects/pack` directory. See `core.trustStat` for possible values. If `inherit`, JGit will use the behavior configured in `core.trustStat`. | -| `core.trustStat` | `always` | ⃞ | Global option to configure whether to trust file attributes (Java equivalent of stat command on Unix) of files storing git objects. Can be overridden for specific files by configuring `core.trustLooseRefStat, core.trustPackedRefsStat, core.trustLooseObjectStat, core.trustPackStat`. If `never` JGit will ignore the file attributes of the file and always read it. If `always` JGit will trust the file attributes and will only read it if a file attribute has changed. `after_open` behaves the same as `always`, but file attributes are only considered *after* the file itself and any transient parent directories have been opened and closed. An open/close of the file/directory is known to refresh its file attributes, at least on some NFS clients. | +| `core.trustStat` | `always` | ⃞ | Global option to configure whether to trust file attributes (Java equivalent of stat command on Unix) of files storing git objects. Can be overridden for specific files by configuring `core.trustLooseRefStat, core.trustPackedRefsStat, core.trustLooseObjectStat, core.trustPackStat,core.trustTablesListStat`. If `never` JGit will ignore the file attributes of the file and always read it. If `always` JGit will trust the file attributes and will only read it if a file attribute has changed. `after_open` behaves the same as `always`, but file attributes are only considered *after* the file itself and any transient parent directories have been opened and closed. An open/close of the file/directory is known to refresh its file attributes, at least on some NFS clients. | | `core.worktree` | Root directory of the working tree if it is not the parent directory of the `.git` directory | ✅ | The path to the root of the working tree. | ## __fetch__ options diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableStack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableStack.java index 0f5ff0f9f7..b2c88922b8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableStack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableStack.java @@ -18,8 +18,10 @@ import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.nio.file.Files; +import java.nio.file.NoSuchFileException; import java.nio.file.StandardCopyOption; import java.security.SecureRandom; import java.util.ArrayList; @@ -27,6 +29,7 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.concurrent.atomic.AtomicReference; import java.util.function.Supplier; import java.util.stream.Collectors; @@ -39,6 +42,8 @@ import org.eclipse.jgit.internal.storage.reftable.ReftableConfig; import org.eclipse.jgit.internal.storage.reftable.ReftableReader; import org.eclipse.jgit.internal.storage.reftable.ReftableWriter; import org.eclipse.jgit.lib.Config; +import org.eclipse.jgit.lib.CoreConfig; +import org.eclipse.jgit.lib.CoreConfig.TrustStat; import org.eclipse.jgit.util.FileUtils; import org.eclipse.jgit.util.SystemReader; @@ -59,6 +64,9 @@ public class FileReftableStack implements AutoCloseable { private List stack; + private AtomicReference snapshot = new AtomicReference<>( + FileSnapshot.DIRTY); + private long lastNextUpdateIndex; private final File stackPath; @@ -98,6 +106,8 @@ public class FileReftableStack implements AutoCloseable { private final CompactionStats stats; + private final TrustStat trustTablesListStat; + /** * Creates a stack corresponding to the list of reftables in the argument * @@ -126,6 +136,8 @@ public class FileReftableStack implements AutoCloseable { reload(); stats = new CompactionStats(); + trustTablesListStat = configSupplier.get().get(CoreConfig.KEY) + .getTrustTablesListStat(); } CompactionStats getStats() { @@ -272,8 +284,9 @@ public class FileReftableStack implements AutoCloseable { } private List readTableNames() throws IOException { + FileSnapshot old; List names = new ArrayList<>(stack.size() + 1); - + old = snapshot.get(); try (BufferedReader br = new BufferedReader( new InputStreamReader(new FileInputStream(stackPath), UTF_8))) { String line; @@ -282,8 +295,10 @@ public class FileReftableStack implements AutoCloseable { names.add(line); } } + snapshot.compareAndSet(old, FileSnapshot.save(stackPath)); } catch (FileNotFoundException e) { // file isn't there: empty repository. + snapshot.compareAndSet(old, FileSnapshot.MISSING_FILE); } return names; } @@ -294,9 +309,28 @@ public class FileReftableStack implements AutoCloseable { * on IO problem */ boolean isUpToDate() throws IOException { - // We could use FileSnapshot to avoid reading the file, but the file is - // small so it's probably a minor optimization. try { + switch (trustTablesListStat) { + case NEVER: + break; + case AFTER_OPEN: + try (InputStream stream = Files + .newInputStream(stackPath.toPath())) { + // open the tables.list file to refresh attributes (on some + // NFS clients) + } catch (FileNotFoundException | NoSuchFileException e) { + // ignore + } + //$FALL-THROUGH$ + case ALWAYS: + if (!snapshot.get().isModified(stackPath)) { + return true; + } + break; + case INHERIT: + // only used in CoreConfig internally + throw new IllegalStateException(); + } List names = readTableNames(); if (names.size() != stack.size()) { return false; diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java index f62bf161a7..c4550329d3 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java @@ -1045,6 +1045,14 @@ public final class ConfigConstants { * @since 7.2 */ public static final String CONFIG_KEY_TRUST_LOOSE_OBJECT_STAT = "trustLooseObjectStat"; + + /** + * The "trustTablesListStat" key + * + * @since 7.2 + */ + public static final String CONFIG_KEY_TRUST_TABLESLIST_STAT = "trustTablesListStat"; + /** * The "pack.preserveOldPacks" key * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java index e43c9653dd..0e27b2743c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/CoreConfig.java @@ -215,6 +215,8 @@ public class CoreConfig { private final TrustStat trustLooseObjectStat; + private final TrustStat trustTablesListStat; + /** * Options for symlink handling * @@ -268,6 +270,7 @@ public class CoreConfig { trustLooseRefStat = parseTrustLooseRefStat(rc); trustPackStat = parseTrustPackFileStat(rc); trustLooseObjectStat = parseTrustLooseObjectFileStat(rc); + trustTablesListStat = parseTablesListStat(rc); } private static TrustStat parseTrustStat(Config rc) { @@ -318,6 +321,13 @@ public class CoreConfig { return t == TrustStat.INHERIT ? trustStat : t; } + private TrustStat parseTablesListStat(Config rc) { + TrustStat t = rc.getEnum(ConfigConstants.CONFIG_CORE_SECTION, null, + ConfigConstants.CONFIG_KEY_TRUST_TABLESLIST_STAT, + TrustStat.INHERIT); + return t == TrustStat.INHERIT ? trustStat : t; + } + /** * Get the compression level to use when storing loose objects * @@ -418,4 +428,18 @@ public class CoreConfig { public TrustStat getTrustLooseObjectStat() { return trustLooseObjectStat; } + + /** + * Get how far we can trust file attributes of the "tables.list" file which + * is used to store the list of filenames of the files storing + * {@link org.eclipse.jgit.internal.storage.reftable.Reftable}s in + * {@link org.eclipse.jgit.internal.storage.file.FileReftableDatabase}. + * + * @return how far we can trust file attributes of the "tables.list" file. + * + * @since 7.2 + */ + public TrustStat getTrustTablesListStat() { + return trustTablesListStat; + } } -- cgit v1.2.3 From 4ef88700db1da4ab07917b084057769a43735682 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Mon, 3 Mar 2025 22:17:30 +0100 Subject: Ensure access to autoRefresh is thread-safe Change-Id: I7651613c33803daf00882a543dbf0c3f836110fa --- .../jgit/internal/storage/file/FileReftableDatabase.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java index d70fa839e9..e9782e2e18 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/FileReftableDatabase.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; @@ -72,7 +73,7 @@ public class FileReftableDatabase extends RefDatabase { private final FileReftableStack reftableStack; - private boolean autoRefresh; + private final AtomicBoolean autoRefresh; FileReftableDatabase(FileRepository repo) throws IOException { this(repo, new File(new File(repo.getCommonDirectory(), Constants.REFTABLE), @@ -81,9 +82,9 @@ public class FileReftableDatabase extends RefDatabase { FileReftableDatabase(FileRepository repo, File refstackName) throws IOException { this.fileRepository = repo; - this.autoRefresh = repo.getConfig().getBoolean( + this.autoRefresh = new AtomicBoolean(repo.getConfig().getBoolean( ConfigConstants.CONFIG_REFTABLE_SECTION, - ConfigConstants.CONFIG_KEY_AUTOREFRESH, false); + ConfigConstants.CONFIG_KEY_AUTOREFRESH, false)); this.reftableStack = new FileReftableStack(refstackName, new File(fileRepository.getCommonDirectory(), Constants.REFTABLE), () -> fileRepository.fireEvent(new RefsChangedEvent()), @@ -241,7 +242,7 @@ public class FileReftableDatabase extends RefDatabase { * date. */ public void setAutoRefresh(boolean autoRefresh) { - this.autoRefresh = autoRefresh; + this.autoRefresh.set(autoRefresh); } /** @@ -251,11 +252,11 @@ public class FileReftableDatabase extends RefDatabase { * date. */ public boolean isAutoRefresh() { - return autoRefresh; + return autoRefresh.get(); } private void autoRefresh() { - if (autoRefresh) { + if (autoRefresh.get()) { refresh(); } } -- cgit v1.2.3 From 28136bc499832d6031e1b99d98d0328c17d469d3 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Mar 2025 09:05:34 +0100 Subject: CacheRegion: fix non translatable text warnings Change-Id: I163957653b075f1f05a6219f4d23b340588ffcbd --- .../resources/org/eclipse/jgit/internal/JGitText.properties | 1 + .../src/org/eclipse/jgit/blame/cache/CacheRegion.java | 8 ++++++-- org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index f8c8ecaeab..27270a1f25 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -76,6 +76,7 @@ branchNameInvalid=Branch name {0} is not allowed buildingBitmaps=Building bitmaps cachedPacksPreventsIndexCreation=Using cached packs prevents index creation cachedPacksPreventsListingObjects=Using cached packs prevents listing objects +cacheRegionAllOrNoneNull=expected all null or none: {0}, {1} cannotAccessLastModifiedForSafeDeletion=Unable to access lastModifiedTime of file {0}, skip deletion since we cannot safely avoid race condition cannotBeCombined=Cannot be combined. cannotBeRecursiveWhenTreesAreIncluded=TreeWalk shouldn't be recursive when tree objects are included. diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java b/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java index 6aa4eef2ca..cf3f978044 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/blame/cache/CacheRegion.java @@ -9,6 +9,9 @@ */ package org.eclipse.jgit.blame.cache; +import java.text.MessageFormat; + +import org.eclipse.jgit.internal.JGitText; import org.eclipse.jgit.lib.ObjectId; /** @@ -92,6 +95,7 @@ public class CacheRegion implements Comparable { return start - o.start; } + @SuppressWarnings("nls") @Override public String toString() { StringBuilder sb = new StringBuilder(); @@ -115,7 +119,7 @@ public class CacheRegion implements Comparable { if (path == null && commit == null) { return; } - throw new IllegalArgumentException(String.format( - "expected all null or none: %s, %s", path, commit)); + throw new IllegalArgumentException(MessageFormat + .format(JGitText.get().cacheRegionAllOrNoneNull, path, commit)); } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java index 91ce3479e2..bf252f9968 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java @@ -106,6 +106,7 @@ public class JGitText extends TranslationBundle { /***/ public String buildingBitmaps; /***/ public String cachedPacksPreventsIndexCreation; /***/ public String cachedPacksPreventsListingObjects; + /***/ public String cacheRegionAllOrNoneNull; /***/ public String cannotAccessLastModifiedForSafeDeletion; /***/ public String cannotBeCombined; /***/ public String cannotBeRecursiveWhenTreesAreIncluded; -- cgit v1.2.3 From c43126fc84a5f123b2dec8afe1b3815ffba865d0 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Mar 2025 09:06:04 +0100 Subject: JGit v7.2.0.202503040805-r Signed-off-by: Matthias Sohn Change-Id: Ie3159a6610f3a1425c3b812f8284c073ee2b429c --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 0069b09467..77c095e7cb 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index c6c81648ae..96ae4e1388 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 3af82e4759..9ff60f1d2b 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 89d05be73b..cce12d202d 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 11806f15c6..def678e5f3 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index b142a66a8c..1e008ef6d5 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 3ca6590f02..e796664e5a 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 27a2bba5a2..b70b4a0014 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index e531245971..82ca4370b9 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 9493c07dbc..2851f58931 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.test - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 35294256e1..a21f16c4fa 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 245ba7e127..9d5c343145 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 2120439e51..7ae47ad327 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 532e749cb2..6ba2141747 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index f94e2b27b1..23bbc61e68 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 7d23d53614..145ff7dbef 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 679252de34..f0f7693e06 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index c390d8f5ee..78e529530e 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 39dc2ef42a..db0eeb7073 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.2.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index e7940bd358..d76534a62e 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 3f79f8b82d..e9601456ed 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 3550501dba..0a1d36e7fc 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 2f25191fee..610845ea1a 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 4ba595901b..93fe82975b 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 5abd7d6d51..628f5d383a 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ea38ae31ba..ee66c6a2ad 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index c8354cf60a..af6529a5b0 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index b8f22cea5d..cb283b4f2e 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index f937748212..d268e4c6fa 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 6488a887fb..e272fb3c47 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 9d494cb2e0..8389c8a19c 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 9f43ced73b..c812e3a5c9 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 77749c8d89..1afed0c787 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 98e63b0f1e..25a0c3ea4a 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 1973b26477..2ce4b0e7ba 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 73f5cab59d..805ac5c628 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 0dd0786050..845df10f14 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index f27377447c..95d18dcb28 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index eff7e0b7eb..9248fc0e84 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index fb211cc89c..20290b7062 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.2.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 4ca03a3f72..4a8e031a6f 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 329740085e..e51e24c567 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 43980f06ae..6adf399e0e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 59345e75f9..7dd0f66e49 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index ae91bd5405..8a3107f62e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index aa88700423..38d1853d0c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 57d7d8dd69..c00da114e9 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 2038cfd58c..2a662dc2b7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index d9a9db307d..832f41afb5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index d98990c532..9988c6fc84 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8f0c532a4a..ae49dc401a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 7e1b0c8226..05a2887c18 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 78867c96c0..0408eff380 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index 02435b6c08..acbb554964 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index d3773f54f3..6f89362355 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index b8f402e4f0..062e8d756f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 4eee8255cc..4e5e9526c6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 811beafca6..c749417f4b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 025844c6b0..0658628a48 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index a0cd57bcbb..69309707c1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 81c9651fd9..5bc48dbb9a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 8306abc0a5..856673a46f 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 60a60bb51d..1b8fcc670a 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 9195a369e7..3f63999fc6 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 2ced4db133..3e33e8fa87 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 0101464c82..e8c6dbd419 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 81efa44cc6..bfbc77e617 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 6eeb24d6b4..85d6ecf125 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 30437f25ee..9b34358dd2 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index feec706a25..c9937c06ad 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 3ef870bca5..36c29e944b 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 2df07f7ea1..92bc533d9c 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 71460f72cf..98c18d3be9 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index c19e0aa253..c246509daf 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 8b9ff5034c..50f82ae7fa 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 9cf812ce3b..5202a8d0f0 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index e84ac4d574..7221f2145f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index ed6115b046..220a251edd 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 4e8da25752..8db4176f7f 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index fdc5ffb8b3..658caffed5 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index c246d05fed..27908f24cf 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index c936b09fd7..1e6bfc85fe 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 423d22b748..668bc1e5a7 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.2.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 12363f802e..d608678982 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index ada06ed656..1813e23bbb 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 5f4894204a..3348d70780 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.qualifier +Bundle-Version: 7.2.0.202503040805-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 0f9ec1fb22..576bada1c9 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.qualifier";roots="." +Bundle-Version: 7.2.0.202503040805-r +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202503040805-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index df7ae83647..50aad99f19 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 7c1a1d7336..d83f8ffeda 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0-SNAPSHOT + 7.2.0.202503040805-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From fddef06ccb0034b6b747a62532025d3d712dbe47 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Mar 2025 10:41:12 +0100 Subject: JGit v7.2.0.202503040940-r Signed-off-by: Matthias Sohn Change-Id: I3d3f7fc6732b3204970a7be7886361920d8ec60e --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++++++++++----------- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 2 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 2 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 2 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 2 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 2 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +-- .../feature.xml | 2 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 2 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 2 +- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +-- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 123 insertions(+), 123 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 77c095e7cb..6d75889561 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 96ae4e1388..6c226d2bde 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index 9ff60f1d2b..ed6ea14fd7 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index cce12d202d..5e7b30fcd3 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index def678e5f3..ff32b474e9 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 1e008ef6d5..c36eb8f992 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index e796664e5a..38f52d535f 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index b70b4a0014..4a29cc0131 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 82ca4370b9..946ab803f8 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index 2851f58931..dc349ac1e9 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.test - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0.202503040805-r + 7.2.0.202503040940-r diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index a21f16c4fa..fafe618a06 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 9d5c343145..927e2703b0 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index 7ae47ad327..f85768196f 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 6ba2141747..b04f0de2db 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 23bbc61e68..afdb8b640b 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 145ff7dbef..ada86d8103 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index f0f7693e06..342d987bca 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index 78e529530e..d60a7eb7c8 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index db0eeb7073..91c46932f8 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.http.server;version="7.2.0", diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index d76534a62e..022b4ad195 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index e9601456ed..358e6d1dfb 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 0a1d36e7fc..48a5566314 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 610845ea1a..d6bd92e287 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 93fe82975b..4931dae377 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 628f5d383a..4b415b4edb 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ee66c6a2ad..0992a40bea 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index af6529a5b0..1c83c5c872 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index cb283b4f2e..b85d3b52c0 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index d268e4c6fa..9ca5145cfc 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index e272fb3c47..cae5b24537 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index 8389c8a19c..bac03d70a8 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index c812e3a5c9..37ac5cb9d4 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 1afed0c787..956da95c3b 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 25a0c3ea4a..2d6dcbb91a 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 2ce4b0e7ba..8a6778da71 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 805ac5c628..9eda301ba9 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 845df10f14..b9b49a921d 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index 95d18dcb28..b5505e7960 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 9248fc0e84..4e30af7f35 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 20290b7062..8c33964d8e 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Export-Package: org.eclipse.jgit.lfs;version="7.2.0", diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 4a8e031a6f..6b5cb95b5d 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index e51e24c567..8597a03108 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index 6adf399e0e..c936383530 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index 7dd0f66e49..ebba8b3774 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 8a3107f62e..458b2b84d3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml index 38d1853d0c..ed4ed18546 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index c00da114e9..38554732af 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml index 2a662dc2b7..bbfd532ff4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 832f41afb5..17b96a7fa6 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml index 9988c6fc84..2c322104f1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index ae49dc401a..8db6db7f6b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml index 05a2887c18..01e580ef13 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 0408eff380..85dd43c2ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml index acbb554964..f3ad0c68dc 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 6f89362355..0db03d3692 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 062e8d756f..657a30d32b 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml index 4e5e9526c6..87abb76ec1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0.202503040805-r + 7.2.0.202503040940-r diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index c749417f4b..2fcd8d9604 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml index 0658628a48..869971e55a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 69309707c1..c532b46b25 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml index 5bc48dbb9a..35837a8d02 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 856673a46f..58ccf0832d 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 1b8fcc670a..15edb2bcae 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 3f63999fc6..33856682fa 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index 3e33e8fa87..a982c4b728 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index e8c6dbd419..1382e5b7b9 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index bfbc77e617..e584c39fa8 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 85d6ecf125..49aadb60bd 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 9b34358dd2..c9c3860905 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index c9937c06ad..09f8a3695e 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 36c29e944b..b316c870a6 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 92bc533d9c..66e2b494a0 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 98c18d3be9..24f83df3b0 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index c246509daf..fbdae452a4 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 50f82ae7fa..e25730b4d9 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 5202a8d0f0..b2f46b538f 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 7221f2145f..5b454a5ab9 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 220a251edd..2ec7737a4a 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index 8db4176f7f..bbe649c5b9 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 658caffed5..7624d3fc66 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 27908f24cf..749417d890 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 1e6bfc85fe..a9352c723e 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 668bc1e5a7..4b2da7e945 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.jgit.awtui;version="7.2.0" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index d608678982..51d38e2401 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 1813e23bbb..80fc73ea8d 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 3348d70780..28d24a2767 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.202503040805-r +Bundle-Version: 7.2.0.202503040940-r Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 576bada1c9..9b9b396230 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040805-r -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202503040805-r";roots="." +Bundle-Version: 7.2.0.202503040940-r +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202503040940-r";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 50aad99f19..d195ae4002 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040805-r + 7.2.0.202503040940-r org.eclipse.jgit diff --git a/pom.xml b/pom.xml index d83f8ffeda..96fc0accfb 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0.202503040805-r + 7.2.0.202503040940-r JGit - Parent ${jgit-url} -- cgit v1.2.3 From 79736e412e971cea1d034e18d784f1d4d12b3a0f Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Mar 2025 13:47:25 +0100 Subject: Prepare 7.2.1-SNAPSHOT builds Change-Id: Iddc02bb3c2235b491d9b7034f29591b09d042e11 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++--- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 +++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 42 +++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 36 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 ++++---- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 88 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 +++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 40 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 122 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 116 ++++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 548 insertions(+), 548 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 6d75889561..33a15ad9b9 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.ant.tasks;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 6c226d2bde..9d8fe5cf8e 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index ed6ea14fd7..fa4cc8ff84 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)" + org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.2.0", - org.eclipse.jgit.ant.tasks;version="7.2.0"; +Export-Package: org.eclipse.jgit.ant;version="7.2.1", + org.eclipse.jgit.ant.tasks;version="7.2.1"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 5e7b30fcd3..999651d2fc 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index ff32b474e9..08458c9319 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index c36eb8f992..9ed283ae5f 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,18 +13,18 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.2.0"; +Export-Package: org.eclipse.jgit.archive;version="7.2.1"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.2.0";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.2.1";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index 38f52d535f..f87c0df4e0 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 4a29cc0131..690c590d04 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 946ab803f8..8acafb80c3 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index dc349ac1e9..e61d8c159c 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index fafe618a06..3098195af4 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.sha1;version="[7.2.0,7.3.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.sha1;version="[7.2.1,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 927e2703b0..13b0979d09 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index f85768196f..fedee97027 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.1,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", @@ -26,5 +26,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.2.0";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.2.0";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.2.1";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.2.1";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index b04f0de2db..20d5a904c5 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index afdb8b640b..991711b107 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index ada86d8103..07f23213ce 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.2.0"; + org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.2.1"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 342d987bca..90fa705a9e 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index d60a7eb7c8..ddc141a700 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 91c46932f8..51d64edab1 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="7.2.0", - org.eclipse.jgit.http.server.glue;version="7.2.0"; +Export-Package: org.eclipse.jgit.http.server;version="7.2.1", + org.eclipse.jgit.http.server.glue;version="7.2.1"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.2.0"; + org.eclipse.jgit.http.server.resolver;version="7.2.1"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, @@ -19,14 +19,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)" + org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index 022b4ad195..ff6d607a38 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 358e6d1dfb..360c694820 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 48a5566314..795351b29e 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -29,26 +29,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.http.server;version="[7.2.0,7.3.0)", - org.eclipse.jgit.http.server.glue;version="[7.2.0,7.3.0)", - org.eclipse.jgit.http.server.resolver;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.http.server;version="[7.2.1,7.3.0)", + org.eclipse.jgit.http.server.glue;version="[7.2.1,7.3.0)", + org.eclipse.jgit.http.server.resolver;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index d6bd92e287..69ad378d6e 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 4931dae377..9afec59794 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,17 +22,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.http.server;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.http.server;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.2.0"; +Export-Package: org.eclipse.jgit.junit.http;version="7.2.1"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 4b415b4edb..0abd69a56d 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index 0992a40bea..ce8745afec 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index 1c83c5c872..b6fad01ae5 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.15.0,2.16.0)", org.apache.sshd.server.subsystem;version="[2.15.0,2.16.0)", org.apache.sshd.sftp;version="[2.15.0,2.16.0)", org.apache.sshd.sftp.server;version="[2.15.0,2.16.0)", - org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.2.0" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.2.1" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index b85d3b52c0..655d7176de 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 9ca5145cfc..7304697bb7 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index cae5b24537..84f5909952 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.util;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="7.2.0", - org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.time;version="[7.2.0,7.3.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="7.2.1", + org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.time;version="[7.2.1,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.2.0"; +Export-Package: org.eclipse.jgit.junit;version="7.2.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.2.0"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.2.0";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.2.1";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index bac03d70a8..e5209dafc6 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 37ac5cb9d4..55b15f0056 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index 956da95c3b..acaac0766e 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,24 +26,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.server;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.test;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.server;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.test;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index 2d6dcbb91a..a84195c52b 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 8a6778da71..951029b820 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="7.2.0"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.2.1"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.2.0"; + org.eclipse.jgit.lfs.server.fs;version="7.2.1"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.2.0";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.2.0"; + org.eclipse.jgit.lfs.server.internal;version="7.2.1";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.2.1"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index 9eda301ba9..d984ed2b23 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index b9b49a921d..25886c8919 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index b5505e7960..b9c1d82274 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", +Import-Package: org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="7.2.0";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.2.1";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 4e30af7f35..56764ee044 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 8c33964d8e..53b8a12fe6 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="7.2.0", - org.eclipse.jgit.lfs.errors;version="7.2.0", - org.eclipse.jgit.lfs.internal;version="7.2.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="7.2.0" +Export-Package: org.eclipse.jgit.lfs;version="7.2.1", + org.eclipse.jgit.lfs.errors;version="7.2.1", + org.eclipse.jgit.lfs.internal;version="7.2.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="7.2.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.hooks;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)" + org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.hooks;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 6b5cb95b5d..3bc9aa0c1b 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 8597a03108..70440f565b 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index c936383530..b41dd49497 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index ebba8b3774..c8f97220e3 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 458b2b84d3..63dafd638c 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 38554732af..92ab49fd00 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index 17b96a7fa6..e92e921272 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 8db6db7f6b..76db5df02e 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 85dd43c2ae..0cfe1dfe8d 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index 0db03d3692..f159039b84 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 657a30d32b..8861de9e44 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 2fcd8d9604..13c7fa1ed8 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index c532b46b25..0955171741 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 58ccf0832d..9a08ac1c34 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 15edb2bcae..0d7da80996 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", - org.eclipse.jgit.pgm;version="[7.2.0,7.3.0)", - org.eclipse.jgit.pgm.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.pgm.opt;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", +Import-Package: org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", + org.eclipse.jgit.pgm;version="[7.2.1,7.3.0)", + org.eclipse.jgit.pgm.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.pgm.opt;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 33856682fa..2af017beb1 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index a982c4b728..c630bb94bc 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,50 +14,50 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.archive;version="[7.2.0,7.3.0)", - org.eclipse.jgit.awtui;version="[7.2.0,7.3.0)", - org.eclipse.jgit.blame;version="[7.2.0,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.gitrepo;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.io;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.server;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.notes;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk.filter;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http.apache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.archive;version="[7.2.1,7.3.0)", + org.eclipse.jgit.awtui;version="[7.2.1,7.3.0)", + org.eclipse.jgit.blame;version="[7.2.1,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.gitrepo;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.io;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.server;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.notes;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk.filter;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http.apache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.sshd;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="7.2.0"; +Export-Package: org.eclipse.jgit.console;version="7.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.2.0"; + org.eclipse.jgit.pgm;version="7.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -69,14 +69,14 @@ Export-Package: org.eclipse.jgit.console;version="7.2.0"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.2.0"; + org.eclipse.jgit.pgm.debug;version="7.2.1"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.2.0"; + org.eclipse.jgit.pgm.internal;version="7.2.1"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.2.0"; + org.eclipse.jgit.pgm.opt;version="7.2.1"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 1382e5b7b9..3b92eb330d 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index e584c39fa8..19f85ea473 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 49aadb60bd..592218148c 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.0,7.3.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.1,7.3.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.2.0";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.2.1";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index c9c3860905..08b18633b5 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index 09f8a3695e..a26fd4d1cd 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index b316c870a6..21c8b632f9 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -25,22 +25,22 @@ Import-Package: org.apache.sshd.certificate;version="[2.15.0,2.16.0)", org.apache.sshd.core;version="[2.15.0,2.16.0)", org.apache.sshd.server;version="[2.15.0,2.16.0)", org.apache.sshd.server.forward;version="[2.15.0,2.16.0)", - org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.sshd;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit.ssh;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.sshd;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.sshd;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit.ssh;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.sshd;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.rules;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 66e2b494a0..1aef778fd0 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 24f83df3b0..9e2a2b9073 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.2.1";x-friends:="org.eclipse.jgit.ssh.apache.test"; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -24,19 +24,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.0";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.2.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.2.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.2.0";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.2.0";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.2.0";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.2.0"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.2.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.2.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.2.1";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.2.1";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.2.1";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.2.1"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.2.0" + org.eclipse.jgit.transport.sshd.agent;version="7.2.1" Import-Package: org.apache.sshd.agent;version="[2.15.0,2.16.0)", org.apache.sshd.client;version="[2.15.0,2.16.0)", org.apache.sshd.client.auth;version="[2.15.0,2.16.0)", @@ -89,14 +89,14 @@ Import-Package: org.apache.sshd.agent;version="[2.15.0,2.16.0)", org.apache.sshd.sftp;version="[2.15.0,2.16.0)", org.apache.sshd.sftp.client;version="[2.15.0,2.16.0)", org.apache.sshd.sftp.common;version="[2.15.0,2.16.0)", - org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.fnmatch;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.fnmatch;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index fbdae452a4..31a9f24b52 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index e25730b4d9..58df28daeb 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index b2f46b538f..623daf5127 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit.ssh;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit.ssh;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 5b454a5ab9..996c375d98 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 2ec7737a4a..7482696822 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.0,7.3.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.1,7.3.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.0" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.1" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index bbe649c5b9..a214783788 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 7624d3fc66..53d37e1b18 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index 749417d890..c8867cb060 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -22,66 +22,66 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.apache.commons.lang3;version="[3.17.0,4.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api;version="[7.2.0,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.archive;version="[7.2.0,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.0,7.3.0)", - org.eclipse.jgit.awtui;version="[7.2.0,7.3.0)", - org.eclipse.jgit.blame;version="[7.2.0,7.3.0)", - org.eclipse.jgit.blame.cache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.0,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.0,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.events;version="[7.2.0,7.3.0)", - org.eclipse.jgit.fnmatch;version="[7.2.0,7.3.0)", - org.eclipse.jgit.gitrepo;version="[7.2.0,7.3.0)", - org.eclipse.jgit.hooks;version="[7.2.0,7.3.0)", - org.eclipse.jgit.ignore;version="[7.2.0,7.3.0)", - org.eclipse.jgit.ignore.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.diff;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.fsck;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.2.0", - org.eclipse.jgit.internal.storage.dfs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.io;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.2.0,7.3.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.0,7.3.0)", - org.eclipse.jgit.junit.time;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.logging;version="[7.2.0,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.notes;version="[7.2.0,7.3.0)", - org.eclipse.jgit.patch;version="[7.2.0,7.3.0)", - org.eclipse.jgit.pgm;version="[7.2.0,7.3.0)", - org.eclipse.jgit.pgm.internal;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk.filter;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.0,7.3.0)", - org.eclipse.jgit.storage.pack;version="[7.2.0,7.3.0)", - org.eclipse.jgit.submodule;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util.sha1;version="[7.2.0,7.3.0)", + org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.archive;version="[7.2.1,7.3.0)", + org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", + org.eclipse.jgit.awtui;version="[7.2.1,7.3.0)", + org.eclipse.jgit.blame;version="[7.2.1,7.3.0)", + org.eclipse.jgit.blame.cache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", + org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.events;version="[7.2.1,7.3.0)", + org.eclipse.jgit.fnmatch;version="[7.2.1,7.3.0)", + org.eclipse.jgit.gitrepo;version="[7.2.1,7.3.0)", + org.eclipse.jgit.hooks;version="[7.2.1,7.3.0)", + org.eclipse.jgit.ignore;version="[7.2.1,7.3.0)", + org.eclipse.jgit.ignore.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.diff;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.fsck;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.2.1", + org.eclipse.jgit.internal.storage.dfs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.io;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.2.1,7.3.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", + org.eclipse.jgit.junit.time;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.logging;version="[7.2.1,7.3.0)", + org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.notes;version="[7.2.1,7.3.0)", + org.eclipse.jgit.patch;version="[7.2.1,7.3.0)", + org.eclipse.jgit.pgm;version="[7.2.1,7.3.0)", + org.eclipse.jgit.pgm.internal;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk.filter;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", + org.eclipse.jgit.storage.pack;version="[7.2.1,7.3.0)", + org.eclipse.jgit.submodule;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util.sha1;version="[7.2.1,7.3.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index a9352c723e..1a1e42f49f 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index 4b2da7e945..a4ce4906f6 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.awtui;version="7.2.0" -Import-Package: org.eclipse.jgit.errors;version="[7.2.0,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.0,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revplot;version="[7.2.0,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.0,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.0,7.3.0)", - org.eclipse.jgit.util;version="[7.2.0,7.3.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.2.1" +Import-Package: org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", + org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", + org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revplot;version="[7.2.1,7.3.0)", + org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", + org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", + org.eclipse.jgit.util;version="[7.2.1,7.3.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index 51d38e2401..e668fc2aba 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 80fc73ea8d..d378b2dc2d 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index 28d24a2767..d4e346c6be 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.0.202503040940-r +Bundle-Version: 7.2.1.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.2.0", - org.eclipse.jgit.api;version="7.2.0"; +Export-Package: org.eclipse.jgit.annotations;version="7.2.1", + org.eclipse.jgit.api;version="7.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,21 +25,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.2.0"; + org.eclipse.jgit.api.errors;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.2.0"; + org.eclipse.jgit.attributes;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.2.0"; + org.eclipse.jgit.blame;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.blame.cache, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.blame.cache;version="7.2.0"; + org.eclipse.jgit.blame.cache;version="7.2.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.diff;version="7.2.0"; + org.eclipse.jgit.diff;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.patch, @@ -47,55 +47,55 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.2.0"; + org.eclipse.jgit.dircache;version="7.2.1"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="7.2.0"; + org.eclipse.jgit.errors;version="7.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib", - org.eclipse.jgit.events;version="7.2.0"; + org.eclipse.jgit.events;version="7.2.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.2.0", - org.eclipse.jgit.gitrepo;version="7.2.0"; + org.eclipse.jgit.fnmatch;version="7.2.1", + org.eclipse.jgit.gitrepo;version="7.2.1"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.api.errors, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.2.0";x-internal:=true, - org.eclipse.jgit.hooks;version="7.2.0"; + org.eclipse.jgit.gitrepo.internal;version="7.2.1";x-internal:=true, + org.eclipse.jgit.hooks;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.ignore;version="7.2.0", - org.eclipse.jgit.ignore.internal;version="7.2.0"; + org.eclipse.jgit.ignore;version="7.2.1", + org.eclipse.jgit.ignore.internal;version="7.2.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.2.0"; + org.eclipse.jgit.internal;version="7.2.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.2.0"; + org.eclipse.jgit.internal.diff;version="7.2.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.2.0"; + org.eclipse.jgit.internal.diffmergetool;version="7.2.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.2.0"; + org.eclipse.jgit.internal.fsck;version="7.2.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.2.0"; + org.eclipse.jgit.internal.revwalk;version="7.2.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.2.0"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.2.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.2.0"; + org.eclipse.jgit.internal.storage.dfs;version="7.2.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="7.2.0"; + org.eclipse.jgit.internal.storage.file;version="7.2.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -104,37 +104,37 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="7.2.0"; + org.eclipse.jgit.internal.storage.io;version="7.2.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.2.0"; + org.eclipse.jgit.internal.storage.memory;version="7.2.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.2.0";x-internal:=true, - org.eclipse.jgit.internal.storage.pack;version="7.2.0"; + org.eclipse.jgit.internal.storage.midx;version="7.2.1";x-internal:=true, + org.eclipse.jgit.internal.storage.pack;version="7.2.1"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.2.0"; + org.eclipse.jgit.internal.storage.reftable;version="7.2.1"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="7.2.0";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.2.0"; + org.eclipse.jgit.internal.submodule;version="7.2.1";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.2.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.2.0"; + org.eclipse.jgit.internal.transport.http;version="7.2.1"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.2.0"; + org.eclipse.jgit.internal.transport.parser;version="7.2.1"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.2.0"; + org.eclipse.jgit.internal.transport.ssh;version="7.2.1"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.2.0"; + org.eclipse.jgit.internal.util;version="7.2.1"; x-friends:="org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.2.0"; + org.eclipse.jgit.lib;version="7.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -149,12 +149,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.2.0"; + org.eclipse.jgit.lib.internal;version="7.2.1"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.2.0", - org.eclipse.jgit.merge;version="7.2.0"; + org.eclipse.jgit.logging;version="7.2.1", + org.eclipse.jgit.merge;version="7.2.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -163,42 +163,42 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.2.0", - org.eclipse.jgit.notes;version="7.2.0"; + org.eclipse.jgit.nls;version="7.2.1", + org.eclipse.jgit.notes;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.2.0"; + org.eclipse.jgit.patch;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.2.0"; + org.eclipse.jgit.revplot;version="7.2.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib", - org.eclipse.jgit.revwalk;version="7.2.0"; + org.eclipse.jgit.revwalk;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.internal.storage.commitgraph", - org.eclipse.jgit.revwalk.filter;version="7.2.0"; + org.eclipse.jgit.revwalk.filter;version="7.2.1"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.2.0"; + org.eclipse.jgit.storage.file;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.2.0"; + org.eclipse.jgit.storage.pack;version="7.2.1"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.2.0"; + org.eclipse.jgit.submodule;version="7.2.1"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.2.0"; + org.eclipse.jgit.transport;version="7.2.1"; uses:="javax.crypto, org.eclipse.jgit.hooks, org.eclipse.jgit.util.io, @@ -211,21 +211,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.2.0"; + org.eclipse.jgit.transport.http;version="7.2.1"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.2.0"; + org.eclipse.jgit.transport.resolver;version="7.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.2.0"; + org.eclipse.jgit.treewalk;version="7.2.1"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="7.2.0"; + org.eclipse.jgit.treewalk.filter;version="7.2.1"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.2.0"; + org.eclipse.jgit.util;version="7.2.1"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -238,12 +238,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.0", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.2.0"; + org.eclipse.jgit.util.io;version="7.2.1"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.2.0", - org.eclipse.jgit.util.time;version="7.2.0" + org.eclipse.jgit.util.sha1;version="7.2.1", + org.eclipse.jgit.util.time;version="7.2.1" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 9b9b396230..48005f54cf 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.0.202503040940-r -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.0.202503040940-r";roots="." +Bundle-Version: 7.2.1.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.1.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index d195ae4002..08363813b5 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index 96fc0accfb..cc0d47fcc0 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.0.202503040940-r + 7.2.1-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3 From 2a3e1191ea8062038a3d11de99d1549678c35d61 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 4 Mar 2025 14:12:10 +0100 Subject: Prepare 7.3.0-SNAPSHOT builds Change-Id: Id871f3084a8195fdfa2f7eab058515656bd2c9f9 --- org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF | 10 +- org.eclipse.jgit.ant.test/pom.xml | 2 +- org.eclipse.jgit.ant/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ant/pom.xml | 2 +- org.eclipse.jgit.archive/META-INF/MANIFEST.MF | 16 +-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.archive/pom.xml | 2 +- org.eclipse.jgit.benchmarks/pom.xml | 2 +- org.eclipse.jgit.coverage/pom.xml | 36 +++--- org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF | 8 +- org.eclipse.jgit.gpg.bc.test/pom.xml | 2 +- org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF | 8 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.gpg.bc/pom.xml | 2 +- org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.apache/pom.xml | 2 +- org.eclipse.jgit.http.server/META-INF/MANIFEST.MF | 30 ++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.http.server/pom.xml | 2 +- org.eclipse.jgit.http.test/META-INF/MANIFEST.MF | 42 +++---- org.eclipse.jgit.http.test/pom.xml | 2 +- org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.http/pom.xml | 2 +- org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF | 22 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit.ssh/pom.xml | 2 +- org.eclipse.jgit.junit/META-INF/MANIFEST.MF | 42 +++---- org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.junit/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 38 +++---- org.eclipse.jgit.lfs.server.test/pom.xml | 2 +- org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF | 32 +++--- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs.server/pom.xml | 2 +- org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF | 36 +++--- org.eclipse.jgit.lfs.test/pom.xml | 2 +- org.eclipse.jgit.lfs/META-INF/MANIFEST.MF | 48 ++++---- org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.lfs/pom.xml | 2 +- .../org.eclipse.jgit.feature/feature.xml | 2 +- .../org.eclipse.jgit.feature/pom.xml | 2 +- .../org.eclipse.jgit.gpg.bc.feature/feature.xml | 4 +- .../org.eclipse.jgit.gpg.bc.feature/pom.xml | 2 +- .../feature.xml | 4 +- .../org.eclipse.jgit.http.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.junit.feature/feature.xml | 4 +- .../org.eclipse.jgit.junit.feature/pom.xml | 2 +- .../org.eclipse.jgit.lfs.feature/feature.xml | 4 +- .../org.eclipse.jgit.lfs.feature/pom.xml | 2 +- .../org.eclipse.jgit.pgm.feature/feature.xml | 8 +- .../org.eclipse.jgit.pgm.feature/pom.xml | 2 +- .../org.eclipse.jgit.repository/pom.xml | 2 +- .../org.eclipse.jgit.source.feature/feature.xml | 4 +- .../org.eclipse.jgit.source.feature/pom.xml | 4 +- .../feature.xml | 4 +- .../org.eclipse.jgit.ssh.apache.feature/pom.xml | 2 +- .../org.eclipse.jgit.ssh.jsch.feature/feature.xml | 4 +- .../org.eclipse.jgit.ssh.jsch.feature/pom.xml | 2 +- org.eclipse.jgit.packaging/pom.xml | 2 +- org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF | 40 +++---- org.eclipse.jgit.pgm.test/pom.xml | 2 +- org.eclipse.jgit.pgm/META-INF/MANIFEST.MF | 88 +++++++-------- org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.pgm/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache.agent/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 34 +++--- org.eclipse.jgit.ssh.apache.test/pom.xml | 2 +- org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF | 40 +++---- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.apache/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ssh.jsch.test/pom.xml | 2 +- org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF | 20 ++-- .../META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ssh.jsch/pom.xml | 2 +- org.eclipse.jgit.test/META-INF/MANIFEST.MF | 122 ++++++++++----------- org.eclipse.jgit.test/pom.xml | 2 +- org.eclipse.jgit.ui/META-INF/MANIFEST.MF | 18 +-- org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit.ui/pom.xml | 2 +- org.eclipse.jgit/META-INF/MANIFEST.MF | 116 ++++++++++---------- org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF | 4 +- org.eclipse.jgit/pom.xml | 2 +- pom.xml | 2 +- 89 files changed, 548 insertions(+), 548 deletions(-) diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF index 33a15ad9b9..fa9a416363 100644 --- a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF @@ -5,13 +5,13 @@ Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant.test Bundle-SymbolicName: org.eclipse.jgit.ant.test Bundle-Vendor: %Bundle-Vendor -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.ant.tasks;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.ant.tasks;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ant.test/pom.xml b/org.eclipse.jgit.ant.test/pom.xml index 9d8fe5cf8e..4a54d87239 100644 --- a/org.eclipse.jgit.ant.test/pom.xml +++ b/org.eclipse.jgit.ant.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.ant.test diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF index fa4cc8ff84..480d88e8d6 100644 --- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF @@ -3,13 +3,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ant Bundle-SymbolicName: org.eclipse.jgit.ant -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.apache.tools.ant, - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)" + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)" Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.ant;version="7.2.1", - org.eclipse.jgit.ant.tasks;version="7.2.1"; +Export-Package: org.eclipse.jgit.ant;version="7.3.0", + org.eclipse.jgit.ant.tasks;version="7.3.0"; uses:="org.apache.tools.ant, org.apache.tools.ant.types" diff --git a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF index 999651d2fc..136b7cf69a 100644 --- a/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ant/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ant - Sources Bundle-SymbolicName: org.eclipse.jgit.ant.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ant;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml index 08458c9319..4e85ee4f32 100644 --- a/org.eclipse.jgit.ant/pom.xml +++ b/org.eclipse.jgit.ant/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.ant diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF index 9ed283ae5f..fdfc635629 100644 --- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.archive Bundle-SymbolicName: org.eclipse.jgit.archive -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -13,18 +13,18 @@ Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)", org.apache.commons.compress.compressors.bzip2;version="[1.4,2.0)", org.apache.commons.compress.compressors.gzip;version="[1.4,2.0)", org.apache.commons.compress.compressors.xz;version="[1.4,2.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.osgi.framework;version="[1.3.0,2.0.0)", org.tukaani.xz Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.jgit.archive.FormatActivator -Export-Package: org.eclipse.jgit.archive;version="7.2.1"; +Export-Package: org.eclipse.jgit.archive;version="7.3.0"; uses:="org.apache.commons.compress.archivers, org.osgi.framework, org.eclipse.jgit.api, org.eclipse.jgit.lib", - org.eclipse.jgit.archive.internal;version="7.2.1";x-internal:=true + org.eclipse.jgit.archive.internal;version="7.3.0";x-internal:=true diff --git a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF index f87c0df4e0..716e8d0917 100644 --- a/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.archive/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.archive - Sources Bundle-SymbolicName: org.eclipse.jgit.archive.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.archive;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml index 690c590d04..3935dfaca0 100644 --- a/org.eclipse.jgit.archive/pom.xml +++ b/org.eclipse.jgit.archive/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.archive diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml index 8acafb80c3..87d2bb31be 100644 --- a/org.eclipse.jgit.benchmarks/pom.xml +++ b/org.eclipse.jgit.benchmarks/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.benchmarks diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml index e61d8c159c..8cab250c67 100644 --- a/org.eclipse.jgit.coverage/pom.xml +++ b/org.eclipse.jgit.coverage/pom.xml @@ -14,7 +14,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT 4.0.0 @@ -27,88 +27,88 @@ org.eclipse.jgit org.eclipse.jgit - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.archive - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.apache - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.server - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ui - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.test - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ant.test - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.http.test - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.pgm.test - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.test - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.lfs.server.test - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit org.eclipse.jgit.ssh.apache.test - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT diff --git a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF index 3098195af4..287d75f92a 100644 --- a/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,9 +14,9 @@ Import-Package: org.bouncycastle.asn1.cryptlib;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", - org.eclipse.jgit.gpg.bc.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.gpg.bc.internal.keys;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.sha1;version="[7.2.1,7.3.0)", + org.eclipse.jgit.gpg.bc.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.gpg.bc.internal.keys;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.sha1;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.gpg.bc.test/pom.xml b/org.eclipse.jgit.gpg.bc.test/pom.xml index 13b0979d09..10aa742a10 100644 --- a/org.eclipse.jgit.gpg.bc.test/pom.xml +++ b/org.eclipse.jgit.gpg.bc.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.gpg.bc.test diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF index fedee97027..f35e5e5a3f 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.gpg.bc Bundle-SymbolicName: org.eclipse.jgit.gpg.bc;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.1,7.3.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.3.0,7.4.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/gpg_bc -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.asn1.x9;version="[1.79.0,2.0.0)", @@ -26,5 +26,5 @@ Import-Package: org.bouncycastle.asn1;version="[1.79.0,2.0.0)", org.bouncycastle.openpgp.operator.jcajce;version="[1.79.0,2.0.0)", org.bouncycastle.util.encoders;version="[1.79.0,2.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.2.1";x-friends:="org.eclipse.jgit.gpg.bc.test", - org.eclipse.jgit.gpg.bc.internal.keys;version="7.2.1";x-friends:="org.eclipse.jgit.gpg.bc.test" +Export-Package: org.eclipse.jgit.gpg.bc.internal;version="7.3.0";x-friends:="org.eclipse.jgit.gpg.bc.test", + org.eclipse.jgit.gpg.bc.internal.keys;version="7.3.0";x-friends:="org.eclipse.jgit.gpg.bc.test" diff --git a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF index 20d5a904c5..5134716681 100644 --- a/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.gpg.bc/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.gpg.bc - Sources Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml index 991711b107..6159129295 100644 --- a/org.eclipse.jgit.gpg.bc/pom.xml +++ b/org.eclipse.jgit.gpg.bc/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.gpg.bc diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF index 07f23213ce..244b20a0f4 100644 --- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.apache Bundle-SymbolicName: org.eclipse.jgit.http.apache -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor @@ -26,11 +26,11 @@ Import-Package: javax.net.ssl, org.apache.http.impl.conn;version="[4.4.0,5.0.0)", org.apache.http.params;version="[4.3.0,5.0.0)", org.apache.http.ssl;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)" -Export-Package: org.eclipse.jgit.transport.http.apache;version="7.2.1"; + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)" +Export-Package: org.eclipse.jgit.transport.http.apache;version="7.3.0"; uses:="org.apache.http.client, org.eclipse.jgit.transport.http, org.apache.http.entity, diff --git a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF index 90fa705a9e..86adeb6820 100644 --- a/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.http.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml index ddc141a700..0c7c5ffc7d 100644 --- a/org.eclipse.jgit.http.apache/pom.xml +++ b/org.eclipse.jgit.http.apache/pom.xml @@ -15,7 +15,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.http.apache diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF index 51d64edab1..71c471da1a 100644 --- a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.server Bundle-SymbolicName: org.eclipse.jgit.http.server -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.http.server;version="7.2.1", - org.eclipse.jgit.http.server.glue;version="7.2.1"; +Export-Package: org.eclipse.jgit.http.server;version="7.3.0", + org.eclipse.jgit.http.server.glue;version="7.3.0"; uses:="jakarta.servlet, jakarta.servlet.http", - org.eclipse.jgit.http.server.resolver;version="7.2.1"; + org.eclipse.jgit.http.server.resolver;version="7.3.0"; uses:="jakarta.servlet.http org.eclipse.jgit.transport.resolver, org.eclipse.jgit.lib, @@ -19,14 +19,14 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)" + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.resolver;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)" diff --git a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF index ff6d607a38..67a14cfbf5 100644 --- a/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.http.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.http.server - Sources Bundle-SymbolicName: org.eclipse.jgit.http.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml index 360c694820..b34ca2fe10 100644 --- a/org.eclipse.jgit.http.server/pom.xml +++ b/org.eclipse.jgit.http.server/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.http.server diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF index 795351b29e..518afb3286 100644 --- a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.http.test Bundle-SymbolicName: org.eclipse.jgit.http.test -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -29,26 +29,26 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.http.server;version="[7.2.1,7.3.0)", - org.eclipse.jgit.http.server.glue;version="[7.2.1,7.3.0)", - org.eclipse.jgit.http.server.resolver;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http.apache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.http.server;version="[7.3.0,7.4.0)", + org.eclipse.jgit.http.server.glue;version="[7.3.0,7.4.0)", + org.eclipse.jgit.http.server.resolver;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http.apache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.resolver;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.http.test/pom.xml b/org.eclipse.jgit.http.test/pom.xml index 69ad378d6e..8ed3017c9c 100644 --- a/org.eclipse.jgit.http.test/pom.xml +++ b/org.eclipse.jgit.http.test/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.http.test diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF index 9afec59794..e3a6e264cb 100644 --- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.http Bundle-SymbolicName: org.eclipse.jgit.junit.http -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -22,17 +22,17 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.ssl;version="[12.0.0,13.0.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.http.server;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.http.server;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.resolver;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.slf4j.helpers;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.http;version="7.2.1"; +Export-Package: org.eclipse.jgit.junit.http;version="7.3.0"; uses:="org.eclipse.jgit.transport, jakarta.servlet, jakarta.servlet.http, diff --git a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF index 0abd69a56d..855f210254 100644 --- a/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.http/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.http - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.http.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml index ce8745afec..2947f21cfe 100644 --- a/org.eclipse.jgit.junit.http/pom.xml +++ b/org.eclipse.jgit.junit.http/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.junit.http diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF index b6fad01ae5..30c359b785 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit.ssh Bundle-SymbolicName: org.eclipse.jgit.junit.ssh -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy @@ -33,16 +33,16 @@ Import-Package: org.apache.sshd.common;version="[2.15.0,2.16.0)", org.apache.sshd.server.subsystem;version="[2.15.0,2.16.0)", org.apache.sshd.sftp;version="[2.15.0,2.16.0)", org.apache.sshd.sftp.server;version="[2.15.0,2.16.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit.ssh;version="7.2.1" +Export-Package: org.eclipse.jgit.junit.ssh;version="7.3.0" diff --git a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF index 655d7176de..27d1737414 100644 --- a/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit.ssh/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit.ssh - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml index 7304697bb7..cbdfa319a9 100644 --- a/org.eclipse.jgit.junit.ssh/pom.xml +++ b/org.eclipse.jgit.junit.ssh/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.junit.ssh diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF index 84f5909952..5f0546efff 100644 --- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF @@ -3,36 +3,36 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.junit Bundle-SymbolicName: org.eclipse.jgit.junit -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="7.2.1", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.time;version="[7.2.1,7.3.0)", +Import-Package: org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.merge;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="7.3.0", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.time;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)", org.junit.runners.model;version="[4.13,5.0.0)", org.slf4j;version="[1.7.0,3.0.0)" -Export-Package: org.eclipse.jgit.junit;version="7.2.1"; +Export-Package: org.eclipse.jgit.junit;version="7.3.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -45,4 +45,4 @@ Export-Package: org.eclipse.jgit.junit;version="7.2.1"; org.junit.runners.model, org.junit.runner, org.eclipse.jgit.util.time", - org.eclipse.jgit.junit.time;version="7.2.1";uses:="org.eclipse.jgit.util.time" + org.eclipse.jgit.junit.time;version="7.3.0";uses:="org.eclipse.jgit.util.time" diff --git a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF index e5209dafc6..4e0108a454 100644 --- a/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.junit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.junit - Sources Bundle-SymbolicName: org.eclipse.jgit.junit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.junit;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml index 55b15f0056..dbb8b06143 100644 --- a/org.eclipse.jgit.junit/pom.xml +++ b/org.eclipse.jgit.junit/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.junit diff --git a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF index acaac0766e..8feb8ef777 100644 --- a/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server.test Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -26,24 +26,24 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.security;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.thread;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.server;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.test;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.server;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.test;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.lfs.server.test/pom.xml b/org.eclipse.jgit.lfs.server.test/pom.xml index a84195c52b..176f4af3f1 100644 --- a/org.eclipse.jgit.lfs.server.test/pom.xml +++ b/org.eclipse.jgit.lfs.server.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.lfs.server.test diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF index 951029b820..ed8cfff9be 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.server Bundle-SymbolicName: org.eclipse.jgit.lfs.server -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs.server;version="7.2.1"; +Export-Package: org.eclipse.jgit.lfs.server;version="7.3.0"; uses:="jakarta.servlet.http, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.fs;version="7.2.1"; + org.eclipse.jgit.lfs.server.fs;version="7.3.0"; uses:="jakarta.servlet, jakarta.servlet.http, org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib", - org.eclipse.jgit.lfs.server.internal;version="7.2.1";x-internal:=true, - org.eclipse.jgit.lfs.server.s3;version="7.2.1"; + org.eclipse.jgit.lfs.server.internal;version="7.3.0";x-internal:=true, + org.eclipse.jgit.lfs.server.s3;version="7.3.0"; uses:="org.eclipse.jgit.lfs.server, org.eclipse.jgit.lfs.lib" Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -24,15 +24,15 @@ Import-Package: com.google.gson;version="[2.8.0,3.0.0)", jakarta.servlet.annotation;version="[6.0.0,7.0.0)", jakarta.servlet.http;version="[6.0.0,7.0.0)", org.apache.http;version="[4.3.0,5.0.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http.apache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http.apache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF index d984ed2b23..7e26500740 100644 --- a/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs.server/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs.server - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml index 25886c8919..ebb815fd9b 100644 --- a/org.eclipse.jgit.lfs.server/pom.xml +++ b/org.eclipse.jgit.lfs.server/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.lfs.server diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF index b9c1d82274..b8a2ca7d9f 100644 --- a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs.test Bundle-SymbolicName: org.eclipse.jgit.lfs.test -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.dfs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", +Import-Package: org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.dfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.hamcrest.core;version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)", org.junit.runners;version="[4.13,5.0.0)" -Export-Package: org.eclipse.jgit.lfs.test;version="7.2.1";x-friends:="org.eclipse.jgit.lfs.server.test" +Export-Package: org.eclipse.jgit.lfs.test;version="7.3.0";x-friends:="org.eclipse.jgit.lfs.server.test" diff --git a/org.eclipse.jgit.lfs.test/pom.xml b/org.eclipse.jgit.lfs.test/pom.xml index 56764ee044..c9591b6078 100644 --- a/org.eclipse.jgit.lfs.test/pom.xml +++ b/org.eclipse.jgit.lfs.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.lfs.test diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF index 53b8a12fe6..5338f8bb6d 100644 --- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF @@ -3,32 +3,32 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.lfs Bundle-SymbolicName: org.eclipse.jgit.lfs -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor -Export-Package: org.eclipse.jgit.lfs;version="7.2.1", - org.eclipse.jgit.lfs.errors;version="7.2.1", - org.eclipse.jgit.lfs.internal;version="7.2.1";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", - org.eclipse.jgit.lfs.lib;version="7.2.1" +Export-Package: org.eclipse.jgit.lfs;version="7.3.0", + org.eclipse.jgit.lfs.errors;version="7.3.0", + org.eclipse.jgit.lfs.internal;version="7.3.0";x-friends:="org.eclipse.jgit.lfs.test,org.eclipse.jgit.lfs.server.fs,org.eclipse.jgit.lfs.server", + org.eclipse.jgit.lfs.lib;version="7.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.google.gson;version="[2.8.2,3.0.0)", com.google.gson.stream;version="[2.8.2,3.0.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)";resolution:=optional, - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.hooks;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.pack;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)" + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)";resolution:=optional, + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.diff;version="[7.3.0,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.hooks;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.pack;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)" diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF index 3bc9aa0c1b..fc124821ec 100644 --- a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.lfs - Sources Bundle-SymbolicName: org.eclipse.jgit.lfs.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml index 70440f565b..d336f16792 100644 --- a/org.eclipse.jgit.lfs/pom.xml +++ b/org.eclipse.jgit.lfs/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.lfs diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml index b41dd49497..adea43b8b5 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml index c8f97220e3..734b6347c7 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml index 63dafd638c..f86652fcba 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml index 92ab49fd00..d999c15c5f 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml index e92e921272..922622cda1 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.xml @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml index 76db5df02e..53cb4bac60 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml index 0cfe1dfe8d..2d7ee4e436 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.xml @@ -2,7 +2,7 @@ @@ -35,9 +35,9 @@ version="0.0.0"/> - - - + + + org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml index f159039b84..032072fc2a 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.repository/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.repository diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml index 8861de9e44..139569dd01 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature @@ -30,7 +30,7 @@ org.eclipse.jgit.feature org.eclipse.jgit - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml index 13c7fa1ed8..7f80bbf6dd 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml index 0955171741..5eaa3b7542 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.xml @@ -2,7 +2,7 @@ @@ -23,7 +23,7 @@ - + org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.feature diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml index 9a08ac1c34..6352d0aae3 100644 --- a/org.eclipse.jgit.packaging/pom.xml +++ b/org.eclipse.jgit.packaging/pom.xml @@ -16,7 +16,7 @@ org.eclipse.jgit jgit.tycho.parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT pom JGit Tycho Parent diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 0d7da80996..2056f0b0aa 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,30 +3,30 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", - org.eclipse.jgit.pgm;version="[7.2.1,7.3.0)", - org.eclipse.jgit.pgm.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.pgm.opt;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", +Import-Package: org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.diff;version="[7.3.0,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.merge;version="[7.3.0,7.4.0)", + org.eclipse.jgit.pgm;version="[7.3.0,7.4.0)", + org.eclipse.jgit.pgm.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.pgm.opt;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)", org.hamcrest.core;bundle-version="[1.1.0,3.0.0)", org.junit;version="[4.13,5.0.0)", org.junit.rules;version="[4.13,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index 2af017beb1..24c289c227 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.pgm.test diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF index c630bb94bc..d91efd46dd 100644 --- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.pgm Bundle-SymbolicName: org.eclipse.jgit.pgm -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -14,50 +14,50 @@ Import-Package: jakarta.servlet;version="[6.0.0,7.0.0)", org.eclipse.jetty.server.handler;version="[12.0.0,13.0.0)", org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.eclipse.jetty.util.component;version="[12.0.0,13.0.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.archive;version="[7.2.1,7.3.0)", - org.eclipse.jgit.awtui;version="[7.2.1,7.3.0)", - org.eclipse.jgit.blame;version="[7.2.1,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.gitrepo;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.io;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.server;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.server.fs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs.server.s3;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.notes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revplot;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.pack;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http.apache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.sshd;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.archive;version="[7.3.0,7.4.0)", + org.eclipse.jgit.awtui;version="[7.3.0,7.4.0)", + org.eclipse.jgit.blame;version="[7.3.0,7.4.0)", + org.eclipse.jgit.diff;version="[7.3.0,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.gitrepo;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.io;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.server;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.server.fs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs.server.s3;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.merge;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.notes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revplot;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.pack;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http.apache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.resolver;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.sshd;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)", org.kohsuke.args4j;version="[2.33.0,3.0.0)", org.kohsuke.args4j.spi;version="[2.33.0,3.0.0)" -Export-Package: org.eclipse.jgit.console;version="7.2.1"; +Export-Package: org.eclipse.jgit.console;version="7.3.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util", - org.eclipse.jgit.pgm;version="7.2.1"; + org.eclipse.jgit.pgm;version="7.3.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.io, org.eclipse.jgit.awtui, @@ -69,14 +69,14 @@ Export-Package: org.eclipse.jgit.console;version="7.2.1"; org.eclipse.jgit.treewalk, org.eclipse.jgit.api, javax.swing", - org.eclipse.jgit.pgm.debug;version="7.2.1"; + org.eclipse.jgit.pgm.debug;version="7.3.0"; uses:="org.eclipse.jgit.util.io, org.eclipse.jgit.pgm, org.eclipse.jetty.servlet", - org.eclipse.jgit.pgm.internal;version="7.2.1"; + org.eclipse.jgit.pgm.internal;version="7.3.0"; x-friends:="org.eclipse.jgit.pgm.test, org.eclipse.jgit.test", - org.eclipse.jgit.pgm.opt;version="7.2.1"; + org.eclipse.jgit.pgm.opt;version="7.3.0"; uses:="org.kohsuke.args4j, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, diff --git a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF index 3b92eb330d..1c4a4812e5 100644 --- a/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.pgm/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.pgm - Sources Bundle-SymbolicName: org.eclipse.jgit.pgm.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml index 19f85ea473..5890ce8256 100644 --- a/org.eclipse.jgit.pgm/pom.xml +++ b/org.eclipse.jgit.pgm/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.pgm diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF index 592218148c..8942a417a9 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/MANIFEST.MF @@ -2,16 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: OSGI-INF/l10n/agent Bundle-Vendor: %Bundle-Vendor -Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.2.1,7.3.0)" +Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[7.3.0,7.4.0)" Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.jgit.ssh.apache.agent Bundle-RequiredExecutionEnvironment: JavaSE-17 -Import-Package: org.eclipse.jgit.transport.sshd;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)" +Import-Package: org.eclipse.jgit.transport.sshd;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)" Require-Bundle: com.sun.jna;bundle-version="[5.8.0,6.0.0)", com.sun.jna.platform;bundle-version="[5.8.0,6.0.0)" -Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.2.1";x-internal:=true +Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="7.3.0";x-internal:=true diff --git a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF index 08b18633b5..37b442e8bb 100644 --- a/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.agent/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache.agent - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml index a26fd4d1cd..2d34495b72 100644 --- a/org.eclipse.jgit.ssh.apache.agent/pom.xml +++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.ssh.apache.agent diff --git a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF index 21c8b632f9..88ab277cd2 100644 --- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -25,22 +25,22 @@ Import-Package: org.apache.sshd.certificate;version="[2.15.0,2.16.0)", org.apache.sshd.core;version="[2.15.0,2.16.0)", org.apache.sshd.server;version="[2.15.0,2.16.0)", org.apache.sshd.server.forward;version="[2.15.0,2.16.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.signing.ssh;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.sshd;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit.ssh;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.sshd;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.sshd.agent;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.signing.ssh;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.sshd;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.sshd.proxy;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit.ssh;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.sshd;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.sshd.agent;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.rules;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.ssh.apache.test/pom.xml b/org.eclipse.jgit.ssh.apache.test/pom.xml index 1aef778fd0..b86a56091c 100644 --- a/org.eclipse.jgit.ssh.apache.test/pom.xml +++ b/org.eclipse.jgit.ssh.apache.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.ssh.apache.test diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF index 9e2a2b9073..f38ea723b2 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF @@ -6,10 +6,10 @@ Bundle-SymbolicName: org.eclipse.jgit.ssh.apache Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/plugin Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.internal.transport.sshd;version="7.2.1";x-friends:="org.eclipse.jgit.ssh.apache.test"; +Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.3.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.internal.transport.sshd;version="7.3.0";x-friends:="org.eclipse.jgit.ssh.apache.test"; uses:="org.apache.sshd.client, org.apache.sshd.client.auth, org.apache.sshd.client.auth.keyboard, @@ -24,19 +24,19 @@ Export-Package: org.eclipse.jgit.internal.signing.ssh;version="7.2.1";x-friends: org.apache.sshd.common.signature, org.apache.sshd.common.util.buffer, org.eclipse.jgit.transport", - org.eclipse.jgit.internal.transport.sshd.agent;version="7.2.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.auth;version="7.2.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.2.1";x-internal:=true, - org.eclipse.jgit.internal.transport.sshd.proxy;version="7.2.1";x-friends:="org.eclipse.jgit.ssh.apache.test", - org.eclipse.jgit.signing.ssh;version="7.2.1";uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.transport.sshd;version="7.2.1"; + org.eclipse.jgit.internal.transport.sshd.agent;version="7.3.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.auth;version="7.3.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.pkcs11;version="7.3.0";x-internal:=true, + org.eclipse.jgit.internal.transport.sshd.proxy;version="7.3.0";x-friends:="org.eclipse.jgit.ssh.apache.test", + org.eclipse.jgit.signing.ssh;version="7.3.0";uses:="org.eclipse.jgit.lib", + org.eclipse.jgit.transport.sshd;version="7.3.0"; uses:="org.eclipse.jgit.transport, org.apache.sshd.client.config.hosts, org.apache.sshd.common.keyprovider, org.eclipse.jgit.util, org.apache.sshd.client.session, org.apache.sshd.client.keyverifier", - org.eclipse.jgit.transport.sshd.agent;version="7.2.1" + org.eclipse.jgit.transport.sshd.agent;version="7.3.0" Import-Package: org.apache.sshd.agent;version="[2.15.0,2.16.0)", org.apache.sshd.client;version="[2.15.0,2.16.0)", org.apache.sshd.client.auth;version="[2.15.0,2.16.0)", @@ -89,14 +89,14 @@ Import-Package: org.apache.sshd.agent;version="[2.15.0,2.16.0)", org.apache.sshd.sftp;version="[2.15.0,2.16.0)", org.apache.sshd.sftp.client;version="[2.15.0,2.16.0)", org.apache.sshd.sftp.common;version="[2.15.0,2.16.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.fnmatch;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.fnmatch;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF index 31a9f24b52..d6225e27db 100644 --- a/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.apache/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.apache - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml index 58df28daeb..365034a9c1 100644 --- a/org.eclipse.jgit.ssh.apache/pom.xml +++ b/org.eclipse.jgit.ssh.apache/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.ssh.apache diff --git a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF index 623daf5127..34f8e0a126 100644 --- a/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF @@ -3,20 +3,20 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.hamcrest.core;bundle-version="[1.3.0,2.0.0)" Import-Package: com.jcraft.jsch;version="[0.1.54,0.2.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit.ssh;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.ssh.jsch;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit.ssh;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.ssh.jsch;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.runner;version="[4.13,5.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch.test/pom.xml b/org.eclipse.jgit.ssh.jsch.test/pom.xml index 996c375d98..5f094a7812 100644 --- a/org.eclipse.jgit.ssh.jsch.test/pom.xml +++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.ssh.jsch.test diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF index 7482696822..6b0130ca52 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ssh.jsch Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch;singleton:=true -Fragment-Host: org.eclipse.jgit;bundle-version="[7.2.1,7.3.0)" +Fragment-Host: org.eclipse.jgit;bundle-version="[7.3.0,7.4.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Localization: OSGI-INF/l10n/jsch Bundle-ActivationPolicy: lazy -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.2.1" +Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="7.3.0" Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)", org.slf4j;version="[1.7.0,3.0.0)" diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF index a214783788..06d0ce3a14 100644 --- a/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ssh.jsch/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ssh.jsch - Sources Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml index 53d37e1b18..03ae29d8fa 100644 --- a/org.eclipse.jgit.ssh.jsch/pom.xml +++ b/org.eclipse.jgit.ssh.jsch/pom.xml @@ -17,7 +17,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.ssh.jsch diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF index c8867cb060..7ac93c2af2 100644 --- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.test Bundle-SymbolicName: org.eclipse.jgit.test -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: plugin Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -22,66 +22,66 @@ Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", org.apache.commons.io.output;version="[2.15.0,3.0.0)", org.apache.commons.lang3;version="[3.17.0,4.0.0)", org.assertj.core.api;version="[3.14.0,4.0.0)", - org.eclipse.jgit.annotations;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api;version="[7.2.1,7.3.0)", - org.eclipse.jgit.api.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.archive;version="[7.2.1,7.3.0)", - org.eclipse.jgit.attributes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.awtui;version="[7.2.1,7.3.0)", - org.eclipse.jgit.blame;version="[7.2.1,7.3.0)", - org.eclipse.jgit.blame.cache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.diff;version="[7.2.1,7.3.0)", - org.eclipse.jgit.dircache;version="[7.2.1,7.3.0)", - org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.events;version="[7.2.1,7.3.0)", - org.eclipse.jgit.fnmatch;version="[7.2.1,7.3.0)", - org.eclipse.jgit.gitrepo;version="[7.2.1,7.3.0)", - org.eclipse.jgit.hooks;version="[7.2.1,7.3.0)", - org.eclipse.jgit.ignore;version="[7.2.1,7.3.0)", - org.eclipse.jgit.ignore.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.diff;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.diffmergetool;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.fsck;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.commitgraph;version="7.2.1", - org.eclipse.jgit.internal.storage.dfs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.io;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.memory;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.midx;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.pack;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.storage.reftable;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.connectivity;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.parser;version="[7.2.1,7.3.0)", - org.eclipse.jgit.internal.transport.ssh;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit;version="[7.2.1,7.3.0)", - org.eclipse.jgit.junit.time;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lfs;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.logging;version="[7.2.1,7.3.0)", - org.eclipse.jgit.merge;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.notes;version="[7.2.1,7.3.0)", - org.eclipse.jgit.patch;version="[7.2.1,7.3.0)", - org.eclipse.jgit.pgm;version="[7.2.1,7.3.0)", - org.eclipse.jgit.pgm.internal;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revplot;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.file;version="[7.2.1,7.3.0)", - org.eclipse.jgit.storage.pack;version="[7.2.1,7.3.0)", - org.eclipse.jgit.submodule;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.http;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport.resolver;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.treewalk.filter;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.io;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util.sha1;version="[7.2.1,7.3.0)", + org.eclipse.jgit.annotations;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api;version="[7.3.0,7.4.0)", + org.eclipse.jgit.api.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.archive;version="[7.3.0,7.4.0)", + org.eclipse.jgit.attributes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.awtui;version="[7.3.0,7.4.0)", + org.eclipse.jgit.blame;version="[7.3.0,7.4.0)", + org.eclipse.jgit.blame.cache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.diff;version="[7.3.0,7.4.0)", + org.eclipse.jgit.dircache;version="[7.3.0,7.4.0)", + org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.events;version="[7.3.0,7.4.0)", + org.eclipse.jgit.fnmatch;version="[7.3.0,7.4.0)", + org.eclipse.jgit.gitrepo;version="[7.3.0,7.4.0)", + org.eclipse.jgit.hooks;version="[7.3.0,7.4.0)", + org.eclipse.jgit.ignore;version="[7.3.0,7.4.0)", + org.eclipse.jgit.ignore.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.diff;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.diffmergetool;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.fsck;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.commitgraph;version="7.3.0", + org.eclipse.jgit.internal.storage.dfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.io;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.memory;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.midx;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.pack;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.storage.reftable;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.connectivity;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.parser;version="[7.3.0,7.4.0)", + org.eclipse.jgit.internal.transport.ssh;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit;version="[7.3.0,7.4.0)", + org.eclipse.jgit.junit.time;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lfs;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.logging;version="[7.3.0,7.4.0)", + org.eclipse.jgit.merge;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.notes;version="[7.3.0,7.4.0)", + org.eclipse.jgit.patch;version="[7.3.0,7.4.0)", + org.eclipse.jgit.pgm;version="[7.3.0,7.4.0)", + org.eclipse.jgit.pgm.internal;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revplot;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.file;version="[7.3.0,7.4.0)", + org.eclipse.jgit.storage.pack;version="[7.3.0,7.4.0)", + org.eclipse.jgit.submodule;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.http;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport.resolver;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.treewalk.filter;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.io;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util.sha1;version="[7.3.0,7.4.0)", org.junit;version="[4.13,5.0.0)", org.junit.experimental.theories;version="[4.13,5.0.0)", org.junit.function;version="[4.13.0,5.0.0)", diff --git a/org.eclipse.jgit.test/pom.xml b/org.eclipse.jgit.test/pom.xml index 1a1e42f49f..9cf21fd778 100644 --- a/org.eclipse.jgit.test/pom.xml +++ b/org.eclipse.jgit.test/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.test diff --git a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF index a4ce4906f6..e0b049c521 100644 --- a/org.eclipse.jgit.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit.ui Bundle-SymbolicName: org.eclipse.jgit.ui -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-17 -Export-Package: org.eclipse.jgit.awtui;version="7.2.1" -Import-Package: org.eclipse.jgit.errors;version="[7.2.1,7.3.0)", - org.eclipse.jgit.lib;version="[7.2.1,7.3.0)", - org.eclipse.jgit.nls;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revplot;version="[7.2.1,7.3.0)", - org.eclipse.jgit.revwalk;version="[7.2.1,7.3.0)", - org.eclipse.jgit.transport;version="[7.2.1,7.3.0)", - org.eclipse.jgit.util;version="[7.2.1,7.3.0)" +Export-Package: org.eclipse.jgit.awtui;version="7.3.0" +Import-Package: org.eclipse.jgit.errors;version="[7.3.0,7.4.0)", + org.eclipse.jgit.lib;version="[7.3.0,7.4.0)", + org.eclipse.jgit.nls;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revplot;version="[7.3.0,7.4.0)", + org.eclipse.jgit.revwalk;version="[7.3.0,7.4.0)", + org.eclipse.jgit.transport;version="[7.3.0,7.4.0)", + org.eclipse.jgit.util;version="[7.3.0,7.4.0)" diff --git a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF index e668fc2aba..66617ca8db 100644 --- a/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit.ui/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit.ui - Sources Bundle-SymbolicName: org.eclipse.jgit.ui.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit.ui;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index d378b2dc2d..3d8d2a1b41 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -19,7 +19,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit.ui diff --git a/org.eclipse.jgit/META-INF/MANIFEST.MF b/org.eclipse.jgit/META-INF/MANIFEST.MF index d4e346c6be..5f851ec541 100644 --- a/org.eclipse.jgit/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/MANIFEST.MF @@ -3,14 +3,14 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Automatic-Module-Name: org.eclipse.jgit Bundle-SymbolicName: org.eclipse.jgit -Bundle-Version: 7.2.1.qualifier +Bundle-Version: 7.3.0.qualifier Bundle-Localization: OSGI-INF/l10n/plugin Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/org.eclipse.jgit.internal.util.CleanupService.xml Eclipse-ExtensibleAPI: true -Export-Package: org.eclipse.jgit.annotations;version="7.2.1", - org.eclipse.jgit.api;version="7.2.1"; +Export-Package: org.eclipse.jgit.annotations;version="7.3.0", + org.eclipse.jgit.api;version="7.3.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.notes, org.eclipse.jgit.dircache, @@ -25,21 +25,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.1", org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.blame, org.eclipse.jgit.merge", - org.eclipse.jgit.api.errors;version="7.2.1"; + org.eclipse.jgit.api.errors;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.errors", - org.eclipse.jgit.attributes;version="7.2.1"; + org.eclipse.jgit.attributes;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.blame;version="7.2.1"; + org.eclipse.jgit.blame;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.blame.cache, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter", - org.eclipse.jgit.blame.cache;version="7.2.1"; + org.eclipse.jgit.blame.cache;version="7.3.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.diff;version="7.2.1"; + org.eclipse.jgit.diff;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.patch, @@ -47,55 +47,55 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.1", org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.dircache;version="7.2.1"; + org.eclipse.jgit.dircache;version="7.3.0"; uses:="org.eclipse.jgit.events, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.errors;version="7.2.1"; + org.eclipse.jgit.errors;version="7.3.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.dircache, org.eclipse.jgit.lib", - org.eclipse.jgit.events;version="7.2.1"; + org.eclipse.jgit.events;version="7.3.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.fnmatch;version="7.2.1", - org.eclipse.jgit.gitrepo;version="7.2.1"; + org.eclipse.jgit.fnmatch;version="7.3.0", + org.eclipse.jgit.gitrepo;version="7.3.0"; uses:="org.xml.sax.helpers, org.eclipse.jgit.api, org.eclipse.jgit.api.errors, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.xml.sax", - org.eclipse.jgit.gitrepo.internal;version="7.2.1";x-internal:=true, - org.eclipse.jgit.hooks;version="7.2.1"; + org.eclipse.jgit.gitrepo.internal;version="7.3.0";x-internal:=true, + org.eclipse.jgit.hooks;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.ignore;version="7.2.1", - org.eclipse.jgit.ignore.internal;version="7.2.1"; + org.eclipse.jgit.ignore;version="7.3.0", + org.eclipse.jgit.ignore.internal;version="7.3.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal;version="7.2.1"; + org.eclipse.jgit.internal;version="7.3.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.test", - org.eclipse.jgit.internal.diff;version="7.2.1"; + org.eclipse.jgit.internal.diff;version="7.3.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.diffmergetool;version="7.2.1"; + org.eclipse.jgit.internal.diffmergetool;version="7.3.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.internal.fsck;version="7.2.1"; + org.eclipse.jgit.internal.fsck;version="7.3.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.revwalk;version="7.2.1"; + org.eclipse.jgit.internal.revwalk;version="7.3.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.commitgraph;version="7.2.1"; + org.eclipse.jgit.internal.storage.commitgraph;version="7.3.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.dfs;version="7.2.1"; + org.eclipse.jgit.internal.storage.dfs;version="7.3.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.http.server, org.eclipse.jgit.http.test, org.eclipse.jgit.lfs.test", - org.eclipse.jgit.internal.storage.file;version="7.2.1"; + org.eclipse.jgit.internal.storage.file;version="7.3.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.junit, org.eclipse.jgit.junit.http, @@ -104,37 +104,37 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.1", org.eclipse.jgit.pgm, org.eclipse.jgit.pgm.test, org.eclipse.jgit.ssh.apache", - org.eclipse.jgit.internal.storage.io;version="7.2.1"; + org.eclipse.jgit.internal.storage.io;version="7.3.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.memory;version="7.2.1"; + org.eclipse.jgit.internal.storage.memory;version="7.3.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.storage.midx;version="7.2.1";x-internal:=true, - org.eclipse.jgit.internal.storage.pack;version="7.2.1"; + org.eclipse.jgit.internal.storage.midx;version="7.3.0";x-internal:=true, + org.eclipse.jgit.internal.storage.pack;version="7.3.0"; x-friends:="org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.storage.reftable;version="7.2.1"; + org.eclipse.jgit.internal.storage.reftable;version="7.3.0"; x-friends:="org.eclipse.jgit.http.test, org.eclipse.jgit.junit, org.eclipse.jgit.test, org.eclipse.jgit.pgm", - org.eclipse.jgit.internal.submodule;version="7.2.1";x-internal:=true, - org.eclipse.jgit.internal.transport.connectivity;version="7.2.1"; + org.eclipse.jgit.internal.submodule;version="7.3.0";x-internal:=true, + org.eclipse.jgit.internal.transport.connectivity;version="7.3.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.http;version="7.2.1"; + org.eclipse.jgit.internal.transport.http;version="7.3.0"; x-friends:="org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.parser;version="7.2.1"; + org.eclipse.jgit.internal.transport.parser;version="7.3.0"; x-friends:="org.eclipse.jgit.http.server, org.eclipse.jgit.test", - org.eclipse.jgit.internal.transport.ssh;version="7.2.1"; + org.eclipse.jgit.internal.transport.ssh;version="7.3.0"; x-friends:="org.eclipse.jgit.ssh.apache, org.eclipse.jgit.ssh.jsch, org.eclipse.jgit.test", - org.eclipse.jgit.internal.util;version="7.2.1"; + org.eclipse.jgit.internal.util;version="7.3.0"; x-friends:="org.eclipse.jgit.junit", - org.eclipse.jgit.lib;version="7.2.1"; + org.eclipse.jgit.lib;version="7.3.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.util.sha1, org.eclipse.jgit.dircache, @@ -149,12 +149,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.1", org.eclipse.jgit.util, org.eclipse.jgit.submodule, org.eclipse.jgit.util.time", - org.eclipse.jgit.lib.internal;version="7.2.1"; + org.eclipse.jgit.lib.internal;version="7.3.0"; x-friends:="org.eclipse.jgit.test, org.eclipse.jgit.pgm, org.eclipse.egit.ui", - org.eclipse.jgit.logging;version="7.2.1", - org.eclipse.jgit.merge;version="7.2.1"; + org.eclipse.jgit.logging;version="7.3.0", + org.eclipse.jgit.merge;version="7.3.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, @@ -163,42 +163,42 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.1", org.eclipse.jgit.util, org.eclipse.jgit.api, org.eclipse.jgit.attributes", - org.eclipse.jgit.nls;version="7.2.1", - org.eclipse.jgit.notes;version="7.2.1"; + org.eclipse.jgit.nls;version="7.3.0", + org.eclipse.jgit.notes;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk, org.eclipse.jgit.merge", - org.eclipse.jgit.patch;version="7.2.1"; + org.eclipse.jgit.patch;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk, org.eclipse.jgit.diff", - org.eclipse.jgit.revplot;version="7.2.1"; + org.eclipse.jgit.revplot;version="7.3.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib", - org.eclipse.jgit.revwalk;version="7.2.1"; + org.eclipse.jgit.revwalk;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.revwalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.treewalk, org.eclipse.jgit.internal.storage.commitgraph", - org.eclipse.jgit.revwalk.filter;version="7.2.1"; + org.eclipse.jgit.revwalk.filter;version="7.3.0"; uses:="org.eclipse.jgit.revwalk, org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.file;version="7.2.1"; + org.eclipse.jgit.storage.file;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.util", - org.eclipse.jgit.storage.pack;version="7.2.1"; + org.eclipse.jgit.storage.pack;version="7.3.0"; uses:="org.eclipse.jgit.lib", - org.eclipse.jgit.submodule;version="7.2.1"; + org.eclipse.jgit.submodule;version="7.3.0"; uses:="org.eclipse.jgit.lib, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.diff, org.eclipse.jgit.treewalk, org.eclipse.jgit.util", - org.eclipse.jgit.transport;version="7.2.1"; + org.eclipse.jgit.transport;version="7.3.0"; uses:="javax.crypto, org.eclipse.jgit.hooks, org.eclipse.jgit.util.io, @@ -211,21 +211,21 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.1", org.eclipse.jgit.transport.resolver, org.eclipse.jgit.storage.pack, org.eclipse.jgit.errors", - org.eclipse.jgit.transport.http;version="7.2.1"; + org.eclipse.jgit.transport.http;version="7.3.0"; uses:="javax.net.ssl", - org.eclipse.jgit.transport.resolver;version="7.2.1"; + org.eclipse.jgit.transport.resolver;version="7.3.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.lib", - org.eclipse.jgit.treewalk;version="7.2.1"; + org.eclipse.jgit.treewalk;version="7.3.0"; uses:="org.eclipse.jgit.dircache, org.eclipse.jgit.lib, org.eclipse.jgit.attributes, org.eclipse.jgit.revwalk, org.eclipse.jgit.treewalk.filter, org.eclipse.jgit.util", - org.eclipse.jgit.treewalk.filter;version="7.2.1"; + org.eclipse.jgit.treewalk.filter;version="7.3.0"; uses:="org.eclipse.jgit.treewalk", - org.eclipse.jgit.util;version="7.2.1"; + org.eclipse.jgit.util;version="7.3.0"; uses:="org.eclipse.jgit.transport, org.eclipse.jgit.hooks, org.eclipse.jgit.revwalk, @@ -238,12 +238,12 @@ Export-Package: org.eclipse.jgit.annotations;version="7.2.1", org.eclipse.jgit.treewalk, javax.net.ssl, org.eclipse.jgit.util.time", - org.eclipse.jgit.util.io;version="7.2.1"; + org.eclipse.jgit.util.io;version="7.3.0"; uses:="org.eclipse.jgit.attributes, org.eclipse.jgit.lib, org.eclipse.jgit.treewalk", - org.eclipse.jgit.util.sha1;version="7.2.1", - org.eclipse.jgit.util.time;version="7.2.1" + org.eclipse.jgit.util.sha1;version="7.3.0", + org.eclipse.jgit.util.time;version="7.3.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: com.googlecode.javaewah;version="[1.1.6,2.0.0)", javax.crypto, diff --git a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF index 48005f54cf..a9e669b3f7 100644 --- a/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF +++ b/org.eclipse.jgit/META-INF/SOURCE-MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.eclipse.jgit - Sources Bundle-SymbolicName: org.eclipse.jgit.source Bundle-Vendor: Eclipse.org - JGit -Bundle-Version: 7.2.1.qualifier -Eclipse-SourceBundle: org.eclipse.jgit;version="7.2.1.qualifier";roots="." +Bundle-Version: 7.3.0.qualifier +Eclipse-SourceBundle: org.eclipse.jgit;version="7.3.0.qualifier";roots="." diff --git a/org.eclipse.jgit/pom.xml b/org.eclipse.jgit/pom.xml index 08363813b5..c65a440cc9 100644 --- a/org.eclipse.jgit/pom.xml +++ b/org.eclipse.jgit/pom.xml @@ -20,7 +20,7 @@ org.eclipse.jgit org.eclipse.jgit-parent - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT org.eclipse.jgit diff --git a/pom.xml b/pom.xml index cc0d47fcc0..ecae118eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.eclipse.jgit org.eclipse.jgit-parent pom - 7.2.1-SNAPSHOT + 7.3.0-SNAPSHOT JGit - Parent ${jgit-url} -- cgit v1.2.3