Merge branch 'stable-6.7' into stable-6.8
* stable-6.7:
AdvertisedRequestValidator: fix WantNotValidException caused by race
Change-Id: I1e485422608cf55373c1d86c4c0d50c9f9f49f20
diff --git a/.bazelversion b/.bazelversion
index 6abaeb2..91e4a9f 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-6.2.0
+6.3.2
diff --git a/.gitignore b/.gitignore
index 5306e41..1671449 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
/.project
/org.eclipse.jgit.benchmarks/dependency-reduced-pom.xml
-/target
+target/
infer-out
bazel-*
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e0859d2..bb9df9f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,17 +12,17 @@
## Submitting changes
-- We use [Gerrit](https://git.eclipse.org/r/) to review all changes by committers
-or contributors before they are merged.
+- We use [Gerrit on GerritHub](https://eclipse.gerrithub.io/q/project:eclipse-jgit/jgit+status:open)
+ to review all changes by committers or contributors before they are merged.
- Make sure you have an account and have set up the `commit-msg` hook
before committing.
- When committing your changes, see the contributor guide or other commits
on what your commit message should include.
- Run the following to push your change for review (with `username`
-replaced by your Gerrit username):
+replaced by your GitHub username):
```bash
-git push ssh://username@git.eclipse.org:29418/jgit/jgit.git HEAD:refs/for/master
+git push ssh://username@eclipse.gerrithub.io:29418/eclipse-jgit/jgit HEAD:refs/for/master
```
- Add the link to the review as a comment on the bug report, so that
diff --git a/Documentation/config-options.md b/Documentation/config-options.md
index 810bbc6..ec9d86b 100644
--- a/Documentation/config-options.md
+++ b/Documentation/config-options.md
@@ -13,7 +13,6 @@
| option | default | git option | description |
|---------|---------|------------|-------------|
-| `commitGraph.writeChangedPaths` | `false`| ⃞ | Whether bloom filter should be written to commit-graph. |
| `commitGraph.readChangedPaths` | `false` | ✅ | Whether to use the changed-path Bloom filters in the commit-graph file (if it exists, and they are present). |
## __core__ options
@@ -77,6 +76,7 @@
| `gc.logExpiry` | `1.day.ago` | ✅ | If the file `gc.log` exists, then auto gc will print its content and exit successfully instead of running unless that file is more than `gc.logExpiry` old. |
| `gc.pruneExpire` | `2.weeks.ago` | ✅ | Grace period after which unreachable objects will be pruned. |
| `gc.prunePackExpire` | `1.hour.ago` | ⃞ | Grace period after which packfiles only containing unreachable objects will be pruned. |
+| `gc.writeChangedPaths` | `false`| ⃞ | Whether bloom filter should be written to commit-graph during a gc operation. |
## __http__ options
@@ -134,8 +134,25 @@
|---------|---------|------------|-------------|
| `repack.packKeptObjects` | `true` when `pack.buildBitmaps` is set, `false` otherwise | ✅ | Include objects in packs locked by a `.keep` file when repacking. |
+
## Java System Properties
| system property | default | description |
|-----------------|---------|-------------|
| `REVWALK_USE_PRIORITY_QUEUE` | `false` | If set to `true` `RevWalk` uses `DateRevPriorityQueue` which is faster, otherwise it uses the old `DateRevQueue`. |
+
+## Tracing
+
+**GIT_TRACE_PERFORMANCE**: set this to `true` as a Java system property or environment variable to trace timings from the progress monitor. The system property takes
+precedence. Defaults to `false`. Can also be set programmatically via `ProgressMonitor#showDuration`.
+
+*Example using JGit CLI:*
+
+```bash
+$ GIT_TRACE_PERFORMANCE=true jgit clone https://foo.bar/foobar
+Cloning into 'foobar'...
+remote: Counting objects: 1 [0.002s]
+remote: Finding sources: 100% (15531/15531) [0.006s]
+Receiving objects: 100% (169737/169737) [13.045s]
+Resolving deltas: 100% (67579/67579) [1.842s]
+```
diff --git a/WORKSPACE b/WORKSPACE
index 652ceec..71a27c2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("//tools:bazlets.bzl", "load_bazlets")
-load_bazlets(commit = "f30a992da9fc855dce819875afb59f9dd6f860cd")
+load_bazlets(commit = "f9c119e45d9a241bee720b7fbd6c7fdbc952da5f")
load(
"@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
@@ -90,18 +90,18 @@
sha1 = "51cf043c87253c9f58b539c9f7e44c8894223850",
)
-SSHD_VERS = "2.10.0"
+SSHD_VERS = "2.11.0"
maven_jar(
name = "sshd-osgi",
artifact = "org.apache.sshd:sshd-osgi:" + SSHD_VERS,
- sha1 = "03677ac1da780b7bdb682da50b762d79ea0d940d",
+ sha1 = "7ec6b14ab789fc4b1ce9fdcd0e13d22b5c940e7b",
)
maven_jar(
name = "sshd-sftp",
artifact = "org.apache.sshd:sshd-sftp:" + SSHD_VERS,
- sha1 = "88707339ac0693d48df0ec1bafb84c78d792ed08",
+ sha1 = "3a293bba303c486a9ff6be8e11c9c68fd56b63c7",
)
maven_jar(
@@ -148,8 +148,8 @@
maven_jar(
name = "commons-compress",
- artifact = "org.apache.commons:commons-compress:1.23.0",
- sha1 = "4af2060ea9b0c8b74f1854c6cafe4d43cfc161fc",
+ artifact = "org.apache.commons:commons-compress:1.25.0",
+ sha1 = "9d35aec423da6c8a7f93d7e9e1c6b1d9fe14bb5e",
)
maven_jar(
@@ -178,8 +178,8 @@
maven_jar(
name = "mockito",
- artifact = "org.mockito:mockito-core:5.5.0",
- sha1 = "1660ec3ce0af7f713af923817b225a37cc5cf965",
+ artifact = "org.mockito:mockito-core:5.7.0",
+ sha1 = "a1c258331ab91d66863c983aff7136357e9de056",
)
maven_jar(
@@ -188,18 +188,18 @@
sha1 = "ebbf338e33f893139459ce5df023115971c2786f",
)
-BYTE_BUDDY_VERSION = "1.14.7"
+BYTE_BUDDY_VERSION = "1.14.8"
maven_jar(
name = "bytebuddy",
artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION,
- sha1 = "34efde5f0bb93afc94aaf9d400521899c4806873",
+ sha1 = "505d7d8937ff00cc55db79723e26c94069b87d66",
)
maven_jar(
name = "bytebuddy-agent",
artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION,
- sha1 = "38b49d37e3e14793ef10977ba75f761c8678e20e",
+ sha1 = "ae6ebe485f3bcd0a1e20241488a32e6400a501ef",
)
maven_jar(
@@ -214,83 +214,83 @@
sha1 = "b3add478d4382b78ea20b1671390a858002feb6c",
)
-JETTY_VER = "10.0.15"
+JETTY_VER = "10.0.18"
maven_jar(
name = "jetty-servlet",
artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VER,
- sha1 = "17e21100d9eabae2c0f560ab2c1d5f0edfc4a57b",
- src_sha1 = "989ecc16914e7c8f9f78715dd97d0c511d77a99f",
+ sha1 = "cc0acde71a3b04db8fcde2ad60a00dfd4effab23",
+ src_sha1 = "b038debaa2c0c4674fa1bc6e96bcf8bf283be0e8",
)
maven_jar(
name = "jetty-security",
artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VER,
- sha1 = "ae9c2fd327090fc749a6656109adf88f84f05854",
- src_sha1 = "1cae575fc9f3d9271507642606603cca7dc753e8",
+ sha1 = "399601ef4e649b3be6f9fd6176b208914f9fd171",
+ src_sha1 = "b203e58304afe23d8820af6abe3ca39696fe7530",
)
maven_jar(
name = "jetty-server",
artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VER,
- sha1 = "d1e941f30300d64b122d5346f1599ecaa8e270ba",
- src_sha1 = "7b04c7d3dc702608306935607bf73ac871816010",
+ sha1 = "b59b7df009bbb85be455e42524e9a11944fb3ba1",
+ src_sha1 = "d45709036a573843cd57daeb3112f00f8bf4f753",
)
maven_jar(
name = "jetty-http",
artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VER,
- sha1 = "53c4702201c33501bc37a982e5325b5f11084a4e",
- src_sha1 = "2cf03c695ea19c1af5668f5c97dac59e3027eb55",
+ sha1 = "9b7f2b580bdcf2a9c27168eac58276c7e6e99ccf",
+ src_sha1 = "4bbede666e912c8abb60c04022b84225fe9ce369",
)
maven_jar(
name = "jetty-io",
artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VER,
- sha1 = "4481d9593bb89c4da016e49463b0d477faca06dc",
- src_sha1 = "c9f241cce63ac929d4b8bd859c761ba83f4a3124",
+ sha1 = "a622527216b27f72744daf849aa2fa0c6f3db131",
+ src_sha1 = "402c5aa958a734576f13898e63f7ca7f73360b76",
)
maven_jar(
name = "jetty-util",
artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VER,
- sha1 = "eb8901d419e83f2f06809e0cdceaf38b06426f01",
- src_sha1 = "757ee2bd100c5bd20aebc7e2fdc4ceb99f23b451",
+ sha1 = "1ee6a71c2249d5596ba578f015121c99b2b7591a",
+ src_sha1 = "cbba373f654f22e0f0c10c02938e2df8ec2f0fd3",
)
maven_jar(
name = "jetty-util-ajax",
artifact = "org.eclipse.jetty:jetty-util-ajax:" + JETTY_VER,
- sha1 = "0cde62dd87845dd6c0c7f07db6c901e7d020653b",
- src_sha1 = "135448f8b3b3b06f7f3312d222992525ae4bdd25",
+ sha1 = "3560c8a15f920e24daf8ad4196e23ec21610f7d6",
+ src_sha1 = "4b4966b125c586795e425b7b561bcd5b223d6617",
)
-BOUNCYCASTLE_VER = "1.76"
+BOUNCYCASTLE_VER = "1.77"
maven_jar(
name = "bcpg",
artifact = "org.bouncycastle:bcpg-jdk18on:" + BOUNCYCASTLE_VER,
- sha1 = "d5c23d0470261254d0e84dde1d4237d228540298",
- src_sha1 = "68d49cdd07da2121a904f481e2e92ca864c08d05",
+ sha1 = "bb0be51e8b378baae6e0d86f5282cd3887066539",
+ src_sha1 = "33ff3269cede7165dac44033a3b150cc9f9f11cf",
)
maven_jar(
name = "bcprov",
artifact = "org.bouncycastle:bcprov-jdk18on:" + BOUNCYCASTLE_VER,
- sha1 = "3a785d0b41806865ad7e311162bfa3fa60b3965b",
- src_sha1 = "9e00748625819d7e3cc1447366dfa76f0b354a2d",
+ sha1 = "2cc971b6c20949c1ff98d1a4bc741ee848a09523",
+ src_sha1 = "14ea9a3d759261358c6a1f59490ded125b5273a6",
)
maven_jar(
name = "bcutil",
artifact = "org.bouncycastle:bcutil-jdk18on:" + BOUNCYCASTLE_VER,
- sha1 = "8c7594e651a278bcde18e038d8ab55b1f97f4d31",
- src_sha1 = "836bb2c42f10b29127b470ebe5c648927dd4ddc6",
+ sha1 = "de3eaef351545fe8562cf29ddff4a403a45b49b7",
+ src_sha1 = "6f8f56ab009e7a3204817a0d45ed9638f5e30116",
)
maven_jar(
name = "bcpkix",
artifact = "org.bouncycastle:bcpkix-jdk18on:" + BOUNCYCASTLE_VER,
- sha1 = "10c9cf5c1b4d64abeda28ee32fbade3b74373622",
- src_sha1 = "e5700c1de407652c1af5961ac8a04fab02eda365",
+ sha1 = "ed953791ba0229747dd0fd9911e3d76a462acfd3",
+ src_sha1 = "fdff397d5de0306db014f0a17e91717150db2768",
)
diff --git a/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant.test/META-INF/MANIFEST.MF
index 94263bc..849da13 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 @@
Automatic-Module-Name: org.eclipse.jgit.ant.test
Bundle-SymbolicName: org.eclipse.jgit.ant.test
Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.ant.tasks;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.ant.tasks;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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 58751db..26b4268 100644
--- a/org.eclipse.jgit.ant.test/pom.xml
+++ b/org.eclipse.jgit.ant.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
diff --git a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
index e175108..54ea3d5 100644
--- a/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ant/META-INF/MANIFEST.MF
@@ -3,13 +3,13 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ant
Bundle-SymbolicName: org.eclipse.jgit.ant
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.apache.tools.ant,
- org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)"
-Bundle-Localization: plugin
+ org.eclipse.jgit.storage.file;version="[6.8.1,6.9.0)"
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.ant;version="6.7.1",
- org.eclipse.jgit.ant.tasks;version="6.7.1";
+Export-Package: org.eclipse.jgit.ant;version="6.8.1",
+ org.eclipse.jgit.ant.tasks;version="6.8.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 7b13950..856c782 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-Name: org.eclipse.jgit.ant - Sources
Bundle-SymbolicName: org.eclipse.jgit.ant.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ant;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ant/plugin.properties b/org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.ant/plugin.properties
rename to org.eclipse.jgit.ant/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.ant/build.properties b/org.eclipse.jgit.ant/build.properties
index 43a5be6..17f6d12 100644
--- a/org.eclipse.jgit.ant/build.properties
+++ b/org.eclipse.jgit.ant/build.properties
@@ -2,8 +2,8 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
additional.bundles = org.apache.ant,\
org.eclipse.jgit,\
diff --git a/org.eclipse.jgit.ant/pom.xml b/org.eclipse.jgit.ant/pom.xml
index 39c8a2f..387dc1a 100644
--- a/org.eclipse.jgit.ant/pom.xml
+++ b/org.eclipse.jgit.ant/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ant</artifactId>
@@ -38,7 +38,6 @@
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
- <version>1.10.12</version>
</dependency>
</dependencies>
@@ -70,7 +69,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
index a8ec4c9..74d38d8 100644
--- a/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.archive/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.archive
Bundle-SymbolicName: org.eclipse.jgit.archive
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.apache.commons.compress.archivers;version="[1.4,2.0)",
org.apache.commons.compress.archivers.tar;version="[1.4,2.0)",
@@ -13,17 +13,17 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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.7.1";
+Export-Package: org.eclipse.jgit.archive;version="6.8.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.7.1";x-internal:=true
+ org.eclipse.jgit.archive.internal;version="6.8.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 b08cf20..441cbf6 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-Name: org.eclipse.jgit.archive - Sources
Bundle-SymbolicName: org.eclipse.jgit.archive.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.archive;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.archive/plugin.properties b/org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.archive/plugin.properties
rename to org.eclipse.jgit.archive/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.archive/build.properties b/org.eclipse.jgit.archive/build.properties
index d944674..4482a12 100644
--- a/org.eclipse.jgit.archive/build.properties
+++ b/org.eclipse.jgit.archive/build.properties
@@ -1,6 +1,6 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- about.html,\
- plugin.properties
+ about.html
diff --git a/org.eclipse.jgit.archive/pom.xml b/org.eclipse.jgit.archive/pom.xml
index e94732b..0705e5f 100644
--- a/org.eclipse.jgit.archive/pom.xml
+++ b/org.eclipse.jgit.archive/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.archive</artifactId>
@@ -77,7 +77,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java
index 25cd368..4757998 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/BaseFormat.java
@@ -15,6 +15,7 @@
import java.text.MessageFormat;
import java.util.Map;
+import org.apache.commons.compress.archivers.ArchiveEntry;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
import org.eclipse.jgit.archive.internal.ArchiveText;
import org.eclipse.jgit.util.StringUtils;
@@ -42,7 +43,8 @@ public class BaseFormat {
* @throws IOException
* if an IO error occurred
*/
- protected ArchiveOutputStream applyFormatOptions(ArchiveOutputStream s,
+ protected ArchiveOutputStream<? extends ArchiveEntry> applyFormatOptions(
+ ArchiveOutputStream<? extends ArchiveEntry> s,
Map<String, Object> o) throws IOException {
for (Map.Entry<String, Object> p : o.entrySet()) {
try {
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
index dfa6032..3db1124 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TarFormat.java
@@ -35,7 +35,7 @@
* Unix TAR format (ustar + some PAX extensions).
*/
public final class TarFormat extends BaseFormat implements
- ArchiveCommand.Format<ArchiveOutputStream> {
+ ArchiveCommand.Format<ArchiveOutputStream<TarArchiveEntry>> {
private static final List<String> SUFFIXES = Collections
.unmodifiableList(Arrays.asList(".tar")); //$NON-NLS-1$
@@ -57,7 +57,7 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
}
@Override
- public void putEntry(ArchiveOutputStream out,
+ public void putEntry(ArchiveOutputStream<TarArchiveEntry> out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
throws IOException {
if (mode == FileMode.SYMLINK) {
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java
index 26da431..03a2305 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/Tbz2Format.java
@@ -17,6 +17,7 @@
import java.util.Map;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream;
import org.eclipse.jgit.api.ArchiveCommand;
import org.eclipse.jgit.lib.FileMode;
@@ -26,12 +27,12 @@
/**
* bzip2-compressed tarball (tar.bz2) format.
*/
-public final class Tbz2Format extends BaseFormat implements
- ArchiveCommand.Format<ArchiveOutputStream> {
+public final class Tbz2Format extends BaseFormat
+ implements ArchiveCommand.Format<ArchiveOutputStream<TarArchiveEntry>> {
private static final List<String> SUFFIXES = Collections
.unmodifiableList(Arrays.asList(".tar.bz2", ".tbz", ".tbz2")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
+ private final ArchiveCommand.Format<ArchiveOutputStream<TarArchiveEntry>> tarFormat = new TarFormat();
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
@@ -54,7 +55,7 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
}
@Override
- public void putEntry(ArchiveOutputStream out,
+ public void putEntry(ArchiveOutputStream<TarArchiveEntry> out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
throws IOException {
tarFormat.putEntry(out, tree, path, mode, loader);
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java
index d1ed035..6ce9c1e 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TgzFormat.java
@@ -17,6 +17,7 @@
import java.util.Map;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.compressors.gzip.GzipCompressorOutputStream;
import org.apache.commons.compress.compressors.gzip.GzipParameters;
import org.eclipse.jgit.api.ArchiveCommand;
@@ -27,12 +28,12 @@
/**
* gzip-compressed tarball (tar.gz) format.
*/
-public final class TgzFormat extends BaseFormat implements
- ArchiveCommand.Format<ArchiveOutputStream> {
+public final class TgzFormat extends BaseFormat
+ implements ArchiveCommand.Format<ArchiveOutputStream<TarArchiveEntry>> {
private static final List<String> SUFFIXES = Collections
.unmodifiableList(Arrays.asList(".tar.gz", ".tgz")); //$NON-NLS-1$ //$NON-NLS-2$
- private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
+ private final ArchiveCommand.Format<ArchiveOutputStream<TarArchiveEntry>> tarFormat = new TarFormat();
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
@@ -57,7 +58,7 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
}
@Override
- public void putEntry(ArchiveOutputStream out,
+ public void putEntry(ArchiveOutputStream<TarArchiveEntry> out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
throws IOException {
tarFormat.putEntry(out, tree, path, mode, loader);
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java
index 42549de..f51f904 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/TxzFormat.java
@@ -17,6 +17,7 @@
import java.util.Map;
import org.apache.commons.compress.archivers.ArchiveOutputStream;
+import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
import org.eclipse.jgit.api.ArchiveCommand;
import org.eclipse.jgit.lib.FileMode;
@@ -26,12 +27,12 @@
/**
* Xz-compressed tar (tar.xz) format.
*/
-public final class TxzFormat extends BaseFormat implements
- ArchiveCommand.Format<ArchiveOutputStream> {
+public final class TxzFormat extends BaseFormat
+ implements ArchiveCommand.Format<ArchiveOutputStream<TarArchiveEntry>> {
private static final List<String> SUFFIXES = Collections
.unmodifiableList(Arrays.asList(".tar.xz", ".txz")); //$NON-NLS-1$ //$NON-NLS-2$
- private final ArchiveCommand.Format<ArchiveOutputStream> tarFormat = new TarFormat();
+ private final ArchiveCommand.Format<ArchiveOutputStream<TarArchiveEntry>> tarFormat = new TarFormat();
@Override
public ArchiveOutputStream createArchiveOutputStream(OutputStream s)
@@ -54,7 +55,7 @@ public ArchiveOutputStream createArchiveOutputStream(OutputStream s,
}
@Override
- public void putEntry(ArchiveOutputStream out,
+ public void putEntry(ArchiveOutputStream<TarArchiveEntry> out,
ObjectId tree, String path, FileMode mode, ObjectLoader loader)
throws IOException {
tarFormat.putEntry(out, tree, path, mode, loader);
diff --git a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
index 551646b..4d63c23 100644
--- a/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
+++ b/org.eclipse.jgit.archive/src/org/eclipse/jgit/archive/internal/ArchiveText.java
@@ -16,6 +16,7 @@
/**
* Translation bundle for archivers
*/
+@SuppressWarnings("MissingSummary")
public class ArchiveText extends TranslationBundle {
/**
* Get an instance of this translation bundle.
diff --git a/org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs
index 81fed25..c7a9985 100644
--- a/org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jgit.benchmarks/.settings/org.eclipse.jdt.core.prefs
@@ -42,7 +42,7 @@
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=error
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
@@ -57,7 +57,7 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=error
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
diff --git a/org.eclipse.jgit.benchmarks/pom.xml b/org.eclipse.jgit.benchmarks/pom.xml
index b3edc49..56c6c4c 100644
--- a/org.eclipse.jgit.benchmarks/pom.xml
+++ b/org.eclipse.jgit.benchmarks/pom.xml
@@ -13,8 +13,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.eclipse.jgit</groupId>
- <version>6.7.1-SNAPSHOT</version>
+ <parent>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit-parent</artifactId>
+ <version>6.8.1-SNAPSHOT</version>
+ </parent>
+
<artifactId>org.eclipse.jgit.benchmarks</artifactId>
<packaging>jar</packaging>
@@ -143,6 +147,30 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!-- We check javadoc when compiling with ecj (option -Pecj) and configurations
+ set in .settings/org.eclipse.jdt.core.prefs. This allows more fine grained
+ configuration and fails the build on missing javadoc for protected and
+ public but not for private classes, methods and fields. We don't want
+ to check javadoc on tests. We can reconsider to configure this on javadoc
+ when it starts supporting access specifiers so that we can set
+ -Xdoclint:all,-missing/private -->
+ <additionalJOption>-Xdoclint:none</additionalJOption>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <quiet>true</quiet>
+ <failOnWarnings>false</failOnWarnings>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
diff --git a/org.eclipse.jgit.coverage/pom.xml b/org.eclipse.jgit.coverage/pom.xml
index bed98fc..0718c34 100644
--- a/org.eclipse.jgit.coverage/pom.xml
+++ b/org.eclipse.jgit.coverage/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,88 +27,88 @@
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.archive</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ui</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.test</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ant.test</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.http.test</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
</dependencies>
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 c58b5ce..cae7b85 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-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.gpg.bc.test
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.test
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -13,9 +13,9 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.gpg.bc.internal.keys;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.sha1;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.gpg.bc.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.sha1;version="[6.8.1,6.9.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 9479948..0078381 100644
--- a/org.eclipse.jgit.gpg.bc.test/pom.xml
+++ b/org.eclipse.jgit.gpg.bc.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.gpg.bc.test</artifactId>
diff --git a/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF b/org.eclipse.jgit.gpg.bc/META-INF/MANIFEST.MF
index c3657f7..e5ba18a 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-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.7.1,6.8.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[6.8.1,6.9.0)"
Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
-Bundle-Version: 6.7.1.qualifier
+Bundle-Localization: OSGI-INF/l10n/gpg_bc
+Bundle-Version: 6.8.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: org.bouncycastle.asn1;version="[1.69.0,2.0.0)",
org.bouncycastle.asn1.cryptlib;version="[1.69.0,2.0.0)",
@@ -29,9 +29,9 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
org.slf4j;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.gpg.bc;version="6.7.1",
- org.eclipse.jgit.gpg.bc.internal;version="6.7.1";x-friends:="org.eclipse.jgit.gpg.bc.test",
- org.eclipse.jgit.gpg.bc.internal.keys;version="6.7.1";x-friends:="org.eclipse.jgit.gpg.bc.test"
+Export-Package: org.eclipse.jgit.gpg.bc;version="6.8.1",
+ org.eclipse.jgit.gpg.bc.internal;version="6.8.1";x-friends:="org.eclipse.jgit.gpg.bc.test",
+ org.eclipse.jgit.gpg.bc.internal.keys;version="6.8.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 1215b8c..29c6a18 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-Name: org.eclipse.jgit.gpg.bc - Sources
Bundle-SymbolicName: org.eclipse.jgit.gpg.bc.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.gpg.bc;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.gpg.bc/plugin.properties b/org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties
similarity index 100%
rename from org.eclipse.jgit.gpg.bc/plugin.properties
rename to org.eclipse.jgit.gpg.bc/OSGI-INF/l10n/gpg_bc.properties
diff --git a/org.eclipse.jgit.gpg.bc/build.properties b/org.eclipse.jgit.gpg.bc/build.properties
index 8148271..b483ecd 100644
--- a/org.eclipse.jgit.gpg.bc/build.properties
+++ b/org.eclipse.jgit.gpg.bc/build.properties
@@ -2,6 +2,6 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
diff --git a/org.eclipse.jgit.gpg.bc/pom.xml b/org.eclipse.jgit.gpg.bc/pom.xml
index d822bdb..5088657 100644
--- a/org.eclipse.jgit.gpg.bc/pom.xml
+++ b/org.eclipse.jgit.gpg.bc/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.gpg.bc</artifactId>
@@ -93,7 +93,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true" />
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}" />
+ <replacefilter token=".qualifier" value=".${commit.time.version}" />
</replace>
</target>
</configuration>
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 68ee2fd..4349984 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
@@ -15,6 +15,7 @@
/**
* Externalized text messages for localization.
*/
+@SuppressWarnings("MissingSummary")
public final class BCText extends TranslationBundle {
/**
diff --git a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
index d7bf34e..e9032a8 100644
--- a/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
+++ b/org.eclipse.jgit.gpg.bc/src/org/eclipse/jgit/gpg/bc/internal/BouncyCastleGpgKeyLocator.java
@@ -551,7 +551,7 @@ private BouncyCastleGpgKey findSecretKeyForKeyBoxPublicKey(
* Return the first suitable key for signing in the key ring collection. For
* this case we only expect there to be one key available for signing.
*
- * @param signingkey
+ * @param signingKeyName
* the signing key
* @param secringFile
* the secring file
@@ -562,7 +562,7 @@ private BouncyCastleGpgKey findSecretKeyForKeyBoxPublicKey(
* @throws PGPException
* on BouncyCastle errors
*/
- private PGPSecretKey findSecretKeyInLegacySecring(String signingkey,
+ private PGPSecretKey findSecretKeyInLegacySecring(String signingKeyName,
Path secringFile) throws IOException, PGPException {
try (InputStream in = newInputStream(secringFile)) {
@@ -570,7 +570,7 @@ private PGPSecretKey findSecretKeyInLegacySecring(String signingkey,
PGPUtil.getDecoderStream(new BufferedInputStream(in)),
new JcaKeyFingerprintCalculator());
- String keyId = toFingerprint(signingkey).toLowerCase(Locale.ROOT);
+ String keyId = toFingerprint(signingKeyName).toLowerCase(Locale.ROOT);
Iterator<PGPSecretKeyRing> keyrings = pgpSec.getKeyRings();
while (keyrings.hasNext()) {
PGPSecretKeyRing keyRing = keyrings.next();
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 68f8a45..3924d68 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
@@ -75,6 +75,10 @@ public PBESecretKeyDecryptor createDecryptor(String protection)
.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);
diff --git a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
index dbc3947..b2dcb68 100644
--- a/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.http.apache/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.apache
Bundle-SymbolicName: org.eclipse.jgit.http.apache
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Import-Package: org.apache.http;version="[4.3.0,5.0.0)",
@@ -25,11 +25,11 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)"
-Export-Package: org.eclipse.jgit.transport.http.apache;version="6.7.1";
+ org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)"
+Export-Package: org.eclipse.jgit.transport.http.apache;version="6.8.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 d0decf5..296d4b7 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-Name: org.eclipse.jgit.http.apache - Sources
Bundle-SymbolicName: org.eclipse.jgit.http.apache.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.apache;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.apache/plugin.properties b/org.eclipse.jgit.http.apache/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.http.apache/plugin.properties
rename to org.eclipse.jgit.http.apache/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.http.apache/build.properties b/org.eclipse.jgit.http.apache/build.properties
index 8148271..b483ecd 100644
--- a/org.eclipse.jgit.http.apache/build.properties
+++ b/org.eclipse.jgit.http.apache/build.properties
@@ -2,6 +2,6 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
diff --git a/org.eclipse.jgit.http.apache/pom.xml b/org.eclipse.jgit.http.apache/pom.xml
index 6820f65..b45a95d 100644
--- a/org.eclipse.jgit.http.apache/pom.xml
+++ b/org.eclipse.jgit.http.apache/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.apache</artifactId>
@@ -74,7 +74,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.http.apache/src/org/eclipse/jgit/transport/http/apache/internal/HttpApacheText.java b/org.eclipse.jgit.http.apache/src/org/eclipse/jgit/transport/http/apache/internal/HttpApacheText.java
index 677d7d7..1a333a8 100644
--- a/org.eclipse.jgit.http.apache/src/org/eclipse/jgit/transport/http/apache/internal/HttpApacheText.java
+++ b/org.eclipse.jgit.http.apache/src/org/eclipse/jgit/transport/http/apache/internal/HttpApacheText.java
@@ -16,6 +16,7 @@
/**
* Translation bundle for archivers
*/
+@SuppressWarnings("MissingSummary")
public class HttpApacheText extends TranslationBundle {
/**
* Get an instance of this translation bundle.
diff --git a/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.server/META-INF/MANIFEST.MF
index f604473..de0d61a 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-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.server
Bundle-SymbolicName: org.eclipse.jgit.http.server
-Bundle-Version: 6.7.1.qualifier
-Bundle-Localization: plugin
+Bundle-Version: 6.8.1.qualifier
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.http.server;version="6.7.1",
- org.eclipse.jgit.http.server.glue;version="6.7.1";
+Export-Package: org.eclipse.jgit.http.server;version="6.8.1",
+ org.eclipse.jgit.http.server.glue;version="6.8.1";
uses:="javax.servlet,javax.servlet.http",
- org.eclipse.jgit.http.server.resolver;version="6.7.1";
+ org.eclipse.jgit.http.server.resolver;version="6.8.1";
uses:="org.eclipse.jgit.transport.resolver,
org.eclipse.jgit.lib,
org.eclipse.jgit.transport,
@@ -18,14 +18,14 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.transport.parser;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.resolver;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)"
+ org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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 7f25f9b..741f9f2 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-Name: org.eclipse.jgit.http.server - Sources
Bundle-SymbolicName: org.eclipse.jgit.http.server.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.http.server;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.http.server/plugin.properties b/org.eclipse.jgit.http.server/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.http.server/plugin.properties
rename to org.eclipse.jgit.http.server/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.http.server/build.properties b/org.eclipse.jgit.http.server/build.properties
index 8148271..b483ecd 100644
--- a/org.eclipse.jgit.http.server/build.properties
+++ b/org.eclipse.jgit.http.server/build.properties
@@ -2,6 +2,6 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
diff --git a/org.eclipse.jgit.http.server/pom.xml b/org.eclipse.jgit.http.server/pom.xml
index b3df6c7..e819792 100644
--- a/org.eclipse.jgit.http.server/pom.xml
+++ b/org.eclipse.jgit.http.server/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.server</artifactId>
@@ -76,7 +76,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java
index c2d7c07..5939920 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/HttpServerText.java
@@ -16,6 +16,7 @@
/**
* Translation bundle for JGit http server
*/
+@SuppressWarnings("MissingSummary")
public class HttpServerText extends TranslationBundle {
/**
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java
index c87bbe6..09bb78e 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/ReceivePackErrorHandler.java
@@ -35,6 +35,8 @@
*/
public interface ReceivePackErrorHandler {
/**
+ * Receive pack
+ *
* @param req
* The HTTP request
* @param rsp
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java
index aaf537f..cff1fa9 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/UploadPackErrorHandler.java
@@ -60,6 +60,8 @@ public static int statusCodeForThrowable(Throwable error) {
}
/**
+ * Upload pack
+ *
* @param req
* The HTTP request
* @param rsp
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaFilter.java
index e626bec..7cd1ecf 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaFilter.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/MetaFilter.java
@@ -17,7 +17,6 @@
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import java.util.Set;
import java.util.regex.Pattern;
@@ -113,7 +112,7 @@ public void destroy() {
}
private static Set<Object> newIdentitySet() {
- final Map<Object, Object> m = new IdentityHashMap<>();
+ final IdentityHashMap<Object, Object> m = new IdentityHashMap<>();
return new AbstractSet<>() {
@Override
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java
index c8ff6a3..68adc2d 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/RegexGroupFilter.java
@@ -10,8 +10,6 @@
package org.eclipse.jgit.http.server.glue;
-import static java.lang.Integer.valueOf;
-
import java.io.IOException;
import java.text.MessageFormat;
@@ -45,7 +43,8 @@ public class RegexGroupFilter implements Filter {
public RegexGroupFilter(int groupIdx) {
if (groupIdx < 1)
throw new IllegalArgumentException(MessageFormat.format(
- HttpServerText.get().invalidIndex, valueOf(groupIdx)));
+ HttpServerText.get().invalidIndex,
+ Integer.valueOf(groupIdx)));
this.groupIdx = groupIdx - 1;
}
@@ -69,7 +68,7 @@ public void doFilter(final ServletRequest request,
else
throw new ServletException(MessageFormat.format(
HttpServerText.get().invalidRegexGroup,
- valueOf(groupIdx + 1)));
+ Integer.valueOf(groupIdx + 1)));
}
private static WrappedRequest[] groupsFor(ServletRequest r) {
diff --git a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java
index cd49023..e77de2b 100644
--- a/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java
+++ b/org.eclipse.jgit.http.server/src/org/eclipse/jgit/http/server/glue/ServletBinderImpl.java
@@ -66,6 +66,10 @@ protected HttpServlet getServlet() {
return filters.toArray(new Filter[0]);
}
- /** @return the pipeline that matches and executes this chain. */
+ /**
+ * Create UrlPipeline
+ *
+ * @return the pipeline that matches and executes this chain.
+ */
abstract UrlPipeline create();
}
diff --git a/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.http.test/META-INF/MANIFEST.MF
index ae776dc..e86cee8 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-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.http.test
Bundle-SymbolicName: org.eclipse.jgit.http.test
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -28,26 +28,26 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.http.server;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.http.server.glue;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.http.server.resolver;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http.apache;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.resolver;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.http.server;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.http.server.glue;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.http.server.resolver;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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 8546be4..ce8c4c1 100644
--- a/org.eclipse.jgit.http.test/pom.xml
+++ b/org.eclipse.jgit.http.test/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.http.test</artifactId>
diff --git a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
index df6934e..33a37ad 100644
--- a/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.http/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit.http
Bundle-SymbolicName: org.eclipse.jgit.junit.http
-Bundle-Version: 6.7.1.qualifier
-Bundle-Localization: plugin
+Bundle-Version: 6.8.1.qualifier
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -21,17 +21,17 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.http.server;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.resolver;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.http.server;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.8.1,6.9.0)",
org.junit;version="[4.13,5.0.0)",
org.slf4j.helpers;version="[1.7.0,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.http;version="6.7.1";
+Export-Package: org.eclipse.jgit.junit.http;version="6.8.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 30be81f..7d25044 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-Name: org.eclipse.jgit.junit.http - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.http.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.http;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.http/plugin.properties b/org.eclipse.jgit.junit.http/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.junit.http/plugin.properties
rename to org.eclipse.jgit.junit.http/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.junit.http/build.properties b/org.eclipse.jgit.junit.http/build.properties
index aa1a008..931e163 100644
--- a/org.eclipse.jgit.junit.http/build.properties
+++ b/org.eclipse.jgit.junit.http/build.properties
@@ -1,5 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
- plugin.properties
+ OSGI-INF/,\
+ .
diff --git a/org.eclipse.jgit.junit.http/pom.xml b/org.eclipse.jgit.junit.http/pom.xml
index 4684725..63fe58d 100644
--- a/org.eclipse.jgit.junit.http/pom.xml
+++ b/org.eclipse.jgit.junit.http/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.http</artifactId>
@@ -87,7 +87,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
index 6a9561e..cc6afda 100644
--- a/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit.ssh/META-INF/MANIFEST.MF
@@ -3,46 +3,46 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit.ssh
Bundle-SymbolicName: org.eclipse.jgit.junit.ssh
-Bundle-Version: 6.7.1.qualifier
-Bundle-Localization: plugin
+Bundle-Version: 6.8.1.qualifier
+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.10.0,2.11.0)",
- org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.file.virtualfs;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.io;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.signature;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.buffer;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.logging;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.threads;version="[2.10.0,2.11.0)",
- org.apache.sshd.core;version="[2.10.0,2.11.0)",
- org.apache.sshd.server;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth.gss;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth.keyboard;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth.password;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.command;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.shell;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.subsystem;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp.server;version="[2.10.0,2.11.0)",
- org.eclipse.jgit.annotations;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.api;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+Import-Package: org.apache.sshd.common;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.file.virtualfs;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.io;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.signature;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.buffer;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.logging;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.threads;version="[2.11.0,2.12.0)",
+ org.apache.sshd.core;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth.gss;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth.keyboard;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth.password;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.command;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.shell;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.subsystem;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp.server;version="[2.11.0,2.12.0)",
+ org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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,2.0.0)"
-Export-Package: org.eclipse.jgit.junit.ssh;version="6.7.1"
+Export-Package: org.eclipse.jgit.junit.ssh;version="6.8.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 1b0a63c..5bbf815 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-Name: org.eclipse.jgit.junit.ssh - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.ssh.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit.ssh;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit.ssh/plugin.properties b/org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.junit.ssh/plugin.properties
rename to org.eclipse.jgit.junit.ssh/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.junit.ssh/build.properties b/org.eclipse.jgit.junit.ssh/build.properties
index 84f1c95..408f54e 100644
--- a/org.eclipse.jgit.junit.ssh/build.properties
+++ b/org.eclipse.jgit.junit.ssh/build.properties
@@ -2,5 +2,5 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
- .,\
- plugin.properties
+ OSGI-INF/,\
+ .
diff --git a/org.eclipse.jgit.junit.ssh/pom.xml b/org.eclipse.jgit.junit.ssh/pom.xml
index 40e128c..0b760f5 100644
--- a/org.eclipse.jgit.junit.ssh/pom.xml
+++ b/org.eclipse.jgit.junit.ssh/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit.ssh</artifactId>
@@ -101,7 +101,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
index 29410b4..c4950f9 100644
--- a/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.junit/META-INF/MANIFEST.MF
@@ -3,35 +3,36 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.junit
Bundle-SymbolicName: org.eclipse.jgit.junit
-Bundle-Version: 6.7.1.qualifier
-Bundle-Localization: plugin
+Bundle-Version: 6.8.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.7.1,6.8.0)",
- org.eclipse.jgit.api;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.dircache;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.pack;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.merge;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="6.7.1",
- org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.io;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.time;version="[6.7.1,6.8.0)",
+Import-Package: org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.dircache;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.util;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.merge;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="6.8.1",
+ org.eclipse.jgit.treewalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.io;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.time;version="[6.8.1,6.9.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,2.0.0)"
-Export-Package: org.eclipse.jgit.junit;version="6.7.1";
+Export-Package: org.eclipse.jgit.junit;version="6.8.1";
uses:="org.eclipse.jgit.dircache,
org.eclipse.jgit.lib,
org.eclipse.jgit.revwalk,
@@ -44,4 +45,4 @@
org.junit.runners.model,
org.junit.runner,
org.eclipse.jgit.util.time",
- org.eclipse.jgit.junit.time;version="6.7.1";uses:="org.eclipse.jgit.util.time"
+ org.eclipse.jgit.junit.time;version="6.8.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 9855442..7e2bbd0 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-Name: org.eclipse.jgit.junit - Sources
Bundle-SymbolicName: org.eclipse.jgit.junit.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.junit;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.junit/plugin.properties b/org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.junit/plugin.properties
rename to org.eclipse.jgit.junit/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.junit/build.properties b/org.eclipse.jgit.junit/build.properties
index aa1a008..931e163 100644
--- a/org.eclipse.jgit.junit/build.properties
+++ b/org.eclipse.jgit.junit/build.properties
@@ -1,5 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
- plugin.properties
+ OSGI-INF/,\
+ .
diff --git a/org.eclipse.jgit.junit/pom.xml b/org.eclipse.jgit.junit/pom.xml
index 620325b..606a5a6 100644
--- a/org.eclipse.jgit.junit/pom.xml
+++ b/org.eclipse.jgit.junit/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.junit</artifactId>
@@ -72,7 +72,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/Assert.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/Assert.java
index 9671378..6e0a8c7 100644
--- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/Assert.java
+++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/Assert.java
@@ -9,8 +9,6 @@
*/
package org.eclipse.jgit.junit;
-import static java.lang.Boolean.valueOf;
-
/**
* Assertion class
*/
@@ -25,7 +23,8 @@ public class Assert {
* actual value
*/
public static void assertEquals(boolean expect, boolean actual) {
- org.junit.Assert.assertEquals(valueOf(expect), valueOf(actual));
+ org.junit.Assert.assertEquals(Boolean.valueOf(expect),
+ Boolean.valueOf(actual));
}
/**
@@ -41,6 +40,7 @@ public static void assertEquals(boolean expect, boolean actual) {
public static void assertEquals(String message, boolean expect,
boolean actual) {
org.junit.Assert
- .assertEquals(message, valueOf(expect), valueOf(actual));
+ .assertEquals(message, Boolean.valueOf(expect),
+ Boolean.valueOf(actual));
}
}
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 f816158..407290a 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,7 +20,6 @@
import java.io.IOException;
import java.io.PrintStream;
import java.time.Instant;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -28,10 +27,12 @@
import java.util.Map;
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;
@@ -114,7 +115,7 @@ private String getTestName() {
@Before
public void setUp() throws Exception {
tmp = File.createTempFile("jgit_" + getTestName() + '_', "_tmp");
- CleanupThread.deleteOnShutdown(tmp);
+ Cleanup.deleteOnShutdown(tmp);
if (!tmp.delete() || !tmp.mkdir()) {
throw new IOException("Cannot create " + tmp);
}
@@ -222,7 +223,7 @@ public void tearDown() throws Exception {
recursiveDelete(tmp, false, true);
}
if (tmp != null && !tmp.exists()) {
- CleanupThread.removed(tmp);
+ Cleanup.removed(tmp);
}
SystemReader.setInstance(null);
}
@@ -623,29 +624,28 @@ private static HashMap<String, String> cloneEnv() {
return new HashMap<>(System.getenv());
}
- private static final class CleanupThread extends Thread {
- private static final CleanupThread me;
+ private static final class Cleanup {
+ private static final Cleanup INSTANCE = new Cleanup();
+
static {
- me = new CleanupThread();
- Runtime.getRuntime().addShutdownHook(me);
+ ShutdownHook.INSTANCE.register(() -> INSTANCE.onShutdown());
+ }
+
+ private final Set<File> toDelete = ConcurrentHashMap.newKeySet();
+
+ private Cleanup() {
+ // empty
}
static void deleteOnShutdown(File tmp) {
- synchronized (me) {
- me.toDelete.add(tmp);
- }
+ INSTANCE.toDelete.add(tmp);
}
static void removed(File tmp) {
- synchronized (me) {
- me.toDelete.remove(tmp);
- }
+ INSTANCE.toDelete.remove(tmp);
}
- private final List<File> toDelete = new ArrayList<>();
-
- @Override
- public void run() {
+ 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
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 4dbfc59..419fdb1 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
@@ -302,7 +302,7 @@ private void resetOsNames() {
field.setAccessible(true);
field.set(null, null);
} catch (Exception e) {
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
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 4b45535..a2e0a57 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
@@ -20,6 +20,7 @@
import java.io.IOException;
import java.io.OutputStream;
import java.security.MessageDigest;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -202,6 +203,16 @@ public Date getDate() {
}
/**
+ * Get instant
+ *
+ * @return current instant.
+ * @since 6.8
+ */
+ public Instant getInstant() {
+ return Instant.ofEpochMilli(mockSystemReader.getCurrentTime());
+ }
+
+ /**
* Get timezone
*
* @return timezone used for default identities.
@@ -1035,6 +1046,8 @@ public class BranchBuilder {
}
/**
+ * Create commit builder
+ *
* @return construct a new commit builder that updates this branch. If
* the branch already exists, the commit builder will have its
* first parent as the current commit and its tree will be
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 79f0677..d665852 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-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.server.test
Bundle-SymbolicName: org.eclipse.jgit.lfs.server.test
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -26,24 +26,24 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.server;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.server.fs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.test;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.server;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.test;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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 4592990..11e3706 100644
--- a/org.eclipse.jgit.lfs.server.test/pom.xml
+++ b/org.eclipse.jgit.lfs.server.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server.test</artifactId>
diff --git a/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
index 79d2947..5ad3cc1 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-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.server
Bundle-SymbolicName: org.eclipse.jgit.lfs.server
-Bundle-Version: 6.7.1.qualifier
-Bundle-Localization: plugin
+Bundle-Version: 6.8.1.qualifier
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs.server;version="6.7.1";
+Export-Package: org.eclipse.jgit.lfs.server;version="6.8.1";
uses:="javax.servlet.http,
org.eclipse.jgit.lfs.lib",
- org.eclipse.jgit.lfs.server.fs;version="6.7.1";
+ org.eclipse.jgit.lfs.server.fs;version="6.8.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.7.1";x-internal:=true,
- org.eclipse.jgit.lfs.server.s3;version="6.7.1";
+ org.eclipse.jgit.lfs.server.internal;version="6.8.1";x-internal:=true,
+ org.eclipse.jgit.lfs.server.s3;version="6.8.1";
uses:="org.eclipse.jgit.lfs.server,
org.eclipse.jgit.lfs.lib"
Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -24,15 +24,15 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http.apache;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)",
org.slf4j;version="[1.7.0,2.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 ed5b2e6..03c3d46 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-Name: org.eclipse.jgit.lfs.server - Sources
Bundle-SymbolicName: org.eclipse.jgit.lfs.server.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs.server;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs.server/plugin.properties b/org.eclipse.jgit.lfs.server/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.lfs.server/plugin.properties
rename to org.eclipse.jgit.lfs.server/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.lfs.server/build.properties b/org.eclipse.jgit.lfs.server/build.properties
index 8148271..b483ecd 100644
--- a/org.eclipse.jgit.lfs.server/build.properties
+++ b/org.eclipse.jgit.lfs.server/build.properties
@@ -2,6 +2,6 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
diff --git a/org.eclipse.jgit.lfs.server/pom.xml b/org.eclipse.jgit.lfs.server/pom.xml
index 74d3ae8..f7cd017 100644
--- a/org.eclipse.jgit.lfs.server/pom.xml
+++ b/org.eclipse.jgit.lfs.server/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.server</artifactId>
@@ -91,7 +91,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java
index 6747b01..84bab5b 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/LfsProtocolServlet.java
@@ -140,6 +140,8 @@ public List<LfsObject> getObjects() {
}
/**
+ * Whether operation is upload
+ *
* @return true if the operation is upload.
* @since 4.7
*/
@@ -148,6 +150,8 @@ public boolean isUpload() {
}
/**
+ * Whether the operation is download
+ *
* @return true if the operation is download.
* @since 4.7
*/
@@ -156,6 +160,8 @@ public boolean isDownload() {
}
/**
+ * Whether the operation is verify
+ *
* @return true if the operation is verify.
* @since 4.7
*/
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
index d0b6d12..1605a78 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/Response.java
@@ -27,6 +27,8 @@ class Action {
public Map<String, String> header;
}
+ // TODO(ms): rename this class in next major release
+ @SuppressWarnings("JavaLangClash")
/** Describes an error to be returned by the LFS batch API */
class Error {
public int code;
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
index b569416..c7e4504 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsGson.java
@@ -30,6 +30,8 @@ public class LfsGson {
/**
* Wrapper class only used for serialization of error messages.
*/
+ // TODO(ms): rename this class in next major release
+ @SuppressWarnings("JavaLangClash")
static class Error {
String message;
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsServerText.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsServerText.java
index 56d59bb..47c778d 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsServerText.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/internal/LfsServerText.java
@@ -15,6 +15,7 @@
/**
* Translation bundle for JGit LFS server
*/
+@SuppressWarnings("MissingSummary")
public class LfsServerText extends TranslationBundle {
/**
diff --git a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/S3Config.java b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/S3Config.java
index 3942e22..9b44aeb 100644
--- a/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/S3Config.java
+++ b/org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/s3/S3Config.java
@@ -157,6 +157,8 @@ public int getExpirationSeconds() {
}
/**
+ * Whether SSL verification is disabled
+ *
* @return {@code true} if Amazon server certificate and hostname
* verification is disabled
*/
diff --git a/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs.test/META-INF/MANIFEST.MF
index a368244..939eb27 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-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs.test
Bundle-SymbolicName: org.eclipse.jgit.lfs.test
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.eclipse.jgit.api;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.attributes;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.dfs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+Import-Package: org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.attributes;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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.7.1";x-friends:="org.eclipse.jgit.lfs.server.test"
+Export-Package: org.eclipse.jgit.lfs.test;version="6.8.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 680e1ca..a0d8aa1f 100644
--- a/org.eclipse.jgit.lfs.test/pom.xml
+++ b/org.eclipse.jgit.lfs.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs.test</artifactId>
diff --git a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
index 436b177..4654b2d 100644
--- a/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.lfs/META-INF/MANIFEST.MF
@@ -3,32 +3,32 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.lfs
Bundle-SymbolicName: org.eclipse.jgit.lfs
-Bundle-Version: 6.7.1.qualifier
-Bundle-Localization: plugin
+Bundle-Version: 6.8.1.qualifier
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-Vendor: %Bundle-Vendor
-Export-Package: org.eclipse.jgit.lfs;version="6.7.1",
- org.eclipse.jgit.lfs.errors;version="6.7.1",
- org.eclipse.jgit.lfs.internal;version="6.7.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.7.1"
+Export-Package: org.eclipse.jgit.lfs;version="6.8.1",
+ org.eclipse.jgit.lfs.errors;version="6.8.1",
+ org.eclipse.jgit.lfs.internal;version="6.8.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.8.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.7.1,6.8.0)";resolution:=optional,
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.attributes;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.diff;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.dircache;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.hooks;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.pack;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.io;version="[6.7.1,6.8.0)"
+ org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)";resolution:=optional,
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.attributes;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.diff;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.dircache;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.hooks;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.pack;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.io;version="[6.8.1,6.9.0)"
diff --git a/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF b/org.eclipse.jgit.lfs/META-INF/SOURCE-MANIFEST.MF
index eca1e3a..605b52c 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-Name: org.eclipse.jgit.lfs - Sources
Bundle-SymbolicName: org.eclipse.jgit.lfs.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.lfs;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.lfs/plugin.properties b/org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.lfs/plugin.properties
rename to org.eclipse.jgit.lfs/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.lfs/build.properties b/org.eclipse.jgit.lfs/build.properties
index 8148271..b483ecd 100644
--- a/org.eclipse.jgit.lfs/build.properties
+++ b/org.eclipse.jgit.lfs/build.properties
@@ -2,6 +2,6 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
diff --git a/org.eclipse.jgit.lfs/pom.xml b/org.eclipse.jgit.lfs/pom.xml
index 16931f2..79c36d4 100644
--- a/org.eclipse.jgit.lfs/pom.xml
+++ b/org.eclipse.jgit.lfs/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.lfs</artifactId>
@@ -71,7 +71,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java
index afe9636..72aad9b 100644
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/LfsPointer.java
@@ -294,7 +294,7 @@ public boolean equals(Object obj) {
if (this == obj) {
return true;
}
- if (obj == null || getClass() != obj.getClass()) {
+ if (!(obj instanceof LfsPointer)) {
return false;
}
LfsPointer other = (LfsPointer) obj;
diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
index f9bd1ba..bcfd6e6 100644
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/Protocol.java
@@ -87,6 +87,8 @@ class ExpiringAction extends Action {
}
/** Describes an error to be returned by the LFS batch API */
+ // TODO(ms): rename this class in next major release
+ @SuppressWarnings("JavaLangClash")
class Error {
public int code;
@@ -129,6 +131,8 @@ class Error {
String OBJECTS_LFS_ENDPOINT = "/objects/batch"; //$NON-NLS-1$
/**
+ * Gson instance for handling this protocol
+ *
* @return a {@link Gson} instance suitable for handling this
* {@link Protocol}
*
diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java
index f9c623d..d7d8d63 100644
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsConnectionFactory.java
@@ -13,6 +13,7 @@
import static org.eclipse.jgit.util.HttpSupport.HDR_ACCEPT;
import static org.eclipse.jgit.util.HttpSupport.HDR_ACCEPT_ENCODING;
import static org.eclipse.jgit.util.HttpSupport.HDR_CONTENT_TYPE;
+import static org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME;
import java.io.IOException;
import java.net.ProxySelector;
@@ -128,8 +129,7 @@ private static String getLfsUrl(Repository db, String purpose,
// This could be done better (more precise logic), but according
// to https://github.com/git-lfs/git-lfs/issues/1759 git-lfs
// generally only supports 'origin' in an integrated workflow.
- if (lfsUrl == null && (remote.equals(
- org.eclipse.jgit.lib.Constants.DEFAULT_REMOTE_NAME))) {
+ if (lfsUrl == null && remote.equals(DEFAULT_REMOTE_NAME)) {
remoteUrl = config.getString(
ConfigConstants.CONFIG_KEY_REMOTE, remote,
ConfigConstants.CONFIG_KEY_URL);
@@ -253,6 +253,8 @@ private static String extractProjectName(URIish u) {
}
/**
+ * Create request that can be serialized to JSON
+ *
* @param operation
* the operation to perform, e.g. Protocol.OPERATION_DOWNLOAD
* @param resources
diff --git a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsText.java b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsText.java
index 8ef8f59..00b34ed 100644
--- a/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsText.java
+++ b/org.eclipse.jgit.lfs/src/org/eclipse/jgit/lfs/internal/LfsText.java
@@ -15,6 +15,7 @@
/**
* Translation bundle for JGit LFS server
*/
+@SuppressWarnings("MissingSummary")
public class LfsText extends TranslationBundle {
/**
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
index 848365e..95e2575 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
@@ -20,7 +20,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2005, 2020 Shawn Pearce, Robin Rosenberg, et.al.\n\
+Copyright (c) 2005, 2023 Shawn Pearce, Robin Rosenberg, et.al.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
which accompanies this distribution, and is available at\n\
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 1fce720..f443178 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 @@
<feature
id="org.eclipse.jgit"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
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 3d9949e..e3030b8 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.properties
index b14f0de..ec163af 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.gpg.bc.feature/feature.properties
@@ -20,7 +20,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2020 Matthias Sohn and others.\n\
+Copyright (c) 2020, 2023 Matthias Sohn and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
which accompanies this distribution, and is available at\n\
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 2291429..b67b91e 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 @@
<feature
id="org.eclipse.jgit.gpg.bc"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="6.7.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="6.8.1" match="equivalent"/>
</requires>
<plugin
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 bccaf7c..d5aea23 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.properties
index 782d5bf..a5dd944 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.http.apache.feature/feature.properties
@@ -20,7 +20,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2005, 2020 Shawn Pearce, Robin Rosenberg, et.al.\n\
+Copyright (c) 2005, 2023 Shawn Pearce, Robin Rosenberg, et.al.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
which accompanies this distribution, and is available at\n\
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 7c18420..05798c3 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 @@
<feature
id="org.eclipse.jgit.http.apache"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="6.7.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="6.8.1" match="equivalent"/>
</requires>
<plugin
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 af9b03d..f1999d7 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.properties
index fb1de80..d64f53e 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.junit.feature/feature.properties
@@ -20,7 +20,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2010, 2020 Matthias Sohn <matthias.sohn@sap.com>\n\
+Copyright (c) 2010, 2023 Matthias Sohn <matthias.sohn@sap.com>\n\
and other copyright owners as documented in the project's IP log.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
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 63aa2cc..321f233 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 @@
<feature
id="org.eclipse.jgit.junit"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -24,7 +24,7 @@
<requires>
<import plugin="com.jcraft.jsch"/>
- <import plugin="org.eclipse.jgit" version="6.7.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="6.8.1" match="equivalent"/>
</requires>
<plugin
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 df69320..47cdfb8 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties
index 858ba93..8b12baf 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.lfs.feature/feature.properties
@@ -20,7 +20,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2015, 2020 Matthias Sohn et.al.\n\
+Copyright (c) 2015, 2023 Matthias Sohn et.al.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
which accompanies this distribution, and is available at\n\
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 df3a3f1..0ece0d0 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 @@
<feature
id="org.eclipse.jgit.lfs"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="6.7.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="6.8.1" match="equivalent"/>
</requires>
<plugin
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 1a224ab..725ae80 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.properties
index 6c1405d..7aa5220 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.pgm.feature/feature.properties
@@ -20,7 +20,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2005, 2020 Shawn Pearce, Robin Rosenberg, et.al.\n\
+Copyright (c) 2005, 2023 Shawn Pearce, Robin Rosenberg, et.al.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
which accompanies this distribution, and is available at\n\
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 503e14d..facc8af 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 @@
<feature
id="org.eclipse.jgit.pgm"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -35,9 +35,9 @@
version="0.0.0"/>
<requires>
- <import feature="org.eclipse.jgit" version="6.7.1" match="equivalent"/>
- <import feature="org.eclipse.jgit.lfs" version="6.7.1" match="equivalent"/>
- <import feature="org.eclipse.jgit.ssh.apache" version="6.7.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="6.8.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit.lfs" version="6.8.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit.ssh.apache" version="6.8.1" match="equivalent"/>
</requires>
<plugin
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 37c30b3..0474e37 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 979dcae..6b0febb 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.repository</artifactId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.properties
index b8e0417..1a4f79e 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.source.feature/feature.properties
@@ -21,7 +21,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2005, 2020 Shawn Pearce, Robin Rosenberg, et.al.\n\
+Copyright (c) 2005, 2023 Shawn Pearce, Robin Rosenberg, et.al.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
which accompanies this distribution, and is available at\n\
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 2ba6d18..f75dde9 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 @@
<feature
id="org.eclipse.jgit.source"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="6.7.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="6.8.1" match="equivalent"/>
</requires>
<plugin
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 0d1e70f..9ec3f88 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.eclipse.jgit.feature</groupId>
<artifactId>org.eclipse.jgit</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.properties
index 8c38943..2042c70 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.apache.feature/feature.properties
@@ -20,7 +20,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2018, 2020 Thomas Wolf and others.\n\
+Copyright (c) 2018, 2023 Thomas Wolf and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
which accompanies this distribution, and is available at\n\
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 1faa07d..cae8d09 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 @@
<feature
id="org.eclipse.jgit.ssh.apache"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import feature="org.eclipse.jgit" version="6.7.1" match="equivalent"/>
+ <import feature="org.eclipse.jgit" version="6.8.1" match="equivalent"/>
</requires>
<plugin
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 72b51fe..323e4fd 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.properties
index dc79b32..b52d71f 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.ssh.jsch.feature/feature.properties
@@ -20,7 +20,7 @@
# "copyright" property - text of the "Feature Update Copyright"
copyright=\
-Copyright (c) 2020 Matthias Sohn and others.\n\
+Copyright (c) 2020, 2023 Matthias Sohn and others.\n\
All rights reserved. This program and the accompanying materials\n\
are made available under the terms of the Eclipse Distribution License v1.0\n\
which accompanies this distribution, and is available at\n\
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 305b969..12e8e41 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 @@
<feature
id="org.eclipse.jgit.ssh.jsch"
label="%featureName"
- version="6.7.1.qualifier"
+ version="6.8.1.qualifier"
provider-name="%providerName">
<description url="http://www.eclipse.org/jgit/">
@@ -23,7 +23,7 @@
</url>
<requires>
- <import plugin="org.eclipse.jgit" version="6.7.1" match="equivalent"/>
+ <import plugin="org.eclipse.jgit" version="6.8.1" match="equivalent"/>
</requires>
<plugin
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 a1c7c23..d3d8b80 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.jgit.feature</groupId>
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 5e3aacb..7017b9e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: JGit Target Platform Bundle
Bundle-SymbolicName: org.eclipse.jgit.target
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
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 3e515c5..4879c3a 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.17" sequenceNumber="1693839266">
+<target name="jgit-4.17" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index 074ba5c..b3ff205 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.17" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2020-09/" {
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 c7ac6e7..62b6743 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.18" sequenceNumber="1693839266">
+<target name="jgit-4.18" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index 79028fe..719476a 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.18" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2020-12/" {
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 1a90799..269334b 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.19-staging" sequenceNumber="1693839266">
+<target name="jgit-4.19-staging" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index 3fb1e19..9eb4436 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.19-staging" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2021-03/" {
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 8b10aa2..dab00e8 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.20" sequenceNumber="1693839266">
+<target name="jgit-4.20" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index ebc7857..264c040 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.20" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2021-06/" {
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 733f608..2c9689f 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.21" sequenceNumber="1693839266">
+<target name="jgit-4.21" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index 126438d..5c7a112 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.21" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2021-09/" {
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 f241937..adf6fb1 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.22" sequenceNumber="1693839266">
+<target name="jgit-4.22" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index f258eee..ecc776e 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.22" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2021-12/" {
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 3468e11..5907d7f 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.23" sequenceNumber="1693839266">
+<target name="jgit-4.23" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index 5bdffae..16efb40 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.23" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2022-03/" {
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 2c1d961..9df673c 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.24" sequenceNumber="1693839266">
+<target name="jgit-4.24" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index cd61ee0..d0f8e8d 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.24" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2022-06/" {
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 ed3cd4d..d9c55b6 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.25" sequenceNumber="1693839266">
+<target name="jgit-4.25" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index c7f1591..be37c10 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.25" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2022-09/" {
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 cfd906f..02fa46f 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.26" sequenceNumber="1693839266">
+<target name="jgit-4.26" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index 6d2fea1..e269919 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.26" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2022-12/" {
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 0e63b9f..3579da4 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.27" sequenceNumber="1693839266">
+<target name="jgit-4.27" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index c359ccd..b67718a 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.27" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2023-03/" {
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 4d7d67f..1900424 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.28" sequenceNumber="1693839266">
+<target name="jgit-4.28" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index 814b121..1a9a22a 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.28" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2023-06" {
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 1fcfdbc..8c7c1ac 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,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="jgit-4.29" sequenceNumber="1693839266">
+<target name="jgit-4.29" sequenceNumber="1701211970">
<locations>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
- <unit id="com.jcraft.jsch" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jsch.source" version="0.1.55.v20221112-0806"/>
- <unit id="com.jcraft.jzlib" version="1.1.3.v20220502-1820"/>
- <unit id="com.jcraft.jzlib.source" version="1.1.3.v20220502-1820"/>
- <unit id="net.i2p.crypto.eddsa" version="0.3.0.v20220506-1020"/>
- <unit id="net.i2p.crypto.eddsa.source" version="0.3.0.v20220506-1020"/>
- <unit id="org.apache.ant" version="1.10.12.v20211102-1452"/>
- <unit id="org.apache.ant.source" version="1.10.12.v20211102-1452"/>
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
@@ -26,7 +26,7 @@
<unit id="org.objenesis.source" version="3.3.0"/>
<unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
<unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
- <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
</location>
<location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
<unit id="org.eclipse.osgi" version="0.0.0"/>
@@ -63,13 +63,13 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-osgi</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-sftp</artifactId>
- <version>2.10.0</version>
+ <version>2.11.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -105,43 +105,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-io</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-security</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util-ajax</artifactId>
- <version>10.0.15</version>
+ <version>10.0.18</version>
<type>jar</type>
</dependency>
<dependency>
@@ -187,13 +187,13 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
- <version>1.14.7</version>
+ <version>1.14.9</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -203,25 +203,25 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpg-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
- <version>1.76</version>
+ <version>1.77</version>
<type>jar</type>
</dependency>
</dependencies>
@@ -257,7 +257,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.23.0</version>
+ <version>1.25.0</version>
<type>jar</type>
</dependency>
<dependency>
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
index 3318e4f..4e34280 100644
--- 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
@@ -1,6 +1,6 @@
target "jgit-4.29" with source configurePhase
-include "orbit/orbit-4.29.tpd"
+include "orbit/orbit-4.30.tpd"
include "maven/dependencies.tpd"
location "https://download.eclipse.org/releases/2023-09" {
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
new file mode 100644
index 0000000..8fbc567
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.target
@@ -0,0 +1,272 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="jgit-4.30" sequenceNumber="1701211970">
+ <locations>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+ <unit id="com.jcraft.jsch" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jsch.source" version="0.1.55.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib" version="1.1.3.v20230916-1400"/>
+ <unit id="com.jcraft.jzlib.source" version="1.1.3.v20230916-1400"/>
+ <unit id="net.i2p.crypto.eddsa" version="0.3.0"/>
+ <unit id="net.i2p.crypto.eddsa.source" version="0.3.0"/>
+ <unit id="org.apache.ant" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.ant.source" version="1.10.14.v20230922-1200"/>
+ <unit id="org.apache.httpcomponents.httpclient" version="4.5.14"/>
+ <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.14"/>
+ <unit id="org.apache.httpcomponents.httpcore" version="4.4.16"/>
+ <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.16"/>
+ <unit id="org.hamcrest.core" version="1.3.0.v20230809-1000"/>
+ <unit id="org.hamcrest.core.source" version="1.3.0.v20230809-1000"/>
+ <unit id="org.hamcrest.library" version="1.3.0.v20230809-1000"/>
+ <unit id="org.hamcrest.library.source" version="1.3.0.v20230809-1000"/>
+ <unit id="org.junit" version="4.13.2.v20230809-1000"/>
+ <unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
+ <unit id="org.objenesis" version="3.3.0"/>
+ <unit id="org.objenesis.source" version="3.3.0"/>
+ <unit id="org.osgi.service.cm" version="1.6.1.202109301733"/>
+ <unit id="org.osgi.service.cm.source" version="1.6.1.202109301733"/>
+ <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-12"/>
+ </location>
+ <location includeMode="slicer" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+ <unit id="org.eclipse.osgi" version="0.0.0"/>
+ <repository location="https://download.eclipse.org/staging/2023-12/"/>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="xz">
+ <dependencies>
+ <dependency>
+ <groupId>org.tukaani</groupId>
+ <artifactId>xz</artifactId>
+ <version>1.9</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="slf4j">
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.36</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.7.36</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="sshd">
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-osgi</artifactId>
+ <version>2.11.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-sftp</artifactId>
+ <version>2.11.0</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="mockito">
+ <dependencies>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>5.7.0</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jna">
+ <dependencies>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna</artifactId>
+ <version>5.13.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>net.java.dev.jna</groupId>
+ <artifactId>jna-platform</artifactId>
+ <version>5.13.0</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="jetty">
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>10.0.18</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>10.0.18</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>10.0.18</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>10.0.18</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>10.0.18</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>10.0.18</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util-ajax</artifactId>
+ <version>10.0.18</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>4.0.4</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="javaewah">
+ <dependencies>
+ <dependency>
+ <groupId>com.googlecode.javaewah</groupId>
+ <artifactId>JavaEWAH</artifactId>
+ <version>1.2.3</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="hamcrest">
+ <dependencies>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
+ <version>2.2</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="gson">
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.10.1</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bytebuddy">
+ <dependencies>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>1.14.9</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <version>1.14.9</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="bouncycastle">
+ <dependencies>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpg-jdk18on</artifactId>
+ <version>1.77</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk18on</artifactId>
+ <version>1.77</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>1.77</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcutil-jdk18on</artifactId>
+ <version>1.77</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="assertj">
+ <dependencies>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>3.24.2</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="args4j">
+ <dependencies>
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>2.33</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="error" type="Maven" label="apache">
+ <dependencies>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.16.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.25.0</version>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ </dependency>
+ </dependencies>
+ </location>
+ </locations>
+</target>
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
new file mode 100644
index 0000000..dfb4474
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.30.tpd
@@ -0,0 +1,8 @@
+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/maven/dependencies.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/maven/dependencies.tpd
index ec4adf9..10d707f 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 @@
dependency {
groupId = "org.apache.commons"
artifactId = "commons-compress"
- version = "1.23.0"
+ version = "1.25.0"
}
dependency {
groupId = "commons-logging"
@@ -59,22 +59,22 @@
dependency {
groupId = "org.bouncycastle"
artifactId = "bcpg-jdk18on"
- version = "1.76"
+ version = "1.77"
}
dependency {
groupId = "org.bouncycastle"
artifactId = "bcprov-jdk18on"
- version = "1.76"
+ version = "1.77"
}
dependency {
groupId = "org.bouncycastle"
artifactId = "bcpkix-jdk18on"
- version = "1.76"
+ version = "1.77"
}
dependency {
groupId = "org.bouncycastle"
artifactId = "bcutil-jdk18on"
- version = "1.76"
+ version = "1.77"
}
}
@@ -87,12 +87,12 @@
dependency {
groupId = "net.bytebuddy"
artifactId = "byte-buddy"
- version = "1.14.7"
+ version = "1.14.9"
}
dependency {
groupId = "net.bytebuddy"
artifactId = "byte-buddy-agent"
- version = "1.14.7"
+ version = "1.14.9"
}
}
@@ -144,37 +144,37 @@
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-http"
- version = "10.0.15"
+ version = "10.0.18"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-io"
- version = "10.0.15"
+ version = "10.0.18"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-security"
- version = "10.0.15"
+ version = "10.0.18"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-server"
- version = "10.0.15"
+ version = "10.0.18"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-servlet"
- version = "10.0.15"
+ version = "10.0.18"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-util"
- version = "10.0.15"
+ version = "10.0.18"
}
dependency {
groupId = "org.eclipse.jetty"
artifactId = "jetty-util-ajax"
- version = "10.0.15"
+ version = "10.0.18"
}
dependency {
groupId = "jakarta.servlet"
@@ -210,7 +210,7 @@
dependency {
groupId = "org.mockito"
artifactId = "mockito-core"
- version = "5.5.0"
+ version = "5.7.0"
}
}
@@ -223,12 +223,12 @@
dependency {
groupId = "org.apache.sshd"
artifactId = "sshd-osgi"
- version = "2.10.0"
+ version = "2.11.0"
}
dependency {
groupId = "org.apache.sshd"
artifactId = "sshd-sftp"
- version = "2.10.0"
+ version = "2.11.0"
}
}
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
new file mode 100644
index 0000000..0554a85
--- /dev/null
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/orbit-4.30.tpd
@@ -0,0 +1,27 @@
+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/pom.xml b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/pom.xml
index 666bca4..4e2d990 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 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.target</artifactId>
diff --git a/org.eclipse.jgit.packaging/pom.xml b/org.eclipse.jgit.packaging/pom.xml
index e014297..03469db 100644
--- a/org.eclipse.jgit.packaging/pom.xml
+++ b/org.eclipse.jgit.packaging/pom.xml
@@ -16,15 +16,23 @@
<groupId>org.eclipse.jgit</groupId>
<artifactId>jgit.tycho.parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JGit Tycho Parent</name>
+ <licenses>
+ <license>
+ <name>BSD-3-Clause</name>
+ <url>https://www.eclipse.org/org/documents/edl-v10.php</url>
+ </license>
+ </licenses>
+
<properties>
<java.version>11</java.version>
<tycho-version>4.0.8</tycho-version>
<target-platform>jgit-4.17</target-platform>
+ <project.build.outputTimestamp>${git.commit.time}</project.build.outputTimestamp>
</properties>
<pluginRepositories>
@@ -198,6 +206,55 @@
<resolver>p2</resolver>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.cyclonedx</groupId>
+ <artifactId>cyclonedx-maven-plugin</artifactId>
+ <version>2.7.9</version>
+ <configuration>
+ <projectType>library</projectType>
+ <schemaVersion>1.4</schemaVersion>
+ <includeBomSerialNumber>false</includeBomSerialNumber>
+ <includeCompileScope>true</includeCompileScope>
+ <includeProvidedScope>true</includeProvidedScope>
+ <includeRuntimeScope>true</includeRuntimeScope>
+ <includeSystemScope>true</includeSystemScope>
+ <includeTestScope>false</includeTestScope>
+ <includeLicenseText>false</includeLicenseText>
+ <outputReactorProjects>true</outputReactorProjects>
+ <outputFormat>json</outputFormat>
+ <outputName>cyclonedx</outputName>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <verbose>false</verbose>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>makeAggregateBom</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.github.git-commit-id</groupId>
+ <artifactId>git-commit-id-maven-plugin</artifactId>
+ <version>6.0.0</version>
+ <executions>
+ <execution>
+ <id>get-the-git-infos</id>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ <phase>initialize</phase>
+ </execution>
+ </executions>
+ <configuration>
+ <generateGitPropertiesFile>false</generateGitPropertiesFile>
+ <injectAllReactorProjects>true</injectAllReactorProjects>
+ <dateFormat>yyyy-MM-dd'T'HH:mm:ss'Z'</dateFormat>
+ <dateFormatTimeZone>UTC</dateFormatTimeZone>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -219,6 +276,30 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.3.0</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Implementation-Title>JGit ${project.artifactId}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Implementation-Vendor>Eclipse.org - JGit</Implementation-Vendor>
+ <Implementation-Vendor-Id>org.eclipse.jgit</Implementation-Vendor-Id>
+ <Implementation-Vendor-URL>${jgit-url}</Implementation-Vendor-URL>
+ <git-describe>${git.commit.id.describe}</git-describe>
+ <git-commit-id>${git.commit.id}</git-commit-id>
+ <git-commit-time>${git.commit.time}</git-commit-time>
+ <git-tags>${git.tags}</git-tags>
+ <git-remote-origin-url>${git.remote.origin.url}</git-remote-origin-url>
+ </manifestEntries>
+ </archive>
+ <!-- TODO: uncomment this in order to skip empty artifact of test modules as soon as bug 416299 is fixed
+ <skipIfEmpty>true</skipIfEmpty>
+ -->
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
@@ -281,6 +362,22 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-packaging-plugin</artifactId>
<version>${tycho-version}</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-buildtimestamp-jgit</artifactId>
+ <version>${tycho-version}</version>
+ </dependency>
+ </dependencies>
+ <configuration>
+ <timestampProvider>jgit</timestampProvider>
+ <jgit.ignore>
+ pom.xml
+ .polyglot.build.properties
+ target/
+ </jgit.ignore>
+ <format>yyyyMMddHHmm</format>
+ </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -316,6 +413,15 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.12.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-artifact-plugin</artifactId>
+ <version>3.5.0</version>
+ <configuration>
+ <ignore>**/*cyclonedx.json</ignore>
+ <reproducible>true</reproducible>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF
index dddf560..94c650a 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-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.pgm.test
Bundle-SymbolicName: org.eclipse.jgit.pgm.test
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Import-Package: org.eclipse.jgit.api;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.diff;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.dircache;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.diffmergetool;version="6.7.1",
- org.eclipse.jgit.internal.storage.file;version="6.7.1",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.merge;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.pgm;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.pgm.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.pgm.opt;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.io;version="[6.7.1,6.8.0)",
+Import-Package: org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.diff;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.dircache;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.diffmergetool;version="6.8.1",
+ org.eclipse.jgit.internal.storage.file;version="6.8.1",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.merge;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.pgm;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.pgm.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.pgm.opt;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.io;version="[6.8.1,6.9.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 b19a7be..c51d553 100644
--- a/org.eclipse.jgit.pgm.test/pom.xml
+++ b/org.eclipse.jgit.pgm.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm.test</artifactId>
diff --git a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
index 235c2fc..cc07eb4 100644
--- a/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.pgm/META-INF/MANIFEST.MF
@@ -3,9 +3,9 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.pgm
Bundle-SymbolicName: org.eclipse.jgit.pgm
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
org.apache.commons.logging;version="[1.2,2.0)",
@@ -14,49 +14,49 @@
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.7.1,6.8.0)",
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.archive;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.awtui;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.blame;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.diff;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.dircache;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.gitrepo;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.diffmergetool;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.io;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.pack;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.server;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.server.fs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs.server.s3;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.merge;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.notes;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revplot;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk.filter;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.pack;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http.apache;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.resolver;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.ssh.jsch;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.sshd;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.io;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.archive;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.awtui;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.blame;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.diff;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.dircache;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.gitrepo;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.diffmergetool;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.io;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.server;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.server.fs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs.server.s3;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.merge;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.notes;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revplot;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.pack;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http.apache;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.ssh.jsch;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.sshd;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.io;version="[6.8.1,6.9.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.7.1";
+Export-Package: org.eclipse.jgit.console;version="6.8.1";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util",
- org.eclipse.jgit.pgm;version="6.7.1";
+ org.eclipse.jgit.pgm;version="6.8.1";
uses:="org.eclipse.jgit.transport,
org.eclipse.jgit.util.io,
org.eclipse.jgit.awtui,
@@ -68,14 +68,14 @@
org.eclipse.jgit.treewalk,
org.eclipse.jgit.api,
javax.swing",
- org.eclipse.jgit.pgm.debug;version="6.7.1";
+ org.eclipse.jgit.pgm.debug;version="6.8.1";
uses:="org.eclipse.jgit.util.io,
org.eclipse.jgit.pgm,
org.eclipse.jetty.servlet",
- org.eclipse.jgit.pgm.internal;version="6.7.1";
+ org.eclipse.jgit.pgm.internal;version="6.8.1";
x-friends:="org.eclipse.jgit.pgm.test,
org.eclipse.jgit.test",
- org.eclipse.jgit.pgm.opt;version="6.7.1";
+ org.eclipse.jgit.pgm.opt;version="6.8.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 0755ae5..8a44aec 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-Name: org.eclipse.jgit.pgm - Sources
Bundle-SymbolicName: org.eclipse.jgit.pgm.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.pgm;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.pgm/plugin.properties b/org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.pgm/plugin.properties
rename to org.eclipse.jgit.pgm/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.pgm/build.properties b/org.eclipse.jgit.pgm/build.properties
index 302dded..ca8f30b 100644
--- a/org.eclipse.jgit.pgm/build.properties
+++ b/org.eclipse.jgit.pgm/build.properties
@@ -3,7 +3,7 @@
/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html,\
resources/simplelogger.properties
diff --git a/org.eclipse.jgit.pgm/pom.xml b/org.eclipse.jgit.pgm/pom.xml
index c1916ab..26b9d2a 100644
--- a/org.eclipse.jgit.pgm/pom.xml
+++ b/org.eclipse.jgit.pgm/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.pgm</artifactId>
@@ -205,7 +205,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true"/>
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}"/>
+ <replacefilter token=".qualifier" value=".${commit.time.version}"/>
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java
index 1115d2d..4440e26 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AbstractFetchCommand.java
@@ -14,8 +14,6 @@
package org.eclipse.jgit.pgm;
-import static java.lang.Character.valueOf;
-
import java.io.IOException;
import java.text.MessageFormat;
@@ -59,8 +57,8 @@ protected void showFetchResult(FetchResult r) throws IOException {
shownURI = true;
}
- outw.format(" %c %-17s %-10s -> %s", valueOf(type), longType, //$NON-NLS-1$
- src, dst);
+ outw.format(" %c %-17s %-10s -> %s", Character.valueOf(type), //$NON-NLS-1$
+ longType, src, dst);
outw.println();
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java
index 9c0915c..24a75a8 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/AmazonS3Client.java
@@ -11,8 +11,6 @@
package org.eclipse.jgit.pgm;
-import static java.lang.Integer.valueOf;
-
import java.io.EOFException;
import java.io.File;
import java.io.FileInputStream;
@@ -66,7 +64,7 @@ protected void run() throws Exception {
if (n < 0)
throw new EOFException(MessageFormat.format(
CLIText.get().expectedNumberOfbytes,
- valueOf(len)));
+ Integer.valueOf(len)));
outs.write(tmp, 0, n);
len -= n;
}
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 93d02c1..d2285ae 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
@@ -13,8 +13,6 @@
package org.eclipse.jgit.pgm;
-import static java.lang.Integer.valueOf;
-import static java.lang.Long.valueOf;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_ABBREV_STRING_LENGTH;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
@@ -197,13 +195,14 @@ && sameCommit(blame.getSourceCommit(line + 1), c)) {
maxSourceLine = Math.max(maxSourceLine, blame.getSourceLine(line));
}
- String pathFmt = MessageFormat.format(" %{0}s", valueOf(pathWidth)); //$NON-NLS-1$
+ String pathFmt = MessageFormat.format(" %{0}s", //$NON-NLS-1$
+ Integer.valueOf(pathWidth));
String numFmt = MessageFormat.format(" %{0}d", //$NON-NLS-1$
- valueOf(1 + (int) Math.log10(maxSourceLine + 1)));
+ Integer.valueOf(1 + (int) Math.log10(maxSourceLine + 1)));
String lineFmt = MessageFormat.format(" %{0}d) ", //$NON-NLS-1$
- valueOf(1 + (int) Math.log10(end + 1)));
+ Integer.valueOf(1 + (int) Math.log10(end + 1)));
String authorFmt = MessageFormat.format(" (%-{0}s %{1}s", //$NON-NLS-1$
- valueOf(authorWidth), valueOf(dateWidth));
+ Integer.valueOf(authorWidth), Integer.valueOf(dateWidth));
for (int line = begin; line < end;) {
RevCommit c = blame.getSourceCommit(line);
@@ -220,12 +219,13 @@ && sameCommit(blame.getSourceCommit(line + 1), c)) {
outw.format(pathFmt, path(line));
}
if (showSourceLine) {
- outw.format(numFmt, valueOf(blame.getSourceLine(line) + 1));
+ outw.format(numFmt,
+ Integer.valueOf(blame.getSourceLine(line) + 1));
}
if (!noAuthor) {
outw.format(authorFmt, author, date);
}
- outw.format(lineFmt, valueOf(line + 1));
+ outw.format(lineFmt, Integer.valueOf(line + 1));
outw.flush();
blame.getResultContents().writeLine(outs, line);
outs.flush();
@@ -339,7 +339,7 @@ private String date(int line) {
if (!showRawTimestamp)
return dateFmt.format(author.getWhen());
return String.format("%d %s", //$NON-NLS-1$
- valueOf(author.getWhen().getTime() / 1000L),
+ Long.valueOf(author.getWhen().getTime() / 1000L),
dateFmt.format(author.getWhen()));
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
index 61979d1..52665a1 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Diff.java
@@ -12,7 +12,6 @@
package org.eclipse.jgit.pgm;
-import static java.lang.Integer.valueOf;
import static org.eclipse.jgit.lib.Constants.HEAD;
import static org.eclipse.jgit.lib.Constants.OBJECT_ID_STRING_LENGTH;
@@ -228,13 +227,15 @@ static void nameStatus(ThrowingPrintWriter out, List<DiffEntry> files)
out.println("M\t" + ent.getNewPath()); //$NON-NLS-1$
break;
case COPY:
- out.format("C%1$03d\t%2$s\t%3$s", valueOf(ent.getScore()), // //$NON-NLS-1$
- ent.getOldPath(), ent.getNewPath());
+ out.format("C%1$03d\t%2$s\t%3$s", //$NON-NLS-1$
+ Integer.valueOf(ent.getScore()), ent.getOldPath(),
+ ent.getNewPath());
out.println();
break;
case RENAME:
- out.format("R%1$03d\t%2$s\t%3$s", valueOf(ent.getScore()), // //$NON-NLS-1$
- ent.getOldPath(), ent.getNewPath());
+ out.format("R%1$03d\t%2$s\t%3$s", //$NON-NLS-1$
+ Integer.valueOf(ent.getScore()), ent.getOldPath(),
+ ent.getNewPath());
out.println();
break;
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
index d059eff..8df9bad 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Main.java
@@ -355,8 +355,7 @@ static void configureHttpProxy() throws MalformedURLException {
continue;
}
- final URL u = new URL(
- (!s.contains("://")) ? protocol + "://" + s : s); //$NON-NLS-1$ //$NON-NLS-2$
+ URL u = new URL(!s.contains("://") ? protocol + "://" + s : s); //$NON-NLS-1$ //$NON-NLS-2$
if (!u.getProtocol().startsWith("http")) //$NON-NLS-1$
throw new MalformedURLException(MessageFormat.format(
CLIText.get().invalidHttpProxyOnlyHttpSupported, s));
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java
index a382fab..9d0b65c 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/MergeTool.java
@@ -41,7 +41,6 @@
import org.eclipse.jgit.errors.RevisionSyntaxException;
import org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool;
import org.eclipse.jgit.internal.diffmergetool.FileElement;
-import org.eclipse.jgit.internal.diffmergetool.FileElement.Type;
import org.eclipse.jgit.internal.diffmergetool.MergeTools;
import org.eclipse.jgit.internal.diffmergetool.ToolException;
import org.eclipse.jgit.lib.Constants;
@@ -218,8 +217,8 @@ private MergeResult mergeModified(String mergedFilePath, boolean showPrompt)
FileElement base = null;
FileElement local = null;
FileElement remote = null;
- FileElement merged = new FileElement(mergedFilePath, Type.MERGED,
- db.getWorkTree());
+ FileElement merged = new FileElement(mergedFilePath,
+ FileElement.Type.MERGED, db.getWorkTree());
DirCache cache = db.readDirCache();
try (RevWalk revWalk = new RevWalk(db);
TreeWalk treeWalk = new TreeWalk(db,
@@ -249,7 +248,8 @@ private MergeResult mergeModified(String mergedFilePath, boolean showPrompt)
ObjectId id = entry.getObjectId();
switch (entry.getStage()) {
case DirCacheEntry.STAGE_1:
- base = new FileElement(mergedFilePath, Type.BASE);
+ base = new FileElement(mergedFilePath,
+ FileElement.Type.BASE);
DirCacheCheckout.getContent(db, mergedFilePath,
checkoutMetadata,
baseSource.open(mergedFilePath, id), opt,
@@ -257,7 +257,8 @@ private MergeResult mergeModified(String mergedFilePath, boolean showPrompt)
base.createTempFile(tempFilesParent)));
break;
case DirCacheEntry.STAGE_2:
- local = new FileElement(mergedFilePath, Type.LOCAL);
+ local = new FileElement(mergedFilePath,
+ FileElement.Type.LOCAL);
DirCacheCheckout.getContent(db, mergedFilePath,
checkoutMetadata,
localSource.open(mergedFilePath, id), opt,
@@ -265,7 +266,8 @@ private MergeResult mergeModified(String mergedFilePath, boolean showPrompt)
local.createTempFile(tempFilesParent)));
break;
case DirCacheEntry.STAGE_3:
- remote = new FileElement(mergedFilePath, Type.REMOTE);
+ remote = new FileElement(mergedFilePath,
+ FileElement.Type.REMOTE);
DirCacheCheckout.getContent(db, mergedFilePath,
checkoutMetadata,
remoteSource.open(mergedFilePath, id), opt,
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
index 6535d95..b1a5daa 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Push.java
@@ -11,8 +11,6 @@
package org.eclipse.jgit.pgm;
-import static java.lang.Character.valueOf;
-
import java.io.IOException;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -233,7 +231,7 @@ private static String safeAbbreviate(ObjectReader reader, ObjectId id) {
private void printUpdateLine(final char flag, final String summary,
final String srcRef, final String destRef, final String message)
throws IOException {
- outw.format(" %c %-17s", valueOf(flag), summary); //$NON-NLS-1$
+ outw.format(" %c %-17s", Character.valueOf(flag), summary); //$NON-NLS-1$
if (srcRef != null)
outw.format(" %s ->", abbreviateRef(srcRef, true)); //$NON-NLS-1$
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java
index 1ef39a1..c96e475 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/Status.java
@@ -226,7 +226,7 @@ private void printLongStatus(org.eclipse.jgit.api.Status status)
firstHeader = false;
}
int nbUntracked = untracked.size();
- if (nbUntracked > 0 && ("all".equals(untrackedFilesMode))) { //$NON-NLS-1$
+ if (nbUntracked > 0 && "all".equals(untrackedFilesMode)) { //$NON-NLS-1$
if (!firstHeader)
printSectionHeader(""); //$NON-NLS-1$
printSectionHeader(CLIText.get().untrackedFiles);
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java
index 67300dc..2bdca24 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/DiffAlgorithms.java
@@ -10,9 +10,6 @@
package org.eclipse.jgit.pgm.debug;
-import static java.lang.Integer.valueOf;
-import static java.lang.Long.valueOf;
-
import java.io.File;
import java.lang.management.ManagementFactory;
import java.lang.management.ThreadMXBean;
@@ -216,10 +213,10 @@ private void run(Repository repo) throws Exception {
outw.println(name + ": start at " + startId.name()); //$NON-NLS-1$
}
- outw.format(" %12d files, %8d commits\n", valueOf(files), //$NON-NLS-1$
- valueOf(commits));
- outw.format(" N=%10d min lines, %8d max lines\n", valueOf(minN), //$NON-NLS-1$
- valueOf(maxN));
+ outw.format(" %12d files, %8d commits\n", Long.valueOf(files), //$NON-NLS-1$
+ Integer.valueOf(commits));
+ outw.format(" N=%10d min lines, %8d max lines\n", //$NON-NLS-1$
+ Integer.valueOf(minN), Integer.valueOf(maxN));
outw.format("%-25s %12s ( %12s %12s )\n", //$NON-NLS-1$
"Algorithm", "Time(ns)", "Time(ns) on", "Time(ns) on"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
@@ -231,9 +228,9 @@ private void run(Repository repo) throws Exception {
for (Test test : all) {
outw.format("%-25s %12d ( %12d %12d )", // //$NON-NLS-1$
test.algorithm.name, //
- valueOf(test.runningTimeNanos), //
- valueOf(test.minN.runningTimeNanos), //
- valueOf(test.maxN.runningTimeNanos));
+ Long.valueOf(test.runningTimeNanos), //
+ Long.valueOf(test.minN.runningTimeNanos), //
+ Long.valueOf(test.maxN.runningTimeNanos));
outw.println();
}
outw.println();
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java
index 5188336..eec10c7 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/MakeCacheTree.java
@@ -11,8 +11,6 @@
package org.eclipse.jgit.pgm.debug;
-import static java.lang.Integer.valueOf;
-
import java.io.IOException;
import java.text.MessageFormat;
@@ -33,8 +31,8 @@ protected void run() throws Exception {
private void show(DirCacheTree tree) throws IOException {
outw.println(MessageFormat.format(CLIText.get().cacheTreePathInfo,
- tree.getPathString(), valueOf(tree.getEntrySpan()),
- valueOf(tree.getChildCount())));
+ tree.getPathString(), Integer.valueOf(tree.getEntrySpan()),
+ Integer.valueOf(tree.getChildCount())));
for (int i = 0; i < tree.getChildCount(); i++)
show(tree.getChild(i));
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java
index 6e0f915..3d20e01 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ReadDirCache.java
@@ -11,8 +11,6 @@
package org.eclipse.jgit.pgm.debug;
-import static java.lang.Long.valueOf;
-
import java.text.MessageFormat;
import org.eclipse.jgit.pgm.Command;
@@ -30,6 +28,6 @@ protected void run() throws Exception {
final long end = System.currentTimeMillis();
outw.print(" "); //$NON-NLS-1$
outw.println(MessageFormat.format(CLIText.get().averageMSPerRead,
- valueOf((end - start) / cnt)));
+ Long.valueOf((end - start) / cnt)));
}
}
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java
index 057d20b..da16b33 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCacheTree.java
@@ -11,8 +11,6 @@
package org.eclipse.jgit.pgm.debug;
-import static java.lang.Integer.valueOf;
-
import java.io.IOException;
import java.text.MessageFormat;
@@ -35,8 +33,8 @@ protected void run() throws Exception {
private void show(DirCacheTree tree) throws IOException {
outw.println(MessageFormat.format(CLIText.get().cacheTreePathInfo,
- tree.getPathString(), valueOf(tree.getEntrySpan()),
- valueOf(tree.getChildCount())));
+ tree.getPathString(), Integer.valueOf(tree.getEntrySpan()),
+ Integer.valueOf(tree.getChildCount())));
for (int i = 0; i < tree.getChildCount(); i++)
show(tree.getChild(i));
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java
index daea1fb..e46d703 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowCommands.java
@@ -50,7 +50,7 @@ protected void run() throws Exception {
}
enum Format {
- /** */
+ /** Get usage */
USAGE {
@Override
void print(ThrowingPrintWriter err, CommandRef c) throws IOException {
@@ -60,7 +60,7 @@ void print(ThrowingPrintWriter err, CommandRef c) throws IOException {
}
},
- /** */
+ /** Get implementation class name */
CLASSES {
@Override
void print(ThrowingPrintWriter err, CommandRef c) throws IOException {
@@ -68,7 +68,7 @@ void print(ThrowingPrintWriter err, CommandRef c) throws IOException {
}
},
- /** */
+ /** Get URL of implementation class */
URLS {
@Override
void print(ThrowingPrintWriter err, CommandRef c) throws IOException {
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowDirCache.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowDirCache.java
index 3633d88..96add0f 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowDirCache.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/ShowDirCache.java
@@ -13,8 +13,6 @@
package org.eclipse.jgit.pgm.debug;
-import static java.lang.Integer.valueOf;
-
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
@@ -49,7 +47,7 @@ protected void run() throws Exception {
final int stage = ent.getStage();
outw.print(mode);
- outw.format(" %6d", valueOf(len)); //$NON-NLS-1$
+ outw.format(" %6d", Integer.valueOf(len)); //$NON-NLS-1$
outw.print(' ');
if (millis) {
outw.print(mtime.toEpochMilli());
diff --git a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java
index d7d31bd..2ce1711 100644
--- a/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java
+++ b/org.eclipse.jgit.pgm/src/org/eclipse/jgit/pgm/debug/TextHashFunctions.java
@@ -10,9 +10,6 @@
package org.eclipse.jgit.pgm.debug;
-import static java.lang.Integer.valueOf;
-import static java.lang.Long.valueOf;
-
import java.io.File;
import java.lang.reflect.Field;
import java.security.MessageDigest;
@@ -313,8 +310,8 @@ private void run(Repository repo) throws Exception {
outw.println(name + ":"); //$NON-NLS-1$
}
outw.format(" %6d files; %5d avg. unique lines/file\n", //$NON-NLS-1$
- valueOf(fileCnt), //
- valueOf(lineCnt / fileCnt));
+ Long.valueOf(fileCnt), //
+ Long.valueOf(lineCnt / fileCnt));
outw.format("%-20s %-15s %9s\n", "Hash", "Fold", "Max Len"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
outw.println("-----------------------------------------------"); //$NON-NLS-1$
String lastHashName = null;
@@ -325,7 +322,7 @@ private void run(Repository repo) throws Exception {
outw.format("%-20s %-15s %9d\n", // //$NON-NLS-1$
hashName, //
fun.fold.name, //
- valueOf(fun.maxChainLength));
+ Integer.valueOf(fun.maxChainLength));
lastHashName = fun.hash.name;
}
outw.println();
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 d07268b..b5bf6d2 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
@@ -21,6 +21,7 @@
/**
* Translation bundle for JGit command line interface
*/
+@SuppressWarnings("MissingSummary")
public class CLIText extends TranslationBundle {
/**
* Formats text strings using {@code Localizable}.
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 fd3e977..1bb957e 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 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.agent;singleton:=true
-Bundle-Version: 6.7.1.qualifier
-Bundle-Localization: plugin
+Bundle-Version: 6.8.1.qualifier
+Bundle-Localization: OSGI-INF/l10n/agent
Bundle-Vendor: %Bundle-Vendor
-Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.7.1,6.8.0)"
+Fragment-Host: org.eclipse.jgit.ssh.apache;bundle-version="[6.8.1,6.9.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.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)"
+Import-Package: org.eclipse.jgit.transport.sshd;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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.7.1";x-internal:=true
+Export-Package: org.eclipse.jgit.internal.transport.sshd.agent.connector;version="6.8.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 79f4f05..5f4ea13 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-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.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache.agent;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties b/org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties
new file mode 100644
index 0000000..e6271dd
--- /dev/null
+++ b/org.eclipse.jgit.ssh.apache.agent/OSGI-INF/l10n/agent.properties
@@ -0,0 +1,2 @@
+Bundle-Name=JGit SSH agent client for Apache MINA sshd
+Bundle-Vendor=Eclipse JGit
diff --git a/org.eclipse.jgit.ssh.apache.agent/build.properties b/org.eclipse.jgit.ssh.apache.agent/build.properties
index 8148271..b483ecd 100644
--- a/org.eclipse.jgit.ssh.apache.agent/build.properties
+++ b/org.eclipse.jgit.ssh.apache.agent/build.properties
@@ -2,6 +2,6 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
diff --git a/org.eclipse.jgit.ssh.apache.agent/plugin.properties b/org.eclipse.jgit.ssh.apache.agent/plugin.properties
deleted file mode 100644
index 86df8f2..0000000
--- a/org.eclipse.jgit.ssh.apache.agent/plugin.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle-Name=JGit Unix SSH agent client for Apache MINA sshd
-Bundle-Vendor=Eclipse JGit
diff --git a/org.eclipse.jgit.ssh.apache.agent/pom.xml b/org.eclipse.jgit.ssh.apache.agent/pom.xml
index ef6262c..b08523f 100644
--- a/org.eclipse.jgit.ssh.apache.agent/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.agent/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache.agent</artifactId>
@@ -89,7 +89,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true" />
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}" />
+ <replacefilter token=".qualifier" value=".${commit.time.version}" />
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.ssh.apache.agent/src/org/eclipse/jgit/internal/transport/sshd/agent/connector/PageantLibrary.java b/org.eclipse.jgit.ssh.apache.agent/src/org/eclipse/jgit/internal/transport/sshd/agent/connector/PageantLibrary.java
index 9a30d80..abfbca4 100644
--- a/org.eclipse.jgit.ssh.apache.agent/src/org/eclipse/jgit/internal/transport/sshd/agent/connector/PageantLibrary.java
+++ b/org.eclipse.jgit.ssh.apache.agent/src/org/eclipse/jgit/internal/transport/sshd/agent/connector/PageantLibrary.java
@@ -137,7 +137,7 @@ public void close() throws IOException {
}
private Pointer init(CopyStruct c) {
- c.cbData = name.length + 1;
+ c.cbData = name.length + 1L;
c.lpData = new Memory(c.cbData);
c.lpData.write(0, name, 0, name.length);
c.lpData.setByte(name.length, (byte) 0);
diff --git a/org.eclipse.jgit.ssh.apache.agent/src/org/eclipse/jgit/internal/transport/sshd/agent/connector/Texts.java b/org.eclipse.jgit.ssh.apache.agent/src/org/eclipse/jgit/internal/transport/sshd/agent/connector/Texts.java
index f387c76..1fb5b9a 100644
--- a/org.eclipse.jgit.ssh.apache.agent/src/org/eclipse/jgit/internal/transport/sshd/agent/connector/Texts.java
+++ b/org.eclipse.jgit.ssh.apache.agent/src/org/eclipse/jgit/internal/transport/sshd/agent/connector/Texts.java
@@ -15,6 +15,7 @@
/**
* Externalized text messages for localization.
*/
+@SuppressWarnings("MissingSummary")
public final class Texts extends TranslationBundle {
/**
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 567c3fe..e9e5793 100644
--- a/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache.test/META-INF/MANIFEST.MF
@@ -3,35 +3,35 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.apache.test
Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.test
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.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: org.apache.sshd.client.config.hosts;version="[2.10.0,2.11.0)",
- org.apache.sshd.common;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.signature;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.net;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)",
- org.apache.sshd.core;version="[2.10.0,2.11.0)",
- org.apache.sshd.server;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.forward;version="[2.10.0,2.11.0)",
- org.eclipse.jgit.api;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit.ssh;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.sshd;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.sshd.agent;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+Import-Package: org.apache.sshd.client.config.hosts;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.signature;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.net;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)",
+ org.apache.sshd.core;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.forward;version="[2.11.0,2.12.0)",
+ org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit.ssh;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.sshd;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.sshd.agent;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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 bda4294..14b5160 100644
--- a/org.eclipse.jgit.ssh.apache.test/pom.xml
+++ b/org.eclipse.jgit.ssh.apache.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
index fa51dfb..98bc78e 100644
--- a/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.ssh.apache/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@
Automatic-Module-Name: org.eclipse.jgit.ssh.apache
Bundle-SymbolicName: org.eclipse.jgit.ssh.apache
Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/plugin
Bundle-ActivationPolicy: lazy
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.7.1";x-internal:=true;
+Export-Package: org.eclipse.jgit.internal.transport.sshd;version="6.8.1";x-internal:=true;
uses:="org.apache.sshd.client,
org.apache.sshd.client.auth,
org.apache.sshd.client.auth.keyboard,
@@ -23,76 +23,77 @@
org.apache.sshd.common.signature,
org.apache.sshd.common.util.buffer,
org.eclipse.jgit.transport",
- org.eclipse.jgit.internal.transport.sshd.agent;version="6.7.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.auth;version="6.7.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.pkcs11;version="6.7.1";x-internal:=true,
- org.eclipse.jgit.internal.transport.sshd.proxy;version="6.7.1";x-friends:="org.eclipse.jgit.ssh.apache.test",
- org.eclipse.jgit.transport.sshd;version="6.7.1";
+ org.eclipse.jgit.internal.transport.sshd.agent;version="6.8.1";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.auth;version="6.8.1";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.pkcs11;version="6.8.1";x-internal:=true,
+ org.eclipse.jgit.internal.transport.sshd.proxy;version="6.8.1";x-friends:="org.eclipse.jgit.ssh.apache.test",
+ org.eclipse.jgit.transport.sshd;version="6.8.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.7.1"
+ org.eclipse.jgit.transport.sshd.agent;version="6.8.1",
+ sun.security.x509
Import-Package: net.i2p.crypto.eddsa;version="[0.3.0,0.4.0)",
- org.apache.sshd.agent;version="[2.10.0,2.11.0)",
- org.apache.sshd.client;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.auth.keyboard;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.auth.password;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.auth.pubkey;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.channel;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.config.hosts;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.config.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.future;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.keyverifier;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.client.session.forward;version="[2.10.0,2.11.0)",
- org.apache.sshd.common;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.channel;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.compression;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys.loader;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.config.keys.u2f;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.digest;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.forward;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.future;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.helpers;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.io;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex.extension;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.kex.extension.parser;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.keyprovider;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.mac;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.random;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.session;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.session.helpers;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.signature;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.buffer;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.buffer.keys;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.closeable;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.io;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.io.der;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.io.functors;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.io.resource;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.logging;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.net;version="[2.10.0,2.11.0)",
- org.apache.sshd.common.util.security;version="[2.10.0,2.11.0)",
- org.apache.sshd.core;version="[2.10.0,2.11.0)",
- org.apache.sshd.server.auth;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp.client;version="[2.10.0,2.11.0)",
- org.apache.sshd.sftp.common;version="[2.10.0,2.11.0)",
- org.eclipse.jgit.annotations;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.fnmatch;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+ org.apache.sshd.agent;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.auth.keyboard;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.auth.password;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.auth.pubkey;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.channel;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.config.hosts;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.config.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.future;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.keyverifier;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.client.session.forward;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.channel;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.compression;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys.loader;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys.loader.openssh.kdf;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.config.keys.u2f;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.digest;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.forward;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.future;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.helpers;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.io;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex.extension;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.kex.extension.parser;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.keyprovider;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.mac;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.random;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.session;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.session.helpers;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.signature;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.buffer;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.buffer.keys;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.closeable;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.io;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.io.der;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.io.functors;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.io.resource;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.logging;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.net;version="[2.11.0,2.12.0)",
+ org.apache.sshd.common.util.security;version="[2.11.0,2.12.0)",
+ org.apache.sshd.core;version="[2.11.0,2.12.0)",
+ org.apache.sshd.server.auth;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp.client;version="[2.11.0,2.12.0)",
+ org.apache.sshd.sftp.common;version="[2.11.0,2.12.0)",
+ org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.fnmatch;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)",
org.slf4j;version="[1.7.0,2.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 7a432fa..3573437 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-Name: org.eclipse.jgit.ssh.apache - Sources
Bundle-SymbolicName: org.eclipse.jgit.ssh.apache.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.apache;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.apache/plugin.properties b/org.eclipse.jgit.ssh.apache/OSGI-INF/l10n/plugin.properties
similarity index 100%
rename from org.eclipse.jgit.ssh.apache/plugin.properties
rename to org.eclipse.jgit.ssh.apache/OSGI-INF/l10n/plugin.properties
diff --git a/org.eclipse.jgit.ssh.apache/build.properties b/org.eclipse.jgit.ssh.apache/build.properties
index 8148271..b483ecd 100644
--- a/org.eclipse.jgit.ssh.apache/build.properties
+++ b/org.eclipse.jgit.ssh.apache/build.properties
@@ -2,6 +2,6 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
diff --git a/org.eclipse.jgit.ssh.apache/pom.xml b/org.eclipse.jgit.ssh.apache/pom.xml
index 9702f55..58144f4 100644
--- a/org.eclipse.jgit.ssh.apache/pom.xml
+++ b/org.eclipse.jgit.ssh.apache/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.apache</artifactId>
@@ -102,7 +102,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true" />
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}" />
+ <replacefilter token=".qualifier" value=".${commit.time.version}" />
</replace>
</target>
</configuration>
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 34c73fc..05f04ac 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
@@ -15,6 +15,7 @@
/**
* Externalized text messages for localization.
*/
+@SuppressWarnings("MissingSummary")
public final class SshdText extends TranslationBundle {
/**
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 e5f884e..8866976 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
@@ -63,6 +63,7 @@ public BasicAuthentication(InetSocketAddress proxy, String initialUser,
this.password = convert(initialPassword);
}
+ @SuppressWarnings("ByteBufferBackingArray")
private byte[] convert(char[] pass) {
if (pass == null) {
return new byte[0];
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 35c9be0..2c3cbe5 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
@@ -244,11 +244,13 @@ public SshdSession getSession(URIish uri,
JGitSshClient.PREFERRED_AUTHENTICATIONS,
defaultAuths);
}
- try {
- jgitClient.setAttribute(JGitSshClient.HOME_DIRECTORY,
- home.getAbsoluteFile().toPath());
- } catch (SecurityException | InvalidPathException e) {
+ if (home != null) {
+ try {
+ jgitClient.setAttribute(JGitSshClient.HOME_DIRECTORY,
+ home.getAbsoluteFile().toPath());
+ } catch (SecurityException | InvalidPathException e) {
// Ignore
+ }
}
// Other things?
return client;
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
new file mode 100644
index 0000000..a84ee37
--- /dev/null
+++ b/org.eclipse.jgit.ssh.apache/src/sun/security/x509/README.md
@@ -0,0 +1,3 @@
+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/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch.test/META-INF/MANIFEST.MF
index 46f5899..582d5e6 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-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.ssh.jsch.test
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.test
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.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.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit.ssh;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.ssh.jsch;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit.ssh;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.ssh.jsch;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.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 9632a1a..51a9f30 100644
--- a/org.eclipse.jgit.ssh.jsch.test/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch.test/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.jsch.test</artifactId>
diff --git a/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF b/org.eclipse.jgit.ssh.jsch/META-INF/MANIFEST.MF
index 68b7f3f..2028c76 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-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.7.1,6.8.0)"
+Fragment-Host: org.eclipse.jgit;bundle-version="[6.8.1,6.9.0)"
Bundle-Vendor: %Bundle-Vendor
-Bundle-Localization: plugin
+Bundle-Localization: OSGI-INF/l10n/jsch
Bundle-ActivationPolicy: lazy
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.7.1"
+Export-Package: org.eclipse.jgit.transport.ssh.jsch;version="6.8.1"
Import-Package: com.jcraft.jsch;version="[0.1.37,0.2.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.io;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.io;version="[6.8.1,6.9.0)",
org.slf4j;version="[1.7.0,2.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 67cc394..797bca4 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-Name: org.eclipse.jgit.ssh.jsch - Sources
Bundle-SymbolicName: org.eclipse.jgit.ssh.jsch.source
Bundle-Vendor: Eclipse.org - JGit
-Bundle-Version: 6.7.1.qualifier
-Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.7.1.qualifier";roots="."
+Bundle-Version: 6.8.1.qualifier
+Eclipse-SourceBundle: org.eclipse.jgit.ssh.jsch;version="6.8.1.qualifier";roots="."
diff --git a/org.eclipse.jgit.ssh.jsch/plugin.properties b/org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties
similarity index 100%
rename from org.eclipse.jgit.ssh.jsch/plugin.properties
rename to org.eclipse.jgit.ssh.jsch/OSGI-INF/l10n/jsch.properties
diff --git a/org.eclipse.jgit.ssh.jsch/build.properties b/org.eclipse.jgit.ssh.jsch/build.properties
index 8148271..b483ecd 100644
--- a/org.eclipse.jgit.ssh.jsch/build.properties
+++ b/org.eclipse.jgit.ssh.jsch/build.properties
@@ -2,6 +2,6 @@
resources/
output.. = bin/
bin.includes = META-INF/,\
+ OSGI-INF/,\
.,\
- plugin.properties,\
about.html
diff --git a/org.eclipse.jgit.ssh.jsch/pom.xml b/org.eclipse.jgit.ssh.jsch/pom.xml
index 8962d84..1a100ea 100644
--- a/org.eclipse.jgit.ssh.jsch/pom.xml
+++ b/org.eclipse.jgit.ssh.jsch/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.ssh.jsch</artifactId>
@@ -83,7 +83,7 @@
<target>
<copy file="META-INF/SOURCE-MANIFEST.MF" tofile="${source-bundle-manifest}" overwrite="true" />
<replace file="${source-bundle-manifest}">
- <replacefilter token=".qualifier" value=".${maven.build.timestamp}" />
+ <replacefilter token=".qualifier" value=".${commit.time.version}" />
</replace>
</target>
</configuration>
diff --git a/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/internal/transport/ssh/jsch/JSchText.java b/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/internal/transport/ssh/jsch/JSchText.java
index c090cd7..d4f1584 100644
--- a/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/internal/transport/ssh/jsch/JSchText.java
+++ b/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/internal/transport/ssh/jsch/JSchText.java
@@ -15,6 +15,7 @@
/**
* Externalized text messages for localization.
*/
+@SuppressWarnings("MissingSummary")
public final class JSchText extends TranslationBundle {
/**
diff --git a/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/OpenSshConfig.java b/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/OpenSshConfig.java
index 087e546..7da2e98 100644
--- a/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/OpenSshConfig.java
+++ b/org.eclipse.jgit.ssh.jsch/src/org/eclipse/jgit/transport/ssh/jsch/OpenSshConfig.java
@@ -175,6 +175,8 @@ public Host() {
}
/**
+ * Get the value StrictHostKeyChecking property
+ *
* @return the value StrictHostKeyChecking property, the valid values
* are "yes" (unknown hosts are not accepted), "no" (unknown
* hosts are always accepted), and "ask" (user should be asked
@@ -185,6 +187,8 @@ public String getStrictHostKeyChecking() {
}
/**
+ * Get hostname
+ *
* @return the real IP address or host name to connect to; never null.
*/
public String getHostName() {
@@ -192,6 +196,8 @@ public String getHostName() {
}
/**
+ * Get port
+ *
* @return the real port number to connect to; never 0.
*/
public int getPort() {
@@ -199,6 +205,8 @@ public int getPort() {
}
/**
+ * Get identity file
+ *
* @return path of the private key file to use for authentication; null
* if the caller should use default authentication strategies.
*/
@@ -207,6 +215,8 @@ public File getIdentityFile() {
}
/**
+ * Get user
+ *
* @return the real user name to connect as; never null.
*/
public String getUser() {
@@ -214,6 +224,8 @@ public String getUser() {
}
/**
+ * Get preferred authentication methods
+ *
* @return the preferred authentication methods, separated by commas if
* more than one authentication method is preferred.
*/
@@ -222,6 +234,8 @@ public String getPreferredAuthentications() {
}
/**
+ * Whether batch mode is preferred
+ *
* @return true if batch (non-interactive) mode is preferred for this
* host connection.
*/
@@ -230,6 +244,8 @@ public boolean isBatchMode() {
}
/**
+ * Get connection attempts
+ *
* @return the number of tries (one per second) to connect before
* exiting. The argument must be an integer. This may be useful
* in scripts if the connection sometimes fails. The default is
diff --git a/org.eclipse.jgit.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
index f9ace51..8845014 100644
--- a/org.eclipse.jgit.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.jgit.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Automatic-Module-Name: org.eclipse.jgit.test
Bundle-SymbolicName: org.eclipse.jgit.test
-Bundle-Version: 6.7.1.qualifier
+Bundle-Version: 6.8.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -19,64 +19,64 @@
org.apache.commons.compress.compressors.gzip;version="[1.15.0,2.0)",
org.apache.commons.compress.compressors.xz;version="[1.15.0,2.0)",
org.assertj.core.api;version="[3.14.0,4.0.0)",
- org.eclipse.jgit.annotations;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.api;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.api.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.archive;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.attributes;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.awtui;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.blame;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.diff;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.dircache;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.errors;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.events;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.fnmatch;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.gitrepo;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.hooks;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.ignore;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.ignore.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.diff;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.diffmergetool;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.fsck;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.commitgraph;version="6.7.1",
- org.eclipse.jgit.internal.storage.dfs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.io;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.memory;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.pack;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.storage.reftable;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.transport.connectivity;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.transport.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.transport.parser;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.internal.transport.ssh;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.junit.time;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lfs;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.lib.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.logging;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.merge;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.nls;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.notes;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.patch;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.pgm;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.pgm.internal;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revplot;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.revwalk.filter;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.file;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.storage.pack;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.submodule;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.http;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.transport.resolver;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.treewalk.filter;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.io;version="[6.7.1,6.8.0)",
- org.eclipse.jgit.util.sha1;version="[6.7.1,6.8.0)",
+ org.eclipse.jgit.annotations;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.api.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.archive;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.attributes;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.awtui;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.blame;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.diff;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.dircache;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.errors;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.events;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.fnmatch;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.gitrepo;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.hooks;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.ignore;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.ignore.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.diff;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.diffmergetool;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.fsck;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.commitgraph;version="6.8.1",
+ org.eclipse.jgit.internal.storage.dfs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.io;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.memory;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.pack;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.storage.reftable;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.transport.connectivity;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.transport.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.transport.parser;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.internal.transport.ssh;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.junit.time;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lfs;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.lib.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.logging;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.merge;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.nls;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.notes;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.patch;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.pgm;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.pgm.internal;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revplot;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.revwalk.filter;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.file;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.storage.pack;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.submodule;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.http;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.transport.resolver;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.treewalk.filter;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.io;version="[6.8.1,6.9.0)",
+ org.eclipse.jgit.util.sha1;version="[6.8.1,6.9.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 490f089..2ff7b7e 100644
--- a/org.eclipse.jgit.test/pom.xml
+++ b/org.eclipse.jgit.test/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit-parent</artifactId>
- <version>6.7.1-SNAPSHOT</version>
+ <version>6.8.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jgit.test</artifactId>
@@ -73,7 +73,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
</dependency>
<dependency>
diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file.patch
new file mode 100644
index 0000000..64f2b00
--- /dev/null
+++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file.patch
@@ -0,0 +1,6 @@
+diff --git a/very_long_file b/very_long_file
+index 379a33cf2..72ef58f79 100644
+--- a/very_long_file
++++ b/very_long_file
+@@ -0,0 +999991,1 @@
++An added line towards the end of the file
\ No newline at end of file
diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PostImage b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PostImage
new file mode 100644
index 0000000..72ef58f
--- /dev/null
+++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/very_long_file_PostImage
@@ -0,0 +1,1000001 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219
+220
+221
+222
+223
+224
+225
+226
+227
+228
+229
+230
+231
+232
+233
+234
+235
+236
+237
+238
+239
+240
+241
+242
+243
+244
+245
+246
+247
+248
+249
+250
+251
+252
+253
+254
+255
+256
+257
+258
+259
+260
+261
+262
+263
+264
+265
+266
+267
+268
+269
+270
+271
+272
+273
+274
+275
+276
+277
+278
+279
+280
+281
+282
+283
+284
+285
+286
+287
+288
+289
+290
+291
+292
+293
+294
+295
+296
+297
+298
+299
+300
+301
+302
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354
+355
+356
+357
+358
+359
+360
+361
+362
+363
+364
+365
+366
+367
+368
+369
+370
+371
+372
+373
+374
+375
+376
+377
+378
+379
+380
+381
+382
+383
+384
+385
+386
+387
+388
+389
+390
+391
+392
+393
+394
+395
+396
+397
+398
+399
+400
+401
+402
+403
+404
+405
+406
+407
+408
+409
+410
+411
+412
+413
+414
+415
+416
+417
+418
+419
+420
+421
+422
+423
+424
+425
+426
+427
+428
+429
+430
+431
+432
+433
+434
+435
+436
+437
+438
+439
+440
+441
+442
+443
+444
+445
+446
+447
+448
+449
+450
+451
+452
+453
+454
+455
+456
+457
+458
+459
+460
+461
+462
+463
+464
+465
+466
+467
+468
+469
+470
+471
+472
+473
+474
+475
+476
+477
+478
+479
+480
+481
+482
+483
+484
+485
+486
+487
+488
+489
+490
+491
+492
+493
+494
+495
+496
+497
+498
+499
+500
+501
+502
+503
+504
+505
+506
+507
+508
+509
+510
+511
+512
+513
+514
+515
+516
+517
+518
+519
+520
+521
+522
+523
+524
+525
+526
+527
+528
+529
+530
+531
+532
+533
+534
+535
+536
+537
+538
+539
+540
+541
+542
+543
+544
+545
+546
+547
+548
+549
+550
+551
+552
+553
+554
+555
+556
+557
+558
+559
+560
+561
+562
+563
+564
+565
+566
+567
+568
+569
+570
+571
+572
+573
+574
+575
+576
+577
+578
+579
+580
+581
+582
+583
+584
+585
+586
+587
+588
+589
+590
+591
+592
+593
+594
+595
+596
+597
+598
+599
+600
+601
+602
+603
+604
+605
+606
+607
+608
+609
+610
+611
+612
+613
+614
+615
+616
+617
+618
+619
+620
+621
+622
+623
+624
+625
+626
+627
+628
+629
+630
+631
+632
+633
+634
+635
+636
+637
+638
+639
+640
+641
+642
+643
+644
+645
+646
+647
+648
+649
+650
+651
+652
+653
+654
+655
+656
+657
+658
+659
+660
+661
+662
+663
+664
+665
+666
+667
+668
+669
+670
+671
+672
+673
+674
+675
+676
+677
+678
+679
+680
+681
+682
+683
+684
+685
+686
+687
+688
+689
+690
+691
+692
+693
+694
+695
+696
+697
+698
+699
+700
+701
+702
+703
+704
+705
+706
+707
+708
+709
+710
+711
+712
+713
+714
+715
+716
+717
+718
+719
+720
+721
+722
+723
+724
+725
+726
+727
+728
+729
+730
+731
+732
+733
+734
+735
+736
+737
+738
+739
+740
+741
+742
+743
+744
+745
+746
+747
+748
+749
+750
+751
+752
+753
+754
+755
+756
+757
+758
+759
+760
+761
+762
+763
+764
+765
+766
+767
+768
+769
+770
+771
+772
+773
+774
+775
+776
+777
+778
+779
+780
+781
+782
+783
+784
+785
+786
+787
+788
+789
+790
+791
+792
+793
+794
+795
+796
+797
+798
+799
+800
+801
+802
+803
+804
+805
+806
+807
+808
+809
+810
+811
+812
+813
+814
+815
+816
+817
+818
+819
+820
+821
+822
+823
+824
+825
+826
+827
+828
+829
+830
+831
+832
+833
+834
+835
+836
+837
+838
+839
+840
+841
+842
+843
+844
+845
+846
+847
+848
+849
+850
+851
+852
+853
+854
+855
+856
+857
+858
+859
+860
+861
+862
+863
+864
+865
+866
+867
+868
+869
+870
+871
+872
+873
+874
+875
+876
+877
+878
+879
+880
+881
+882
+883
+884
+885
+886
+887
+888
+889
+890
+891
+892
+893
+894
+895
+896
+897
+898
+899
+900
+901
+902
+903
+904
+905
+906
+907
+908
+909
+910
+911
+912
+913
+914
+915
+916
+917
+918
+919
+920
+921
+922
+923
+924
+925
+926
+927
+928
+929
+930
+931
+932
+933
+934
+935
+936
+937
+938
+939
+940
+941
+942
+943
+944
+945
+946
+947
+948
+949
+950
+951
+952
+953
+954
+955
+956
+957
+958
+959
+960
+961
+962
+963
+964
+965
+966
+967
+968
+969
+970
+971
+972
+973
+974
+975
+976
+977
+978
+979
+980
+981
+982
+983
+984
+985
+986
+987
+988
+989
+990
+991
+992
+993
+994
+995
+996
+997
+998
+999
+1000
+1001
+1002
+1003
+1004
+1005
+1006
+1007
+1008
+1009
+1010
+1011
+1012
+1013
+1014
+1015
+1016
+1017
+1018
+1019
+1020
+1021
+1022
+1023
+1024
+1025
+1026
+1027
+1028
+1029
+1030
+1031
+1032
+1033
+1034
+1035
+1036
+1037
+1038
+1039
+1040
+1041
+1042
+1043
+1044
+1045
+1046
+1047
+1048
+1049
+1050
+1051
+1052
+1053
+1054
+1055
+1056
+1057
+1058
+1059
+1060
+1061
+1062
+1063
+1064
+1065
+1066
+1067
+1068
+1069
+1070
+1071
+1072
+1073
+1074
+1075
+1076
+1077
+1078
+1079
+1080
+1081
+1082
+1083
+1084
+1085
+1086
+1087
+1088
+1089
+1090
+1091
+1092
+1093
+1094
+1095
+1096
+1097
+1098
+1099
+1100
+1101
+1102
+1103
+1104
+1105
+1106
+1107
+1108
+1109
+1110
+1111
+1112
+1113
+1114
+1115
+1116
+1117
+1118
+1119
+1120
+1121
+1122
+1123
+1124
+1125
+1126
+1127
+1128
+1129
+1130
+1131
+1132
+1133
+1134
+1135
+1136
+1137
+1138
+1139
+1140
+1141
+1142
+1143
+1144
+1145
+1146
+1147
+1148
+1149
+1150
+1151
+1152
+1153
+1154
+1155
+1156
+1157
+1158
+1159
+1160
+1161
+1162
+1163
+1164
+1165
+1166
+1167
+1168
+1169
+1170
+1171
+1172
+1173
+1174
+1175
+1176
+1177
+1178
+1179
+1180
+1181
+1182
+1183
+1184
+1185
+1186
+1187
+1188
+1189
+1190
+1191
+1192
+1193
+1194
+1195
+1196
+1197
+1198
+1199
+1200
+1201
+1202
+1203
+1204
+1205
+1206
+1207
+1208
+1209
+1210
+1211
+1212
+1213
+1214
+1215
+1216
+1217
+1218
+1219
+1220
+1221
+1222
+1223
+1224
+1225
+1226
+1227
+1228
+1229
+1230
+1231
+1232
+1233
+1234
+1235
+1236
+1237
+1238
+1239
+1240
+1241
+1242
+1243
+1244
+1245
+1246
+1247
+1248
+1249
+1250
+1251
+1252
+1253
+1254
+1255
+1256
+1257
+1258
+1259
+1260
+1261
+1262
+1263
+1264
+1265
+1266
+1267
+1268
+1269
+1270
+1271
+1272
+1273
+1274
+1275
+1276
+1277
+1278
+1279
+1280
+1281
+1282
+1283
+1284
+1285
+1286
+1287
+1288
+1289
+1290
+1291
+1292
+1293
+1294
+1295
+1296
+1297
+1298
+1299
+1300
+1301
+1302
+1303
+1304
+1305
+1306
+1307
+1308
+1309
+1310
+1311
+1312
+1313
+1314
+1315
+1316
+1317
+1318
+1319
+1320
+1321
+1322
+1323
+1324
+1325
+1326
+1327
+1328
+1329
+1330
+1331
+1332
+1333
+1334
+1335
+1336
+1337
+1338
+1339
+1340
+1341
+1342
+1343
+1344
+1345
+1346
+1347
+1348
+1349
+1350
+1351
+1352
+1353
+1354
+1355
+1356
+1357
+1358
+1359
+1360
+1361
+1362
+1363
+1364
+1365
+1366
+1367
+1368
+1369
+1370
+1371
+1372
+1373
+1374
+1375
+1376
+1377
+1378
+1379
+1380
+1381
+1382
+1383
+1384
+1385
+1386
+1387
+1388
+1389
+1390
+1391
+1392
+1393
+1394
+1395
+1396
+1397
+1398
+1399
+1400
+1401
+1402
+1403
+1404
+1405
+1406
+1407
+1408
+1409
+1410
+1411
+1412
+1413
+1414
+1415
+1416
+1417
+1418
+1419
+1420
+1421
+1422
+1423
+1424
+1425
+1426
+1427
+1428
+1429
+1430
+1431
+1432
+1433
+1434
+1435
+1436
+1437
+1438
+1439
+1440
+1441
+1442
+1443
+1444
+1445
+1446
+1447
+1448
+1449
+1450
+1451
+1452
+1453
+1454
+1455
+1456
+1457
+1458
+1459
+1460
+1461
+1462
+1463
+1464
+1465
+1466
+1467
+1468
+1469
+1470
+1471
+1472
+1473
+1474
+1475
+1476
+1477
+1478
+1479
+1480
+1481
+1482
+1483
+1484
+1485
+1486
+1487
+1488
+1489
+1490
+1491
+1492
+1493
+1494
+1495
+1496
+1497
+1498
+1499
+1500
+1501
+1502
+1503
+1504
+1505
+1506
+1507
+1508
+1509
+1510
+1511
+1512
+1513
+1514
+1515
+1516
+1517
+1518
+1519
+1520
+1521
+1522
+1523
+1524
+1525
+1526
+1527
+1528
+1529
+1530
+1531
+1532
+1533
+1534
+1535
+1536
+1537
+1538
+1539
+1540
+1541
+1542
+1543
+1544
+1545
+1546
+1547
+1548
+1549
+1550
+1551
+1552
+1553
+1554
+1555
+1556
+1557
+1558
+1559
+1560
+1561
+1562
+1563
+1564
+1565
+1566
+1567
+1568
+1569
+1570
+1571
+1572
+1573
+1574
+1575
+1576
+1577
+1578
+1579
+1580
+1581
+1582
+1583
+1584
+1585
+1586
+1587
+1588
+1589
+1590
+1591
+1592
+1593
+1594
+1595
+1596
+1597
+1598
+1599
+1600
+1601
+1602
+1603
+1604
+1605
+1606
+1607
+1608
+1609
+1610
+1611
+1612
+1613
+1614
+1615
+1616
+1617
+1618
+1619
+1620
+1621
+1622
+1623
+1624
+1625
+1626
+1627
+1628
+1629
+1630
+1631
+1632
+1633
+1634
+1635
+1636
+1637
+1638
+1639
+1640
+1641
+1642
+1643
+1644
+1645
+1646
+1647
+1648
+1649
+1650
+1651
+1652
+1653
+1654
+1655
+1656
+1657
+1658
+1659
+1660
+1661
+1662
+1663
+1664
+1665
+1666
+1667
+1668
+1669
+1670
+1671
+1672
+1673
+1674
+1675
+1676
+1677
+1678
+1679
+1680
+1681
+1682
+1683
+1684
+1685
+1686
+1687
+1688
+1689
+1690
+1691
+1692
+1693
+1694
+1695
+1696
+1697
+1698
+1699
+1700
+1701
+1702
+1703
+1704
+1705
+1706
+1707
+1708
+1709
+1710
+1711
+1712
+1713
+1714
+1715
+1716
+1717
+1718
+1719
+1720
+1721
+1722
+1723
+1724
+1725
+1726
+1727
+1728
+1729
+1730
+1731
+1732
+1733
+1734
+1735
+1736
+1737
+1738
+1739
+1740
+1741
+1742
+1743
+1744
+1745
+1746
+1747
+1748
+1749
+1750
+1751
+1752
+1753
+1754
+1755
+1756
+1757
+1758
+1759
+1760
+1761
+1762
+1763
+1764
+1765
+1766
+1767
+1768
+1769
+1770
+1771
+1772
+1773
+1774
+1775
+1776
+1777
+1778
+1779
+1780
+1781
+1782
+1783
+1784
+1785
+1786
+1787
+1788
+1789
+1790
+1791
+1792
+1793
+1794
+1795
+1796
+1797
+1798
+1799
+1800
+1801
+1802
+1803
+1804
+1805
+1806
+1807
+1808
+1809
+1810
+1811
+1812
+1813
+1814
+1815
+1816
+1817
+1818
+1819
+1820
+1821
+1822
+1823
+1824
+1825
+1826
+1827
+1828
+1829
+1830
+1831
+1832
+1833
+1834
+1835
+1836
+1837
+1838
+1839
+1840
+1841
+1842
+1843
+1844
+1845
+1846
+1847
+1848
+1849
+1850
+1851
+1852
+1853
+1854
+1855
+1856
+1857
+1858
+1859
+1860
+1861
+1862
+1863
+1864
+1865
+1866
+1867
+1868
+1869
+1870
+1871
+1872
+1873
+1874
+1875
+1876
+1877
+1878
+1879
+1880
+1881
+1882
+1883
+1884
+1885
+1886
+1887
+1888
+1889
+1890
+1891
+1892
+1893
+1894
+1895
+1896
+1897
+1898
+1899
+1900
+1901
+1902
+1903
+1904
+1905
+1906
+1907
+1908
+1909
+1910
+1911
+1912
+1913
+1914
+1915
+1916
+1917
+1918
+1919
+1920
+1921
+1922
+1923
+1924
+1925
+1926
+1927
+1928
+1929
+1930
+1931
+1932
+1933
+1934
+1935
+1936
+1937
+1938
+1939
+1940
+1941
+1942
+1943
+1944
+1945
+1946
+1947
+1948
+1949
+1950
+1951
+1952
+1953
+1954
+1955
+1956
+1957
+1958
+1959
+1960
+1961
+1962
+1963
+1964
+1965
+1966
+1967
+1968
+1969
+1970
+1971
+1972
+1973
+1974
+1975
+1976
+1977
+1978
+1979
+1980
+1981
+1982
+1983
+1984
+1985
+1986
+1987
+1988
+1989
+1990
+1991
+1992
+1993
+1994
+1995
+1996
+1997
+1998
+1999
+2000
+2001
+2002
+2003
+2004
+2005
+2006
+2007
+2008
+2009
+2010
+2011
+2012
+2013
+2014
+2015
+2016
+2017
+2018
+2019
+2020
+2021
+2022
+2023
+2024
+2025
+2026
+2027
+2028
+2029
+2030
+2031
+2032
+2033
+2034
+2035
+2036
+2037
+2038
+2039
+2040
+2041
+2042
+2043
+2044
+2045
+2046
+2047
+2048
+2049
+2050
+2051
+2052
+2053
+2054
+2055
+2056
+2057
+2058
+2059
+2060
+2061
+2062
+2063
+2064
+2065
+2066
+2067
+2068
+2069
+2070
+2071
+2072
+2073
+2074
+2075
+2076
+2077
+2078
+2079
+2080
+2081
+2082
+2083
+2084
+2085
+2086
+2087
+2088
+2089
+2090
+2091
+2092
+2093
+2094
+2095
+2096
+2097
+2098
+2099
+2100
+2101
+2102
+2103
+2104
+2105
+2106
+2107
+2108
+2109
+2110
+2111
+2112
+2113
+2114
+2115
+2116
+2117
+2118
+2119
+2120
+2121
+2122
+2123
+2124
+2125
+2126
+2127
+2128
+2129
+2130
+2131
+2132
+2133
+2134
+2135
+2136
+2137
+2138
+2139
+2140
+2141
+2142
+2143
+2144
+2145
+2146
+2147
+2148
+2149
+2150
+2151
+2152
+2153
+2154
+2155
+2156
+2157
+2158
+2159
+2160
+2161
+2162
+2163
+2164
+2165
+2166
+2167
+2168
+2169
+2170
+2171
+2172
+2173
+2174
+2175
+2176
+2177
+2178
+2179
+2180
+2181
+2182
+2183
+2184
+2185
+2186
+2187
+2188
+2189
+2190
+2191
+2192
+2193
+2194
+2195
+2196
+2197
+2198
+2199
+2200
+2201
+2202
+2203
+2204
+2205
+2206
+2207
+2208
+2209
+2210
+2211
+2212
+2213
+2214
+2215
+2216
+2217
+2218
+2219
+2220
+2221
+2222
+2223
+2224
+2225
+2226
+2227
+2228
+2229
+2230
+2231
+2232
+2233
+2234
+2235
+2236
+2237
+2238
+2239
+2240
+2241
+2242
+2243
+2244
+2245
+2246
+2247
+2248
+2249
+2250
+2251
+2252
+2253
+2254
+2255
+2256
+2257
+2258
+2259
+2260
+2261
+2262
+2263
+2264
+2265
+2266
+2267
+2268
+2269
+2270
+2271
+2272
+2273
+2274
+2275
+2276
+2277
+2278
+2279
+2280
+2281
+2282
+2283
+2284
+2285
+2286
+2287
+2288
+2289
+2290
+2291
+2292
+2293
+2294
+2295
+2296
+2297
+2298
+2299
+2300
+2301
+2302
+2303
+2304
+2305
+2306
+2307
+2308
+2309
+2310
+2311
+2312
+2313
+2314
+2315
+2316
+2317
+2318
+2319
+2320
+2321
+2322
+2323
+2324
+2325
+2326
+2327
+2328
+2329
+2330
+2331
+2332
+2333
+2334
+2335
+2336
+2337
+2338
+2339
+2340
+2341
+2342
+2343
+2344
+2345
+2346
+2347
+2348
+2349
+2350
+2351
+2352
+2353
+2354
+2355
+2356
+2357
+2358
+2359
+2360
+2361
+2362
+2363
+2364
+2365
+2366
+2367
+2368
+2369
+2370
+2371
+2372
+2373
+2374
+2375
+2376
+2377
+2378
+2379
+2380
+2381
+2382
+2383
+2384
+2385
+2386
+2387
+2388
+2389
+2390
+2391
+2392
+2393
+2394
+2395
+2396
+2397
+2398
+2399
+2400
+2401
+2402
+2403
+2404
+2405
+2406
+2407
+2408
+2409
+2410
+2411
+2412
+2413
+2414
+2415
+2416
+2417
+2418
+2419
+2420
+2421
+2422
+2423
+2424
+2425
+2426
+2427
+2428
+2429
+2430
+2431
+2432
+2433
+2434
+2435
+2436
+2437
+2438
+2439
+2440
+2441
+2442
+2443
+2444
+2445
+2446
+2447
+2448
+2449
+2450
+2451
+2452
+2453
+2454
+2455
+2456
+2457
+2458
+2459
+2460
+2461
+2462
+2463
+2464
+2465
+2466
+2467
+2468
+2469
+2470
+2471
+2472
+2473
+2474
+2475
+2476
+2477
+2478
+2479
+2480
+2481
+2482
+2483
+2484
+2485
+2486
+2487
+2488
+2489
+2490
+2491
+2492
+2493
+2494
+2495
+2496
+2497
+2498
+2499
+2500
+2501
+2502
+2503
+2504
+2505
+2506
+2507
+2508
+2509
+2510
+2511
+2512
+2513
+2514
+2515
+2516
+2517
+2518
+2519
+2520
+2521
+2522
+2523
+2524
+2525
+2526
+2527
+2528
+2529
+2530
+2531
+2532
+2533
+2534
+2535
+2536
+2537
+2538
+2539
+2540
+2541
+2542
+2543
+2544
+2545
+2546
+2547
+2548
+2549
+2550
+2551
+2552
+2553
+2554
+2555
+2556
+2557
+2558
+2559
+2560
+2561
+2562
+2563
+2564
+2565
+2566
+2567
+2568
+2569
+2570
+2571
+2572
+2573
+2574
+2575
+2576
+2577
+2578
+2579
+2580
+2581
+2582
+2583
+2584
+2585
+2586
+2587
+2588
+2589
+2590
+2591
+2592
+2593
+2594
+2595
+2596
+2597
+2598
+2599
+2600
+2601
+2602
+2603
+2604
+2605
+2606
+2607
+2608
+2609
+2610
+2611
+2612
+2613
+2614
+2615
+2616
+2617
+2618
+2619
+2620
+2621
+2622
+2623
+2624
+2625
+2626
+2627
+2628
+2629
+2630
+2631
+2632
+2633
+2634
+2635
+2636
+2637
+2638
+2639
+2640
+2641
+2642
+2643
+2644
+2645
+2646
+2647
+2648
+2649
+2650
+2651
+2652
+2653
+2654
+2655
+2656
+2657
+2658
+2659
+2660
+2661
+2662
+2663
+2664
+2665
+2666
+2667
+2668
+2669
+2670
+2671
+2672
+2673
+2674
+2675
+2676
+2677
+2678
+2679
+2680
+2681
+2682
+2683
+2684
+2685
+2686
+2687
+2688
+2689
+2690
+2691
+2692
+2693
+2694
+2695
+2696
+2697
+2698
+2699
+2700
+2701
+2702
+2703
+2704
+2705
+2706
+2707
+2708
+2709
+2710
+2711
+2712
+2713
+2714
+2715
+2716
+2717
+2718
+2719
+2720
+2721
+2722
+2723
+2724
+2725
+2726
+2727
+2728
+2729
+2730
+2731
+2732
+2733
+2734
+2735
+2736
+2737
+2738
+2739
+2740
+2741
+2742
+2743
+2744
+2745
+2746
+2747
+2748
+2749
+2750
+2751
+2752
+2753
+2754
+2755
+2756
+2757
+2758
+2759
+2760
+2761
+2762
+2763
+2764
+2765
+2766
+2767
+2768
+2769
+2770
+2771
+2772
+2773
+2774
+2775
+2776
+2777
+2778
+2779
+2780
+2781
+2782
+2783
+2784
+2785
+2786
+2787
+2788
+2789
+2790
+2791
+2792
+2793
+2794
+2795
+2796
+2797
+2798
+2799
+2800
+2801
+2802
+2803
+2804
+2805
+2806
+2807
+2808
+2809
+2810
+2811
+2812
+2813
+2814
+2815
+2816
+2817
+2818
+2819
+2820
+2821
+2822
+2823
+2824
+2825
+2826
+2827
+2828
+2829
+2830
+2831
+2832
+2833
+2834
+2835
+2836
+2837
+2838
+2839
+2840
+2841
+2842
+2843
+2844
+2845
+2846
+2847
+2848
+2849
+2850
+2851
+2852
+2853
+2854
+2855
+2856
+2857
+2858
+2859
+2860
+2861
+2862
+2863
+2864
+2865
+2866
+2867
+2868
+2869
+2870
+2871
+2872
+2873
+2874
+2875
+2876
+2877
+2878
+2879
+2880
+2881
+2882
+2883
+2884
+2885
+2886
+2887
+2888
+2889
+2890
+2891
+2892
+2893
+2894
+2895
+2896
+2897
+2898
+2899
+2900
+2901
+2902
+2903
+2904
+2905
+2906
+2907
+2908
+2909
+2910
+2911
+2912
+2913
+2914
+2915
+2916
+2917
+2918
+2919
+2920
+2921
+2922
+2923
+2924
+2925
+2926
+2927
+2928
+2929
+2930
+2931
+2932
+2933
+2934
+2935
+2936
+2937
+2938
+2939
+2940
+2941
+2942
+2943
+2944
+2945
+2946
+2947
+2948
+2949
+2950
+2951
+2952
+2953
+2954
+2955
+2956
+2957
+2958
+2959
+2960
+2961
+2962
+2963
+2964
+2965
+2966
+2967
+2968
+2969
+2970
+2971
+2972
+2973
+2974
+2975
+2976
+2977
+2978
+2979
+2980
+2981
+2982
+2983
+2984
+2985
+2986
+2987
+2988
+2989
+2990
+2991
+2992
+2993
+2994
+2995
+2996
+2997
+2998
+2999
+3000
+3001
+3002
+3003
+3004
+3005
+3006
+3007
+3008
+3009
+3010
+3011
+3012
+3013
+3014
+3015
+3016
+3017
+3018
+3019
+3020
+3021
+3022
+3023
+3024
+3025
+3026
+3027
+3028
+3029
+3030
+3031
+3032
+3033
+3034
+3035
+3036
+3037
+3038
+3039
+3040
+3041
+3042
+3043
+3044
+3045
+3046
+3047
+3048
+3049
+3050
+3051
+3052
+3053
+3054
+3055
+3056
+3057
+3058
+3059
+3060
+3061
+3062
+3063
+3064
+3065
+3066
+3067
+3068
+3069
+3070
+3071
+3072
+3073
+3074
+3075
+3076
+3077
+3078
+3079
+3080
+3081
+3082
+3083
+3084
+3085
+3086
+3087
+3088
+3089
+3090
+3091
+3092
+3093
+3094
+3095
+3096
+3097
+3098
+3099
+3100
+3101
+3102
+3103
+3104
+3105
+3106
+3107
+3108
+3109
+3110
+3111
+3112
+3113
+3114
+3115
+3116
+3117
+3118
+3119
+3120
+3121
+3122
+3123
+3124
+3125
+3126
+3127
+3128
+3129
+3130
+3131
+3132
+3133
+3134
+3135
+3136
+3137
+3138
+3139
+3140
+3141
+3142
+3143
+3144
+3145
+3146
+3147
+3148
+3149
+3150
+3151
+3152
+3153
+3154
+3155
+3156
+3157
+3158
+3159
+3160
+3161
+3162
+3163
+3164
+3165
+3166
+3167
+3168
+3169
+3170
+3171
+3172
+3173
+3174
+3175
+3176
+3177
+3178
+3179
+3180
+3181
+3182
+3183
+3184
+3185
+3186
+3187
+3188
+3189
+3190
+3191
+3192
+3193
+3194
+3195
+3196
+3197
+3198
+3199
+3200
+3201
+3202
+3203
+3204
+3205
+3206
+3207
+3208
+3209
+3210
+3211
+3212
+3213
+3214
+3215
+3216
+3217
+3218
+3219
+3220
+3221
+3222
+3223
+3224
+3225
+3226
+3227
+3228
+3229
+3230
+3231
+3232
+3233
+3234
+3235
+3236
+3237
+3238
+3239
+3240
+3241
+3242
+3243
+3244
+3245
+3246
+3247
+3248
+3249
+3250
+3251
+3252
+3253
+3254
+3255
+3256
+3257
+3258
+3259
+3260
+3261
+3262
+3263
+3264
+3265
+3266
+3267
+3268
+3269
+3270
+3271
+3272
+3273
+3274
+3275
+3276
+3277
+3278
+3279
+3280
+3281
+3282
+3283
+3284
+3285
+3286
+3287
+3288
+3289
+3290
+3291
+3292
+3293
+3294
+3295
+3296
+3297
+3298
+3299
+3300
+3301
+3302
+3303
+3304
+3305
+3306
+3307
+3308
+3309
+3310
+3311
+3312
+3313
+3314
+3315
+3316
+3317
+3318
+3319
+3320
+3321
+3322
+3323
+3324
+3325
+3326
+3327
+3328
+3329
+3330
+3331
+3332
+3333
+3334
+3335
+3336
+3337
+3338
+3339
+3340
+3341
+3342
+3343
+3344
+3345
+3346
+3347
+3348
+3349
+3350
+3351
+3352
+3353
+3354
+3355
+3356
+3357
+3358
+3359
+3360
+3361
+3362
+3363
+3364
+3365
+3366
+3367
+3368
+3369
+3370
+3371
+3372
+3373
+3374
+3375
+3376
+3377
+3378
+3379
+3380
+3381
+3382
+3383
+3384
+3385
+3386
+3387
+3388
+3389
+3390
+3391
+3392
+3393
+3394
+3395
+3396
+3397
+3398
+3399
+3400
+3401
+3402
+3403
+3404
+3405
+3406
+3407
+3408
+3409
+3410
+3411
+3412
+3413
+3414
+3415
+3416
+3417
+3418
+3419
+3420
+3421
+3422
+3423
+3424
+3425
+3426
+3427
+3428
+3429
+3430
+3431
+3432
+3433
+3434
+3435
+3436
+3437
+3438
+3439
+3440
+3441
+3442
+3443
+3444
+3445
+3446
+3447
+3448
+3449
+3450
+3451
+3452
+3453
+3454
+3455
+3456
+3457
+3458
+3459
+3460
+3461
+3462
+3463
+3464
+3465
+3466
+3467
+3468
+3469
+3470
+3471
+3472
+3473
+3474
+3475
+3476
+3477
+3478
+3479
+3480
+3481
+3482
+3483
+3484
+3485
+3486
+3487
+3488
+3489
+3490
+3491
+3492
+3493
+3494
+3495
+3496
+3497
+3498
+3499
+3500
+3501
+3502
+3503
+3504
+3505
+3506
+3507
+3508
+3509
+3510
+3511
+3512
+3513
+3514
+3515
+3516
+3517
+3518
+3519
+3520
+3521
+3522
+3523
+3524
+3525
+3526
+3527
+3528
+3529
+3530
+3531
+3532
+3533
+3534
+3535
+3536
+3537
+3538
+3539
+3540
+3541
+3542
+3543
+3544
+3545
+3546
+3547
+3548
+3549
+3550
+3551
+3552
+3553
+3554
+3555
+3556
+3557
+3558
+3559
+3560
+3561
+3562
+3563
+3564
+3565
+3566
+3567
+3568
+3569
+3570
+3571
+3572
+3573
+3574
+3575
+3576
+3577
+3578
+3579
+3580
+3581
+3582
+3583
+3584
+3585
+3586
+3587
+3588
+3589
+3590
+3591
+3592
+3593
+3594
+3595
+3596
+3597
+3598
+3599
+3600
+3601
+3602
+3603
+3604
+3605
+3606
+3607
+3608
+3609
+3610
+3611
+3612
+3613
+3614
+3615
+3616
+3617
+3618
+3619
+3620
+3621
+3622
+3623
+3624
+3625
+3626
+3627
+3628
+3629
+3630
+3631
+3632
+3633
+3634
+3635
+3636
+3637
+3638
+3639
+3640
+3641
+3642
+3643
+3644
+3645
+3646
+3647
+3648
+3649
+3650
+3651
+3652
+3653
+3654
+3655
+3656
+3657
+3658
+3659
+3660
+3661
+3662
+3663
+3664
+3665
+3666
+3667
+3668
+3669
+3670
+3671
+3672
+3673
+3674
+3675
+3676
+3677
+3678
+3679
+3680
+3681
+3682
+3683
+3684
+3685
+3686
+3687
+3688
+3689
+3690
+3691
+3692
+3693
+3694
+3695
+3696
+3697
+3698
+3699
+3700
+3701
+3702
+3703
+3704
+3705
+3706
+3707
+3708
+3709
+3710
+3711
+3712
+3713
+3714
+3715
+3716
+3717
+3718
+3719
+3720
+3721
+3722
+3723
+3724
+3725
+3726
+3727
+3728
+3729
+3730
+3731
+3732
+3733
+3734
+3735
+3736
+3737
+3738
+3739
+3740
+3741
+3742
+3743
+3744
+3745
+3746
+3747
+3748
+3749
+3750
+3751
+3752
+3753
+3754
+3755
+3756
+3757
+3758
+3759
+3760
+3761
+3762
+3763
+3764
+3765
+3766
+3767
+3768
+3769
+3770
+3771
+3772
+3773
+3774
+3775
+3776
+3777
+3778
+3779
+3780
+3781
+3782
+3783
+3784
+3785
+3786
+3787
+3788
+3789
+3790
+3791
+3792
+3793
+3794
+3795
+3796
+3797
+3798
+3799
+3800
+3801
+3802
+3803
+3804
+3805
+3806
+3807
+3808
+3809
+3810
+3811
+3812
+3813
+3814
+3815
+3816
+3817
+3818
+3819
+3820
+3821
+3822
+3823
+3824
+3825
+3826
+3827
+3828
+3829
+3830
+3831
+3832
+3833
+3834
+3835
+3836
+3837
+3838
+3839
+3840
+3841
+3842
+3843
+3844
+3845
+3846
+3847
+3848
+3849
+3850
+3851
+3852
+3853
+3854
+3855
+3856
+3857
+3858
+3859
+3860
+3861
+3862
+3863
+3864
+3865
+3866
+3867
+3868
+3869
+3870
+3871
+3872
+3873
+3874
+3875
+3876
+3877
+3878
+3879
+3880
+3881
+3882
+3883
+3884
+3885
+3886
+3887
+3888
+3889
+3890
+3891
+3892
+3893
+3894
+3895
+3896
+3897
+3898
+3899
+3900
+3901
+3902
+3903
+3904
+3905
+3906
+3907
+3908
+3909
+3910
+3911
+3912
+3913
+3914
+3915
+3916
+3917
+3918
+3919
+3920
+3921
+3922
+3923
+3924
+3925
+3926
+3927
+3928
+3929
+3930
+3931
+3932
+3933
+3934
+3935
+3936
+3937
+3938
+3939
+3940
+3941
+3942
+3943
+3944
+3945
+3946
+3947
+3948
+3949
+3950
+3951
+3952
+3953
+3954
+3955
+3956
+3957
+3958
+3959
+3960
+3961
+3962
+3963
+3964
+3965
+3966
+3967
+3968
+3969
+3970
+3971
+3972
+3973
+3974
+3975
+3976
+3977
+3978
+3979
+3980
+3981
+3982
+3983
+3984
+3985
+3986
+3987
+3988
+3989
+3990
+3991
+3992
+3993
+3994
+3995
+3996
+3997
+3998
+3999
+4000
+4001
+4002
+4003
+4004
+4005
+4006
+4007
+4008
+4009
+4010
+4011
+4012
+4013
+4014
+4015
+4016
+4017
+4018
+4019
+4020
+4021
+4022
+4023
+4024
+4025
+4026
+4027
+4028
+4029
+4030
+4031
+4032
+4033
+4034
+4035
+4036
+4037
+4038
+4039
+4040
+4041
+4042
+4043
+4044
+4045
+4046
+4047
+4048
+4049
+4050
+4051
+4052
+4053
+4054
+4055
+4056
+4057
+4058
+4059
+4060
+4061
+4062
+4063
+4064
+4065
+4066
+4067
+4068
+4069
+4070
+4071
+4072
+4073
+4074
+4075
+4076
+4077
+4078
+4079
+4080
+4081
+4082
+4083
+4084
+4085
+4086
+4087
+4088
+4089
+4090
+4091
+4092
+4093
+4094
+4095
+4096
+4097
+4098
+4099
+4100
+4101
+4102
+4103
+4104
+4105
+4106
+4107
+4108
+4109
+4110
+4111
+4112
+4113
+4114
+4115
+4116
+4117
+4118
+4119
+4120
+4121
+4122
+4123
+4124
+4125
+4126
+4127
+4128
+4129
+4130
+4131
+4132
+4133
+4134
+4135
+4136
+4137
+4138
+4139
+4140
+4141
+4142
+4143
+4144
+4145
+4146
+4147
+4148
+4149
+4150
+4151
+4152
+4153
+4154
+4155
+4156
+4157
+4158
+4159
+4160
+4161
+4162
+4163
+4164
+4165
+4166
+4167
+4168
+4169
+4170
+4171
+4172
+4173
+4174
+4175
+4176
+4177
+4178
+4179
+4180
+4181
+4182
+4183
+4184
+4185
+4186
+4187
+4188
+4189
+4190
+4191
+4192
+4193
+4194
+4195
+4196
+4197
+4198
+4199
+4200
+4201
+4202
+4203
+4204
+4205
+4206
+4207
+4208
+4209
+4210
+4211
+4212
+4213
+4214
+4215
+4216
+4217
+4218
+4219
+4220
+4221
+4222
+4223
+4224
+4225
+4226
+4227
+4228
+4229
+4230
+4231
+4232
+4233
+4234
+4235
+4236
+4237
+4238
+4239
+4240
+4241
+4242
+4243
+4244
+4245
+4246
+4247
+4248
+4249
+4250
+4251
+4252
+4253
+4254
+4255
+4256
+4257
+4258
+4259
+4260
+4261
+4262
+4263
+4264
+4265
+4266
+4267
+4268
+4269
+4270
+4271
+4272
+4273
+4274
+4275
+4276
+4277
+4278
+4279
+4280
+4281
+4282
+4283
+4284
+4285
+4286
+4287
+4288
+4289
+4290
+4291
+4292
+4293
+4294
+4295
+4296
+4297
+4298
+4299
+4300
+4301
+4302
+4303
+4304
+4305
+4306
+4307
+4308
+4309
+4310
+4311
+4312
+4313
+4314
+4315
+4316
+4317
+4318
+4319
+4320
+4321
+4322
+4323
+4324
+4325
+4326
+4327
+4328
+4329
+4330
+4331
+4332
+4333
+4334
+4335
+4336
+4337
+4338
+4339
+4340
+4341
+4342
+4343
+4344
+4345
+4346
+4347
+4348
+4349
+4350
+4351
+4352
+4353
+4354
+4355
+4356
+4357
+4358
+4359
+4360
+4361
+4362
+4363
+4364
+4365
+4366
+4367
+4368
+4369
+4370
+4371
+4372
+4373
+4374
+4375
+4376
+4377
+4378
+4379
+4380
+4381
+4382
+4383
+4384
+4385
+4386
+4387
+4388
+4389
+4390
+4391
+4392
+4393
+4394
+4395
+4396
+4397
+4398
+4399
+4400
+4401
+4402
+4403
+4404
+4405
+4406
+4407
+4408
+4409
+4410
+4411
+4412
+4413
+4414
+4415
+4416
+4417
+4418
+4419
+4420
+4421
+4422
+4423
+4424
+4425
+4426
+4427
+4428
+4429
+4430
+4431
+4432
+4433
+4434
+4435
+4436
+4437
+4438
+4439
+4440
+4441
+4442
+4443
+4444
+4445
+4446
+4447
+4448
+4449
+4450
+4451
+4452
+4453
+4454
+4455
+4456
+4457
+4458
+4459
+4460
+4461
+4462
+4463
+4464
+4465
+4466
+4467
+4468
+4469
+4470
+4471
+4472
+4473
+4474
+4475
+4476
+4477
+4478
+4479
+4480
+4481
+4482
+4483
+4484
+4485
+4486
+4487
+4488
+4489
+4490
+4491
+4492
+4493
+4494
+4495
+4496
+4497
+4498
+4499
+4500
+4501
+4502
+4503
+4504
+4505
+4506
+4507
+4508
+4509
+4510
+4511
+4512
+4513
+4514
+4515
+4516
+4517
+4518
+4519
+4520
+4521
+4522
+4523
+4524
+4525
+4526
+4527
+4528
+4529
+4530
+4531
+4532
+4533
+4534
+4535
+4536
+4537
+4538
+4539
+4540
+4541
+4542
+4543
+4544
+4545
+4546
+4547
+4548
+4549
+4550
+4551
+4552
+4553
+4554
+4555
+4556
+4557
+4558
+4559
+4560
+4561
+4562
+4563
+4564
+4565
+4566
+4567
+4568
+4569
+4570
+4571
+4572
+4573
+4574
+4575
+4576
+4577
+4578
+4579
+4580
+4581
+4582
+4583
+4584
+4585
+4586
+4587
+4588
+4589
+4590
+4591
+4592
+4593
+4594
+4595
+4596
+4597
+4598
+4599
+4600
+4601
+4602
+4603
+4604
+4605
+4606
+4607
+4608
+4609
+4610
+4611
+4612
+4613
+4614
+4615
+4616
+4617
+4618
+4619
+4620
+4621
+4622
+4623
+4624
+4625
+4626
+4627
+4628
+4629
+4630
+4631
+4632
+4633
+4634
+4635
+4636
+4637
+4638
+4639
+4640
+4641
+4642
+4643
+4644
+4645
+4646
+4647
+4648
+4649
+4650
+4651
+4652
+4653
+4654
+4655
+4656
+4657
+4658
+4659
+4660
+4661
+4662
+4663
+4664
+4665
+4666
+4667
+4668
+4669
+4670
+4671
+4672
+4673
+4674
+4675
+4676
+4677
+4678
+4679
+4680
+4681
+4682
+4683
+4684
+4685
+4686
+4687
+4688
+4689
+4690
+4691
+4692
+4693
+4694
+4695
+4696
+4697
+4698
+4699
+4700
+4701
+4702
+4703
+4704
+4705
+4706
+4707
+4708
+4709
+4710
+4711
+4712
+4713
+4714
+4715
+4716
+4717
+4718
+4719
+4720
+4721
+4722
+4723
+4724
+4725
+4726
+4727
+4728
+4729
+4730
+4731
+4732
+4733
+4734
+4735
+4736
+4737
+4738
+4739
+4740
+4741
+4742
+4743
+4744
+4745
+4746
+4747
+4748
+4749
+4750
+4751
+4752
+4753
+4754
+4755
+4756
+4757
+4758
+4759
+4760
+4761
+4762
+4763
+4764
+4765
+4766
+4767
+4768
+4769
+4770
+4771
+4772
+4773
+4774
+4775
+4776
+4777
+4778
+4779
+4780
+4781
+4782
+4783
+4784
+4785
+4786
+4787
+4788
+4789
+4790
+4791
+4792
+4793
+4794
+4795
+4796
+4797
+4798
+4799
+4800
+4801
+4802
+4803
+4804
+4805
+4806
+4807
+4808
+4809
+4810
+4811
+4812
+4813
+4814
+4815
+4816
+4817
+4818
+4819
+4820
+4821
+4822
+4823
+4824
+4825
+4826
+4827
+4828
+4829
+4830
+4831
+4832
+4833
+4834
+4835
+4836
+4837
+4838
+4839
+4840
+4841
+4842
+4843
+4844
+4845
+4846
+4847
+4848
+4849
+4850
+4851
+4852
+4853
+4854
+4855
+4856
+4857
+4858
+4859
+4860
+4861
+4862
+4863
+4864
+4865
+4866
+4867
+4868
+4869
+4870
+4871
+4872
+4873
+4874
+4875
+4876
+4877
+4878
+4879
+4880
+4881
+4882
+4883
+4884
+4885
+4886
+4887
+4888
+4889
+4890
+4891
+4892
+4893
+4894
+4895
+4896
+4897
+4898
+4899
+4900
+4901
+4902
+4903
+4904
+4905
+4906
+4907
+4908
+4909
+4910
+4911
+4912
+4913
+4914
+4915
+4916
+4917
+4918
+4919
+4920
+4921
+4922
+4923
+4924
+4925
+4926
+4927
+4928
+4929
+4930
+4931
+4932
+4933
+4934
+4935
+4936
+4937
+4938
+4939
+4940
+4941
+4942
+4943
+4944
+4945
+4946
+4947
+4948
+4949
+4950
+4951
+4952
+4953
+4954
+4955
+4956
+4957
+4958
+4959
+4960
+4961
+4962
+4963
+4964
+4965
+4966
+4967
+4968
+4969
+4970
+4971
+4972
+4973
+4974
+4975
+4976
+4977
+4978
+4979
+4980
+4981
+4982
+4983
+4984
+4985
+4986
+4987
+4988
+4989
+4990
+4991
+4992
+4993
+4994
+4995
+4996
+4997
+4998
+4999
+5000
+5001
+5002
+5003
+5004
+5005
+5006
+5007
+5008
+5009
+5010
+5011
+5012
+5013
+5014
+5015
+5016
+5017
+5018
+5019
+5020
+5021
+5022
+5023
+5024
+5025
+5026
+5027
+5028
+5029
+5030
+5031
+5032
+5033
+5034
+5035
+5036
+5037
+5038
+5039
+5040
+5041
+5042
+5043
+5044
+5045
+5046
+5047
+5048
+5049
+5050
+5051
+5052
+5053
+5054
+5055
+5056
+5057
+5058
+5059
+5060
+5061
+5062
+5063
+5064
+5065
+5066
+5067
+5068
+5069
+5070
+5071
+5072
+5073
+5074
+5075
+5076
+5077
+5078
+5079
+5080
+5081
+5082
+5083
+5084
+5085
+5086
+5087
+5088
+5089
+5090
+5091
+5092
+5093
+5094
+5095
+5096
+5097
+5098
+5099
+5100
+5101
+5102
+5103
+5104
+5105
+5106
+5107
+5108
+5109
+5110
+5111
+5112
+5113
+5114
+5115
+5116
+5117
+5118
+5119
+5120
+5121
+5122
+5123
+5124
+5125
+5126
+5127
+5128
+5129
+5130
+5131
+5132
+5133
+5134
+5135
+5136
+5137
+5138
+5139
+5140
+5141
+5142
+5143
+5144
+5145
+5146
+5147
+5148
+5149
+5150
+5151
+5152
+5153
+5154
+5155
+5156
+5157
+5158
+5159
+5160
+5161
+5162
+5163
+5164
+5165
+5166
+5167
+5168
+5169
+5170
+5171
+5172
+5173
+5174
+5175
+5176
+5177
+5178
+5179
+5180
+5181
+5182
+5183
+5184
+5185
+5186
+5187
+5188
+5189
+5190
+5191
+5192
+5193
+5194
+5195
+5196
+5197
+5198
+5199
+5200
+5201
+5202
+5203
+5204
+5205
+5206
+5207
+5208
+5209
+5210
+5211
+5212
+5213
+5214
+5215
+5216
+5217
+5218
+5219
+5220
+5221
+5222
+5223
+5224
+5225
+5226
+5227
+5228
+5229
+5230
+5231
+5232
+5233
+5234
+5235
+5236
+5237
+5238
+5239
+5240
+5241
+5242
+5243
+5244
+5245
+5246
+5247
+5248
+5249
+5250
+5251
+5252
+5253
+5254
+5255
+5256
+5257
+5258
+5259
+5260
+5261
+5262
+5263
+5264
+5265
+5266
+5267
+5268
+5269
+5270
+5271
+5272
+5273
+5274
+5275
+5276
+5277
+5278
+5279
+5280
+5281
+5282
+5283
+5284
+5285
+5286
+5287
+5288
+5289
+5290
+5291
+5292
+5293
+5294
+5295
+5296
+5297
+5298
+5299
+5300
+5301
+5302
+5303
+5304
+5305
+5306
+5307
+5308
+5309
+5310
+5311
+5312
+5313
+5314
+5315
+5316
+5317
+5318
+5319
+5320
+5321
+5322
+5323
+5324
+5325
+5326
+5327
+5328
+5329
+5330
+5331
+5332
+5333
+5334
+5335
+5336
+5337
+5338
+5339
+5340
+5341
+5342
+5343
+5344
+5345
+5346
+5347
+5348
+5349
+5350
+5351
+5352
+5353
+5354
+5355
+5356
+5357
+5358
+5359
+5360
+5361
+5362
+5363
+5364
+5365
+5366
+5367
+5368
+5369
+5370
+5371
+5372
+5373
+5374
+5375
+5376
+5377
+5378
+5379
+5380
+5381
+5382
+5383
+5384
+5385
+5386
+5387
+5388
+5389
+5390
+5391
+5392
+5393
+5394
+5395
+5396
+5397
+5398
+5399
+5400
+5401
+5402
+5403
+5404
+5405
+5406
+5407
+5408
+5409
+5410
+5411
+5412
+5413
+5414
+5415
+5416
+5417
+5418
+5419
+5420
+5421
+5422
+5423
+5424
+5425
+5426
+5427
+5428
+5429
+5430
+5431
+5432
+5433
+5434
+5435
+5436
+5437
+5438
+5439
+5440
+5441
+5442
+5443
+5444
+5445
+5446
+5447
+5448
+5449
+5450
+5451
+5452
+5453
+5454
+5455
+5456
+5457
+5458
+5459
+5460
+5461
+5462
+5463
+5464
+5465
+5466
+5467
+5468
+5469
+5470
+5471
+5472
+5473
+5474
+5475
+5476
+5477
+5478
+5479
+5480
+5481
+5482
+5483
+5484
+5485
+5486
+5487
+5488
+5489
+5490
+5491
+5492
+5493
+5494
+5495
+5496
+5497
+5498
+5499
+5500
+5501
+5502
+5503
+5504
+5505
+5506
+5507
+5508
+5509
+5510
+5511
+5512
+5513
+5514
+5515
+5516
+5517
+5518
+5519
+5520
+5521
+5522
+5523
+5524
+5525
+5526
+5527
+5528
+5529
+5530
+5531
+5532
+5533
+5534
+5535
+5536
+5537
+5538
+5539
+5540
+5541
+5542
+5543
+5544
+5545
+5546
+5547
+5548
+5549
+5550
+5551
+5552
+5553
+5554
+5555
+5556
+5557
+5558
+5559
+5560
+5561
+5562
+5563
+5564
+5565
+5566
+5567
+5568
+5569
+5570
+5571
+5572
+5573
+5574
+5575
+5576
+5577
+5578
+5579
+5580
+5581
+5582
+5583
+5584
+5585
+5586
+5587
+5588
+5589
+5590
+5591
+5592
+5593
+5594
+5595
+5596
+5597
+5598
+5599
+5600
+5601
+5602
+5603
+5604
+5605
+5606
+5607
+5608
+5609
+5610
+5611
+5612
+5613
+5614
+5615
+5616
+5617
+5618
+5619
+5620
+5621
+5622
+5623
+5624
+5625
+5626
+5627
+5628
+5629
+5630
+5631
+5632
+5633
+5634
+5635
+5636
+5637
+5638
+5639
+5640
+5641
+5642
+5643
+5644
+5645
+5646
+5647
+5648
+5649
+5650
+5651
+5652
+5653
+5654
+5655
+5656
+5657
+5658
+5659
+5660
+5661
+5662
+5663
+5664
+5665
+5666
+5667
+5668
+5669
+5670
+5671
+5672
+5673
+5674
+5675
+5676
+5677
+5678
+5679
+5680
+5681
+5682
+5683
+5684
+5685
+5686
+5687
+5688
+5689
+5690
+5691
+5692
+5693
+5694
+5695
+5696
+5697
+5698
+5699
+5700
+5701
+5702
+5703
+5704
+5705
+5706
+5707
+5708
+5709
+5710
+5711
+5712
+5713
+5714
+5715
+5716
+5717
+5718
+5719
+5720
+5721
+5722
+5723
+5724
+5725
+5726
+5727
+5728
+5729
+5730
+5731
+5732
+5733
+5734
+5735
+5736
+5737
+5738
+5739
+5740
+5741
+5742
+5743
+5744
+5745
+5746
+5747
+5748
+5749
+5750
+5751
+5752
+5753
+5754
+5755
+5756
+5757
+5758
+5759
+5760
+5761
+5762
+5763
+5764
+5765
+5766
+5767
+5768
+5769
+5770
+5771
+5772
+5773
+5774
+5775
+5776
+5777
+5778
+5779
+5780
+5781
+5782
+5783
+5784
+5785
+5786
+5787
+5788
+5789
+5790
+5791
+5792
+5793
+5794
+5795
+5796
+5797
+5798
+5799
+5800
+5801
+5802
+5803
+5804
+5805
+5806
+5807
+5808
+5809
+5810
+5811
+5812
+5813
+5814
+5815
+5816
+5817
+5818
+5819
+5820
+5821
+5822
+5823
+5824
+5825
+5826
+5827
+5828
+5829
+5830
+5831
+5832
+5833
+5834
+5835
+5836
+5837
+5838
+5839
+5840
+5841
+5842
+5843
+5844
+5845
+5846
+5847
+5848
+5849
+5850
+5851
+5852
+5853
+5854
+5855
+5856
+5857
+5858
+5859
+5860
+5861
+5862
+5863
+5864
+5865
+5866
+5867
+5868
+5869
+5870
+5871
+5872
+5873
+5874
+5875
+5876
+5877
+5878
+5879
+5880
+5881
+5882
+5883
+5884
+5885
+5886
+5887
+5888
+5889
+5890
+5891
+5892
+5893
+5894
+5895
+5896
+5897
+5898
+5899
+5900
+5901
+5902
+5903
+5904
+5905
+5906
+5907
+5908
+5909
+5910
+5911
+5912
+5913
+5914
+5915
+5916
+5917
+5918
+5919
+5920
+5921
+5922
+5923
+5924
+5925
+5926
+5927
+5928
+5929
+5930
+5931
+5932
+5933
+5934
+5935
+5936
+5937
+5938
+5939
+5940
+5941
+5942
+5943
+5944
+5945
+5946
+5947
+5948
+5949
+5950
+5951
+5952
+5953
+5954
+5955
+5956
+5957
+5958
+5959
+5960
+5961
+5962
+5963
+5964
+5965
+5966
+5967
+5968
+5969
+5970
+5971
+5972
+5973
+5974
+5975
+5976
+5977
+5978
+5979
+5980
+5981
+5982
+5983
+5984
+5985
+5986
+5987
+5988
+5989
+5990
+5991
+5992
+5993
+5994
+5995
+5996
+5997
+5998
+5999
+6000
+6001
+6002
+6003
+6004
+6005
+6006
+6007
+6008
+6009
+6010
+6011
+6012
+6013
+6014
+6015
+6016
+6017
+6018
+6019
+6020
+6021
+6022
+6023
+6024
+6025
+6026
+6027
+6028
+6029
+6030
+6031
+6032
+6033
+6034
+6035
+6036
+6037
+6038
+6039
+6040
+6041
+6042
+6043
+6044
+6045
+6046
+6047
+6048
+6049
+6050
+6051
+6052
+6053
+6054
+6055
+6056
+6057
+6058
+6059
+6060
+6061
+6062
+6063
+6064
+6065
+6066
+6067
+6068
+6069
+6070
+6071
+6072
+6073
+6074
+6075
+6076
+6077
+6078
+6079
+6080
+6081
+6082
+6083
+6084
+6085
+6086
+6087
+6088
+6089
+6090
+6091
+6092
+6093
+6094
+6095
+6096
+6097
+6098
+6099
+6100
+6101
+6102
+6103
+6104
+6105
+6106
+6107
+6108
+6109
+6110
+6111
+6112
+6113
+6114
+6115
+6116
+6117
+6118
+6119
+6120
+6121
+6122
+6123
+6124
+6125
+6126
+6127
+6128
+6129
+6130
+6131
+6132
+6133
+6134
+6135
+6136
+6137
+6138
+6139
+6140
+6141
+6142
+6143
+6144
+6145
+6146
+6147
+6148
+6149
+6150
+6151
+6152
+6153
+6154
+6155
+6156
+6157
+6158
+6159
+6160
+6161
+6162
+6163
+6164
+6165
+6166
+6167
+6168
+6169
+6170
+6171
+6172
+6173
+6174
+6175
+6176
+6177
+6178
+6179
+6180
+6181
+6182
+6183
+6184
+6185
+6186
+6187
+6188
+6189
+6190
+6191
+6192
+6193
+6194
+6195
+6196
+6197
+6198
+6199
+6200
+6201
+6202
+6203
+6204
+6205
+6206
+6207
+6208
+6209
+6210
+6211
+6212
+6213
+6214
+6215
+6216
+6217
+6218
+6219
+6220
+6221
+6222
+6223
+6224
+6225
+6226
+6227
+6228
+6229
+6230
+6231
+6232
+6233
+6234
+6235
+6236
+6237
+6238
+6239
+6240
+6241
+6242
+6243
+6244
+6245
+6246
+6247
+6248
+6249
+6250
+6251
+6252
+6253
+6254
+6255
+6256
+6257
+6258
+6259
+6260
+6261
+6262
+6263
+6264
+6265
+6266
+6267
+6268
+6269
+6270
+6271
+6272
+6273
+6274
+6275
+6276
+6277
+6278
+6279
+6280
+6281
+6282
+6283
+6284
+6285
+6286
+6287
+6288
+6289
+6290
+6291
+6292
+6293
+6294
+6295
+6296
+6297
+6298
+6299
+6300
+6301
+6302
+6303
+6304
+6305
+6306
+6307
+6308
+6309
+6310
+6311
+6312
+6313
+6314
+6315
+6316
+6317
+6318
+6319
+6320
+6321
+6322
+6323
+6324
+6325
+6326
+6327
+6328
+6329
+6330
+6331
+6332
+6333
+6334
+6335
+6336
+6337
+6338
+6339
+6340
+6341
+6342
+6343
+6344
+6345
+6346
+6347
+6348
+6349
+6350
+6351
+6352
+6353
+6354
+6355
+6356
+6357
+6358
+6359
+6360
+6361
+6362
+6363
+6364
+6365
+6366
+6367
+6368
+6369
+6370
+6371
+6372
+6373
+6374
+6375
+6376
+6377
+6378
+6379
+6380
+6381
+6382
+6383
+6384
+6385
+6386
+6387
+6388
+6389
+6390
+6391
+6392
+6393
+6394
+6395
+6396
+6397
+6398
+6399
+6400
+6401
+6402
+6403
+6404
+6405
+6406
+6407
+6408
+6409
+6410
+6411
+6412
+6413
+6414
+6415
+6416
+6417
+6418
+6419
+6420
+6421
+6422
+6423
+6424
+6425
+6426
+6427
+6428
+6429
+6430
+6431
+6432
+6433
+6434
+6435
+6436
+6437
+6438
+6439
+6440
+6441
+6442
+6443
+6444
+6445
+6446
+6447
+6448
+6449
+6450
+6451
+6452
+6453
+6454
+6455
+6456
+6457
+6458
+6459
+6460
+6461
+6462
+6463
+6464
+6465
+6466
+6467
+6468
+6469
+6470
+6471
+6472
+6473
+6474
+6475
+6476
+6477
+6478
+6479
+6480
+6481
+6482
+6483
+6484
+6485
+6486
+6487
+6488
+6489
+6490
+6491
+6492
+6493
+6494
+6495
+6496
+6497
+6498
+6499
+6500
+6501
+6502
+6503
+6504
+6505
+6506
+6507
+6508
+6509
+6510
+6511
+6512
+6513
+6514
+6515
+6516
+6517
+6518
+6519
+6520
+6521
+6522
+6523
+6524
+6525
+6526
+6527
+6528
+6529
+6530
+6531
+6532
+6533
+6534
+6535
+6536
+6537
+6538
+6539
+6540
+6541
+6542
+6543
+6544
+6545
+6546
+6547
+6548
+6549
+6550
+6551
+6552
+6553
+6554
+6555
+6556
+6557
+6558
+6559
+6560
+6561
+6562
+6563
+6564
+6565
+6566
+6567
+6568
+6569
+6570
+6571
+6572
+6573
+6574
+6575
+6576
+6577
+6578
+6579
+6580
+6581
+6582
+6583
+6584
+6585
+6586
+6587
+6588
+6589
+6590
+6591
+6592
+6593
+6594
+6595
+6596
+6597
+6598
+6599
+6600
+6601
+6602
+6603
+6604
+6605
+6606
+6607
+6608
+6609
+6610
+6611
+6612
+6613
+6614
+6615
+6616
+6617
+6618
+6619
+6620
+6621
+6622
+6623
+6624
+6625
+6626
+6627
+6628
+6629
+6630
+6631
+6632
+6633
+6634
+6635
+6636
+6637
+6638
+6639
+6640
+6641
+6642
+6643
+6644
+6645
+6646
+6647
+6648
+6649
+6650
+6651
+6652
+6653
+6654
+6655
+6656
+6657
+6658
+6659
+6660
+6661
+6662
+6663
+6664
+6665
+6666
+6667
+6668
+6669
+6670
+6671
+6672
+6673
+6674
+6675
+6676
+6677
+6678
+6679
+6680
+6681
+6682
+6683
+6684
+6685
+6686
+6687
+6688
+6689
+6690
+6691
+6692
+6693
+6694
+6695
+6696
+6697
+6698
+6699
+6700
+6701
+6702
+6703
+6704
+6705
+6706
+6707
+6708
+6709
+6710
+6711
+6712
+6713
+6714
+6715
+6716
+6717
+6718
+6719
+6720
+6721
+6722
+6723
+6724
+6725
+6726
+6727
+6728
+6729
+6730
+6731
+6732
+6733
+6734
+6735
+6736
+6737
+6738
+6739
+6740
+6741
+6742
+6743
+6744
+6745
+6746
+6747
+6748
+6749
+6750
+6751
+6752
+6753
+6754
+6755
+6756
+6757
+6758
+6759
+6760
+6761
+6762
+6763
+6764
+6765
+6766
+6767
+6768
+6769
+6770
+6771
+6772
+6773
+6774
+6775
+6776
+6777
+6778
+6779
+6780
+6781
+6782
+6783
+6784
+6785
+6786
+6787
+6788
+6789
+6790
+6791
+6792
+6793
+6794
+6795
+6796
+6797
+6798
+6799
+6800
+6801
+6802
+6803
+6804
+6805
+6806
+6807
+6808
+6809
+6810
+6811
+6812
+6813
+6814
+6815
+6816
+6817
+6818
+6819
+6820
+6821
+6822
+6823
+6824
+6825
+6826
+6827
+6828
+6829
+6830
+6831
+6832
+6833
+6834
+6835
+6836
+6837
+6838
+6839
+6840
+6841
+6842
+6843
+6844
+6845
+6846
+6847
+6848
+6849
+6850
+6851
+6852
+6853
+6854
+6855
+6856
+6857
+6858
+6859
+6860
+6861
+6862
+6863
+6864
+6865
+6866
+6867
+6868
+6869
+6870
+6871
+6872
+6873
+6874
+6875
+6876
+6877
+6878
+6879
+6880
+6881
+6882
+6883
+6884
+6885
+6886
+6887
+6888
+6889
+6890
+6891
+6892
+6893
+6894
+6895
+6896
+6897
+6898
+6899
+6900
+6901
+6902
+6903
+6904
+6905
+6906
+6907
+6908
+6909
+6910
+6911
+6912
+6913
+6914
+6915
+6916
+6917
+6918
+6919
+6920
+6921
+6922
+6923
+6924
+6925
+6926
+6927
+6928
+6929
+6930
+6931
+6932
+6933
+6934
+6935
+6936
+6937
+6938
+6939
+6940
+6941
+6942
+6943
+6944
+6945
+6946
+6947
+6948
+6949
+6950
+6951
+6952
+6953
+6954
+6955
+6956
+6957
+6958
+6959
+6960
+6961
+6962
+6963
+6964
+6965
+6966
+6967
+6968
+6969
+6970
+6971
+6972
+6973
+6974
+6975
+6976
+6977
+6978
+6979
+6980
+6981
+6982
+6983
+6984
+6985
+6986
+6987
+6988
+6989
+6990
+6991
+6992
+6993
+6994
+6995
+6996
+6997
+6998
+6999
+7000
+7001
+7002
+7003
+7004
+7005
+7006
+7007
+7008
+7009
+7010
+7011
+7012
+7013
+7014
+7015
+7016
+7017
+7018
+7019
+7020
+7021
+7022
+7023
+7024
+7025
+7026
+7027
+7028
+7029
+7030
+7031
+7032
+7033
+7034
+7035
+7036
+7037
+7038
+7039
+7040
+7041
+7042
+7043
+7044
+7045
+7046
+7047
+7048
+7049
+7050
+7051
+7052
+7053
+7054
+7055
+7056
+7057
+7058
+7059
+7060
+7061
+7062
+7063
+7064
+7065
+7066
+7067
+7068
+7069
+7070
+7071
+7072
+7073
+7074
+7075
+7076
+7077
+7078
+7079
+7080
+7081
+7082
+7083
+7084
+7085
+7086
+7087
+7088
+7089
+7090
+7091
+7092
+7093
+7094
+7095
+7096
+7097
+7098
+7099
+7100
+7101
+7102
+7103
+7104
+7105
+7106
+7107
+7108
+7109
+7110
+7111
+7112
+7113
+7114
+7115
+7116
+7117
+7118
+7119
+7120
+7121
+7122
+7123
+7124
+7125
+7126
+7127
+7128
+7129
+7130
+7131
+7132
+7133
+7134
+7135
+7136
+7137
+7138
+7139
+7140
+7141
+7142
+7143
+7144
+7145
+7146
+7147
+7148
+7149
+7150
+7151
+7152
+7153
+7154
+7155
+7156
+7157
+7158
+7159
+7160
+7161
+7162
+7163
+7164
+7165
+7166
+7167
+7168
+7169
+7170
+7171
+7172
+7173
+7174
+7175
+7176
+7177
+7178
+7179
+7180
+7181
+7182
+7183
+7184
+7185
+7186
+7187
+7188
+7189
+7190
+7191
+7192
+7193
+7194
+7195
+7196
+7197
+7198
+7199
+7200
+7201
+7202
+7203
+7204
+7205
+7206
+7207
+7208
+7209
+7210
+7211
+7212
+7213
+7214
+7215
+7216
+7217
+7218
+7219
+7220
+7221
+7222
+7223
+7224
+7225
+7226
+7227
+7228
+7229
+7230
+7231
+7232
+7233
+7234
+7235
+7236
+7237
+7238
+7239
+7240
+7241
+7242
+7243
+7244
+7245
+7246
+7247
+7248
+7249
+7250
+7251
+7252
+7253
+7254
+7255
+7256
+7257
+7258
+7259
+7260
+7261
+7262
+7263
+7264
+7265
+7266
+7267
+7268
+7269
+7270
+7271
+7272
+7273
+7274
+7275
+7276
+7277
+7278
+7279
+7280
+7281
+7282
+7283
+7284
+7285
+7286
+7287
+7288
+7289
+7290
+7291
+7292
+7293
+7294
+7295
+7296
+7297
+7298
+7299
+7300
+7301
+7302
+7303
+7304
+7305
+7306
+7307
+7308
+7309
+7310
+7311
+7312
+7313
+7314
+7315
+7316
+7317
+7318
+7319
+7320
+7321
+7322
+7323
+7324
+7325
+7326
+7327
+7328
+7329
+7330
+7331
+7332
+7333
+7334
+7335
+7336
+7337
+7338
+7339
+7340
+7341
+7342
+7343
+7344
+7345
+7346
+7347
+7348
+7349
+7350
+7351
+7352
+7353
+7354
+7355
+7356
+7357
+7358
+7359
+7360
+7361
+7362
+7363
+7364
+7365
+7366
+7367
+7368
+7369
+7370
+7371
+7372
+7373
+7374
+7375
+7376
+7377
+7378
+7379
+7380
+7381
+7382
+7383
+7384
+7385
+7386
+7387
+7388
+7389
+7390
+7391
+7392
+7393
+7394
+7395
+7396
+7397
+7398
+7399
+7400
+7401
+7402
+7403
+7404
+7405
+7406
+7407
+7408
+7409
+7410
+7411
+7412
+7413
+7414
+7415
+7416
+7417
+7418
+7419
+7420
+7421
+7422
+7423
+7424
+7425
+7426
+7427
+7428
+7429
+7430
+7431
+7432
+7433
+7434
+7435
+7436
+7437
+7438
+7439
+7440
+7441
+7442
+7443
+7444
+7445
+7446
+7447
+7448
+7449
+7450
+7451
+7452
+7453
+7454
+7455
+7456
+7457
+7458
+7459
+7460
+7461
+7462
+7463
+7464
+7465
+7466
+7467
+7468
+7469
+7470
+7471
+7472
+7473
+7474
+7475
+7476
+7477
+7478
+7479
+7480
+7481
+7482
+7483
+7484
+7485
+7486
+7487
+7488
+7489
+7490
+7491
+7492
+7493
+7494
+7495
+7496
+7497
+7498
+7499
+7500
+7501
+7502
+7503
+7504
+7505
+7506
+7507
+7508
+7509
+7510
+7511
+7512
+7513
+7514
+7515
+7516
+7517
+7518
+7519
+7520
+7521
+7522
+7523
+7524
+7525
+7526
+7527
+7528
+7529
+7530
+7531
+7532
+7533
+7534
+7535
+7536
+7537
+7538
+7539
+7540
+7541
+7542
+7543
+7544
+7545
+7546
+7547
+7548
+7549
+7550
+7551
+7552
+7553
+7554
+7555
+7556
+7557
+7558
+7559
+7560
+7561
+7562
+7563
+7564
+7565
+7566
+7567
+7568
+7569
+7570
+7571
+7572
+7573
+7574
+7575
+7576
+7577
+7578
+7579
+7580
+7581
+7582
+7583
+7584
+7585
+7586
+7587
+7588
+7589
+7590
+7591
+7592
+7593
+7594
+7595
+7596
+7597
+7598
+7599
+7600
+7601
+7602
+7603
+7604
+7605
+7606
+7607
+7608
+7609
+7610
+7611
+7612
+7613
+7614
+7615
+7616
+7617
+7618
+7619
+7620
+7621
+7622
+7623
+7624
+7625
+7626
+7627
+7628
+7629
+7630
+7631
+7632
+7633
+7634
+7635
+7636
+7637
+7638
+7639
+7640
+7641
+7642
+7643
+7644
+7645
+7646
+7647
+7648
+7649
+7650
+7651
+7652
+7653
+7654
+7655
+7656
+7657
+7658
+7659
+7660
+7661
+7662
+7663
+7664
+7665
+7666
+7667
+7668
+7669
+7670
+7671
+7672
+7673
+7674
+7675
+7676
+7677
+7678
+7679
+7680
+7681
+7682
+7683
+7684
+7685
+7686
+7687
+7688
+7689
+7690
+7691
+7692
+7693
+7694
+7695
+7696
+7697
+7698
+7699
+7700
+7701
+7702
+7703
+7704
+7705
+7706
+7707
+7708
+7709
+7710
+7711
+7712
+7713
+7714
+7715
+7716
+7717
+7718
+7719
+7720
+7721
+7722
+7723
+7724
+7725
+7726
+7727
+7728
+7729
+7730
+7731
+7732
+7733
+7734
+7735
+7736
+7737
+7738
+7739
+7740
+7741
+7742
+7743
+7744
+7745
+7746
+7747
+7748
+7749
+7750
+7751
+7752
+7753
+7754
+7755
+7756
+7757
+7758
+7759
+7760
+7761
+7762
+7763
+7764
+7765
+7766
+7767
+7768
+7769
+7770
+7771
+7772
+7773
+7774
+7775
+7776
+7777
+7778
+7779
+7780
+7781
+7782
+7783
+7784
+7785
+7786
+7787
+7788
+7789
+7790
+7791
+7792
+7793
+7794
+7795
+7796
+7797
+7798
+7799
+7800
+7801
+7802
+7803
+7804
+7805
+7806
+7807
+7808
+7809
+7810
+7811
+7812
+7813
+7814
+7815
+7816
+7817
+7818
+7819
+7820
+7821
+7822
+7823
+7824
+7825
+7826
+7827
+7828
+7829
+7830
+7831
+7832
+7833
+7834
+7835
+7836
+7837
+7838
+7839
+7840
+7841
+7842
+7843
+7844
+7845
+7846
+7847
+7848
+7849
+7850
+7851
+7852
+7853
+7854
+7855
+7856
+7857
+7858
+7859
+7860
+7861
+7862
+7863
+7864
+7865
+7866
+7867
+7868
+7869
+7870
+7871
+7872
+7873
+7874
+7875
+7876
+7877
+7878
+7879
+7880
+7881
+7882
+7883
+7884
+7885
+7886
+7887
+7888
+7889
+7890
+7891
+7892
+7893
+7894
+7895
+7896
+7897
+7898
+7899
+7900
+7901
+7902
+7903
+7904
+7905
+7906
+7907
+7908
+7909
+7910
+7911
+7912
+7913
+7914
+7915
+7916
+7917
+7918
+7919
+7920
+7921
+7922
+7923
+7924
+7925
+7926
+7927
+7928
+7929
+7930
+7931
+7932
+7933
+7934
+7935
+7936
+7937
+7938
+7939
+7940
+7941
+7942
+7943
+7944
+7945
+7946
+7947
+7948
+7949
+7950
+7951
+7952
+7953
+7954
+7955
+7956
+7957
+7958
+7959
+7960
+7961
+7962
+7963
+7964
+7965
+7966
+7967
+7968
+7969
+7970
+7971
+7972
+7973
+7974
+7975
+7976
+7977
+7978
+7979
+7980
+7981
+7982
+7983
+7984
+7985
+7986
+7987
+7988
+7989
+7990
+7991
+7992
+7993
+7994
+7995
+7996
+7997
+7998
+7999
+8000
+8001
+8002
+8003
+8004
+8005
+8006
+8007
+8008
+8009
+8010
+8011
+8012
+8013
+8014
+8015
+8016
+8017
+8018
+8019
+8020
+8021
+8022
+8023
+8024
+8025
+8026
+8027
+8028
+8029
+8030
+8031
+8032
+8033
+8034
+8035
+8036
+8037
+8038
+8039
+8040
+8041
+8042
+8043
+8044
+8045
+8046
+8047
+8048
+8049
+8050
+8051
+8052
+8053
+8054
+8055
+8056
+8057
+8058
+8059
+8060
+8061
+8062
+8063
+8064
+8065
+8066
+8067
+8068
+8069
+8070
+8071
+8072
+8073
+8074
+8075
+8076
+8077
+8078
+8079
+8080
+8081
+8082
+8083
+8084
+8085
+8086
+8087
+8088
+8089
+8090
+8091
+8092
+8093
+8094
+8095
+8096
+8097
+8098
+8099
+8100
+8101
+8102
+8103
+8104
+8105
+8106
+8107
+8108
+8109
+8110
+8111
+8112
+8113
+8114
+8115
+8116
+8117
+8118
+8119
+8120
+8121
+8122
+8123
+8124
+8125
+8126
+8127
+8128
+8129
+8130
+8131
+8132
+8133
+8134
+8135
+8136
+8137
+8138
+8139
+8140
+8141
+8142
+8143
+8144
+8145
+8146
+8147
+8148
+8149
+8150
+8151
+8152
+8153
+8154
+8155
+8156
+8157
+8158
+8159
+8160
+8161
+8162
+8163
+8164
+8165
+8166
+8167
+8168
+8169
+8170
+8171
+8172
+8173
+8174
+8175
+8176
+8177
+8178
+8179
+8180
+8181
+8182
+8183
+8184
+8185
+8186
+8187
+8188
+8189
+8190
+8191
+8192
+8193
+8194
+8195
+8196
+8197
+8198
+8199
+8200
+8201
+8202
+8203
+8204
+8205
+8206
+8207
+8208
+8209
+8210
+8211
+8212
+8213
+8214
+8215
+8216
+8217
+8218
+8219
+8220
+8221
+8222
+8223
+8224
+8225
+8226
+8227
+8228
+8229
+8230
+8231
+8232
+8233
+8234
+8235
+8236
+8237
+8238
+8239
+8240
+8241
+8242
+8243
+8244
+8245
+8246
+8247
+8248
+8249
+8250
+8251
+8252
+8253
+8254
+8255
+8256
+8257
+8258
+8259
+8260
+8261
+8262
+8263
+8264
+8265
+8266
+8267
+8268
+8269
+8270
+8271
+8272
+8273
+8274
+8275
+8276
+8277
+8278
+8279
+8280
+8281
+8282
+8283
+8284
+8285
+8286
+8287
+8288
+8289
+8290
+8291
+8292
+8293
+8294
+8295
+8296
+8297
+8298
+8299
+8300
+8301
+8302
+8303
+8304
+8305
+8306
+8307
+8308
+8309
+8310
+8311
+8312
+8313
+8314
+8315
+8316
+8317
+8318
+8319
+8320
+8321
+8322
+8323
+8324
+8325
+8326
+8327
+8328
+8329
+8330
+8331
+8332
+8333
+8334
+8335
+8336
+8337
+8338
+8339
+8340
+8341
+8342
+8343
+8344
+8345
+8346
+8347
+8348
+8349
+8350
+8351
+8352
+8353
+8354
+8355
+8356
+8357
+8358
+8359
+8360
+8361
+8362
+8363
+8364
+8365
+8366
+8367
+8368
+8369
+8370
+8371
+8372
+8373
+8374
+8375
+8376
+8377
+8378
+8379
+8380
+8381
+8382
+8383
+8384
+8385
+8386
+8387
+8388
+8389
+8390
+8391
+8392
+8393
+8394
+8395
+8396
+8397
+8398
+8399
+8400
+8401
+8402
+8403
+8404
+8405
+8406
+8407
+8408
+8409
+8410
+8411
+8412
+8413
+8414
+8415
+8416
+8417
+8418
+8419
+8420
+8421
+8422
+8423
+8424
+8425
+8426
+8427
+8428
+8429
+8430
+8431
+8432
+8433
+8434
+8435
+8436
+8437
+8438
+8439
+8440
+8441
+8442
+8443
+8444
+8445
+8446
+8447
+8448
+8449
+8450
+8451
+8452
+8453
+8454
+8455
+8456
+8457
+8458
+8459
+8460
+8461
+8462
+8463
+8464
+8465
+8466
+8467
+8468
+8469
+8470
+8471
+8472
+8473
+8474
+8475
+8476
+8477
+8478
+8479
+8480
+8481
+8482
+8483
+8484
+8485
+8486
+8487
+8488
+8489
+8490
+8491
+8492
+8493
+8494
+8495
+8496
+8497
+8498
+8499
+8500
+8501
+8502
+8503
+8504
+8505
+8506
+8507
+8508
+8509
+8510
+8511
+8512
+8513
+8514
+8515
+8516
+8517
+8518
+8519
+8520
+8521
+8522
+8523
+8524
+8525
+8526
+8527
+8528
+8529
+8530
+8531
+8532
+8533
+8534
+8535
+8536
+8537
+8538
+8539
+8540
+8541
+8542
+8543
+8544
+8545
+8546
+8547
+8548
+8549
+8550
+8551
+8552
+8553
+8554
+8555
+8556
+8557
+8558
+8559
+8560
+8561
+8562
+8563
+8564
+8565
+8566
+8567
+8568
+8569
+8570
+8571
+8572
+8573
+8574
+8575
+8576
+8577
+8578
+8579
+8580
+8581
+8582
+8583
+8584
+8585
+8586
+8587
+8588
+8589
+8590
+8591
+8592
+8593
+8594
+8595
+8596
+8597
+8598
+8599
+8600
+8601
+8602
+8603
+8604
+8605
+8606
+8607
+8608
+8609
+8610
+8611
+8612
+8613
+8614
+8615
+8616
+8617
+8618
+8619
+8620
+8621
+8622
+8623
+8624
+8625
+8626
+8627
+8628
+8629
+8630
+8631
+8632
+8633
+8634
+8635
+8636
+8637
+8638
+8639
+8640
+8641
+8642
+8643
+8644
+8645
+8646
+8647
+8648
+8649
+8650
+8651
+8652
+8653
+8654
+8655
+8656
+8657
+8658
+8659
+8660
+8661
+8662
+8663
+8664
+8665
+8666
+8667
+8668
+8669
+8670
+8671
+8672
+8673
+8674
+8675
+8676
+8677
+8678
+8679
+8680
+8681
+8682
+8683
+8684
+8685
+8686
+8687
+8688
+8689
+8690
+8691
+8692
+8693
+8694
+8695
+8696
+8697
+8698
+8699
+8700
+8701
+8702
+8703
+8704
+8705
+8706
+8707
+8708
+8709
+8710
+8711
+8712
+8713
+8714
+8715
+8716
+8717
+8718
+8719
+8720
+8721
+8722
+8723
+8724
+8725
+8726
+8727
+8728
+8729
+8730
+8731
+8732
+8733
+8734
+8735
+8736
+8737
+8738
+8739
+8740
+8741
+8742
+8743
+8744
+8745
+8746
+8747
+8748
+8749
+8750
+8751
+8752
+8753
+8754
+8755
+8756
+8757
+8758
+8759
+8760
+8761
+8762
+8763
+8764
+8765
+8766
+8767
+8768
+8769
+8770
+8771
+8772
+8773
+8774
+8775
+8776
+8777
+8778
+8779
+8780
+8781
+8782
+8783
+8784
+8785
+8786
+8787
+8788
+8789
+8790
+8791
+8792
+8793
+8794
+8795
+8796
+8797
+8798
+8799
+8800
+8801
+8802
+8803
+8804
+8805
+8806
+8807
+8808
+8809
+8810
+8811
+8812
+8813
+8814
+8815
+8816
+8817
+8818
+8819
+8820
+8821
+8822
+8823
+8824
+8825
+8826
+8827
+8828
+8829
+8830
+8831
+8832
+8833
+8834
+8835
+8836
+8837
+8838
+8839
+8840
+8841
+8842
+8843
+8844
+8845
+8846
+8847
+8848
+8849
+8850
+8851
+8852
+8853
+8854
+8855
+8856
+8857
+8858
+8859
+8860
+8861
+8862
+8863
+8864
+8865
+8866
+8867
+8868
+8869
+8870
+8871
+8872
+8873
+8874
+8875
+8876
+8877
+8878
+8879
+8880
+8881
+8882
+8883
+8884
+8885
+8886
+8887
+8888
+8889
+8890
+8891
+8892
+8893
+8894
+8895
+8896
+8897
+8898
+8899
+8900
+8901
+8902
+8903
+8904
+8905
+8906
+8907
+8908
+8909
+8910
+8911
+8912
+8913
+8914
+8915
+8916
+8917
+8918
+8919
+8920
+8921
+8922
+8923
+8924
+8925
+8926
+8927
+8928
+8929
+8930
+8931
+8932
+8933
+8934
+8935
+8936
+8937
+8938
+8939
+8940
+8941
+8942
+8943
+8944
+8945
+8946
+8947
+8948
+8949
+8950
+8951
+8952
+8953
+8954
+8955
+8956
+8957
+8958
+8959
+8960
+8961
+8962
+8963
+8964
+8965
+8966
+8967
+8968
+8969
+8970
+8971
+8972
+8973
+8974
+8975
+8976
+8977
+8978
+8979
+8980
+8981
+8982
+8983
+8984
+8985
+8986
+8987
+8988
+8989
+8990
+8991
+8992
+8993
+8994
+8995
+8996
+8997
+8998
+8999
+9000
+9001
+9002
+9003
+9004
+9005
+9006
+9007
+9008
+9009
+9010
+9011
+9012
+9013
+9014
+9015
+9016
+9017
+9018
+9019
+9020
+9021
+9022
+9023
+9024
+9025
+9026
+9027
+9028
+9029
+9030
+9031
+9032
+9033
+9034
+9035
+9036
+9037
+9038
+9039
+9040
+9041
+9042
+9043
+9044
+9045
+9046
+9047
+9048
+9049
+9050
+9051
+9052
+9053
+9054
+9055
+9056
+9057
+9058
+9059
+9060
+9061
+9062
+9063
+9064
+9065
+9066
+9067
+9068
+9069
+9070
+9071
+9072
+9073
+9074
+9075
+9076
+9077
+9078
+9079
+9080
+9081
+9082
+9083
+9084
+9085
+9086
+9087
+9088
+9089
+9090
+9091
+9092
+9093
+9094
+9095
+9096
+9097
+9098
+9099
+9100
+9101
+9102
+9103
+9104
+9105
+9106
+9107
+9108
+9109
+9110
+9111
+9112
+9113
+9114
+9115
+9116
+9117
+9118
+9119
+9120
+9121
+9122
+9123
+9124
+9125
+9126
+9127
+9128
+9129
+9130
+9131
+9132
+9133
+9134
+9135
+9136
+9137
+9138
+9139
+9140
+9141
+9142
+9143
+9144
+9145
+9146
+9147
+9148
+9149
+9150
+9151
+9152
+9153
+9154
+9155
+9156
+9157
+9158
+9159
+9160
+9161
+9162
+9163
+9164
+9165
+9166
+9167
+9168
+9169
+9170
+9171
+9172
+9173
+9174
+9175
+9176
+9177
+9178
+9179
+9180
+9181
+9182
+9183
+9184
+9185
+9186
+9187
+9188
+9189
+9190
+9191
+9192
+9193
+9194
+9195
+9196
+9197
+9198
+9199
+9200
+9201
+9202
+9203
+9204
+9205
+9206
+9207
+9208
+9209
+9210
+9211
+9212
+9213
+9214
+9215
+9216
+9217
+9218
+9219
+9220
+9221
+9222
+9223
+9224
+9225
+9226
+9227
+9228
+9229
+9230
+9231
+9232
+9233
+9234
+9235
+9236
+9237
+9238
+9239
+9240
+9241
+9242
+9243
+9244
+9245
+9246
+9247
+9248
+9249
+9250
+9251
+9252
+9253
+9254
+9255
+9256
+9257
+9258
+9259
+9260
+9261
+9262
+9263
+9264
+9265
+9266
+9267
+9268
+9269
+9270
+9271
+9272
+9273
+9274
+9275
+9276
+9277
+9278
+9279
+9280
+9281
+9282
+9283
+9284
+9285
+9286
+9287
+9288
+9289
+9290
+9291
+9292
+9293
+9294
+9295
+9296
+9297
+9298
+9299
+9300
+9301
+9302
+9303
+9304
+9305
+9306
+9307
+9308
+9309
+9310
+9311
+9312
+9313
+9314
+9315
+9316
+9317
+9318
+9319
+9320
+9321
+9322
+9323
+9324
+9325
+9326
+9327
+9328
+9329
+9330
+9331
+9332
+9333
+9334
+9335
+9336
+9337
+9338
+9339
+9340
+9341
+9342
+9343
+9344
+9345
+9346
+9347
+9348
+9349
+9350
+9351
+9352
+9353
+9354
+9355
+9356
+9357
+9358
+9359
+9360
+9361
+9362
+9363
+9364
+9365
+9366
+9367
+9368
+9369
+9370
+9371
+9372
+9373
+9374
+9375
+9376
+9377
+9378
+9379
+9380
+9381
+9382
+9383
+9384
+9385
+9386
+9387
+9388
+9389
+9390
+9391
+9392
+9393
+9394
+9395
+9396
+9397
+9398
+9399
+9400
+9401
+9402
+9403
+9404
+9405
+9406
+9407
+9408
+9409
+9410
+9411
+9412
+9413
+9414
+9415
+9416
+9417
+9418
+9419
+9420
+9421
+9422
+9423
+9424
+9425
+9426
+9427
+9428
+9429
+9430
+9431
+9432
+9433
+9434
+9435
+9436
+9437
+9438
+9439
+9440
+9441
+9442
+9443
+9444
+9445
+9446
+9447
+9448
+9449
+9450
+9451
+9452
+9453
+9454
+9455
+9456
+9457
+9458
+9459
+9460
+9461
+9462
+9463
+9464
+9465
+9466
+9467
+9468
+9469
+9470
+9471
+9472
+9473
+9474
+9475
+9476
+9477
+9478
+9479
+9480
+9481
+9482
+9483
+9484
+9485
+9486
+9487
+9488
+9489
+9490
+9491
+9492
+9493
+9494
+9495
+9496
+9497
+9498
+9499
+9500
+9501
+9502
+9503
+9504
+9505
+9506
+9507
+9508
+9509
+9510
+9511
+9512
+9513
+9514
+9515
+9516
+9517
+9518
+9519
+9520
+9521
+9522
+9523
+9524
+9525
+9526
+9527
+9528
+9529
+9530
+9531
+9532
+9533
+9534
+9535
+9536
+9537
+9538
+9539
+9540
+9541
+9542
+9543
+9544
+9545
+9546
+9547
+9548
+9549
+9550
+9551
+9552
+9553
+9554
+9555
+9556
+9557
+9558
+9559
+9560
+9561
+9562
+9563
+9564
+9565
+9566
+9567
+9568
+9569
+9570
+9571
+9572
+9573
+9574
+9575
+9576
+9577
+9578
+9579
+9580
+9581
+9582
+9583
+9584
+9585
+9586
+9587
+9588
+9589
+9590
+9591
+9592
+9593
+9594
+9595
+9596
+9597
+9598
+9599
+9600
+9601
+9602
+9603
+9604
+9605
+9606
+9607
+9608
+9609
+9610
+9611
+9612
+9613
+9614
+9615
+9616
+9617
+9618
+9619
+9620
+9621
+9622
+9623
+9624
+9625
+9626
+9627
+9628
+9629
+9630
+9631
+9632
+9633
+9634
+9635
+9636
+9637
+9638
+9639
+9640
+9641
+9642
+9643
+9644
+9645
+9646
+9647
+9648
+9649
+9650
+9651
+9652
+9653
+9654
+9655
+9656
+9657
+9658
+9659
+9660
+9661
+9662
+9663
+9664
+9665
+9666
+9667
+9668
+9669
+9670
+9671
+9672
+9673
+9674
+9675
+9676
+9677
+9678
+9679
+9680
+9681
+9682
+9683
+9684
+9685
+9686
+9687
+9688
+9689
+9690
