Skip to main content
aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2023-09-12OSGi: move plugin localization to subdirectoryThomas Wolf1-1/+1
OSGi can have its plugin localization at an arbitrary place; there is no need to have it in a top-level plugin.properties file. In non-OSGi environments having the files at the root level may mean that these files clash with each other, or, as in the referenced bug, with some third-party plug-in's plugin.properties, which may not even have anything to do with localization. Move our OSGi localization to a subfolder OSGI-INF/l10n. For OSGi environments, that's just as good, and for non-OSGi environments it avoid clashes with other root level items on the classpath or in a fat JAR. For fragments, use neither plugin.properties (which would clash with the host plug-in's plugin.properties) nor fragment.properties (which might clash with other fragments for the same fragment host bundle). Instead use names "relative" to the host bundle. Bug: 582394 Change-Id: Ifbcd046d912e2cfe86c0f7259c5ca8de599d9aa1 Signed-off-by: Thomas Wolf <twolf@apache.org>
2023-09-07Prepare 6.8.0-SNAPSHOT buildsMatthias Sohn1-24/+24
Change-Id: Ifc81f0a96c2ced0b25926b9daa539d9cfc951925
2023-09-07Prepare 6.7.1-SNAPSHOT buildsMatthias Sohn1-24/+24
Change-Id: I96097ef8c6f198220f513bbc6d5f8881834a1491
2023-09-05JGit v6.7.0.202309050840-rv6.7.0.202309050840-rMatthias Sohn1-1/+1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Ibe952d97bc178adb909cdd40f48957f5b68af699
2023-08-30Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn1-1/+1
Change-Id: I49751232464e70b7d1dc3292a9f36b7a7015e44f
2023-08-30JGit v6.7.0.202308301100-rc1v6.7.0.202308301100-rc1Matthias Sohn1-1/+1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I712a9f6830364ed404d03f3a145c055906273544
2023-08-02Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn1-1/+1
Change-Id: I936d2d9106a1e3b7a98ec89fec8ae8a92ec765f2
2023-08-01JGit v6.7.0.202308011830-m2v6.7.0.202308011830-m2Matthias Sohn1-1/+1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I255a979e9f48f60a251ef7b74ced3f720f012706
2023-05-24Prepare 6.7.0-SNAPSHOT buildsMatthias Sohn1-24/+24
Change-Id: I50ff7ee31046cfc29a087c8963be3deae24b1c9c
2023-03-01Prepare 6.6.0-SNAPSHOT buildsMatthias Sohn1-24/+24
Change-Id: I17893f9db12bcb208866f40a06cd4f1ccbb4fe30
2022-11-23Prepare 6.5.0-SNAPSHOT buildsMatthias Sohn1-24/+24
Change-Id: I4238b6181e96e22e540cf34802a332f868cb6dfb
2022-09-14Prepare 6.4.0-SNAPSHOT buildsMatthias Sohn1-24/+24
Change-Id: I47ca5f1d0263caa0bfc7c303042360c6c5ac4dec
2022-09-12Prepare 6.3.1-SNAPSHOT buildsMatthias Sohn1-24/+24
Change-Id: I44e159eca4131880d74d3078060e7e20f9b5ce76
2022-09-07JGit v6.3.0.202209071007-rv6.3.0.202209071007-rMatthias Sohn1-1/+1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: Iea3fae9f6f6c5fb0a79f7684334a3e0059738c4f
2022-09-07JGit v6.3.0.2022009070944-rMatthias Sohn1-1/+1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I3cc78dbcf8c7970e80bf1499751611110ec2b30b
2022-08-17Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn1-1/+1
Change-Id: Ie398b651c5308ec86812bf01fcc563d3e679c828
2022-08-16JGit v6.3.0.202208161710-m3v6.3.0.202208161710-m3Matthias Sohn1-1/+1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com> Change-Id: I0954d11a1f35eff196b157df3aa8386476c48a7e
2022-06-06Prepare 6.3.0-SNAPSHOT buildsMatthias Sohn1-24/+24
Change-Id: I092fdd2c35d85bf35e3ef700aa7078e6d304d977
2022-03-12Fix MANIFEST.MF in the LFS bundlesThomas Wolf1-0/+1
Somehow new dependencies added in commit a229072f got lost when merging stable-6.1 into master. Change-Id: I19c16c6be73d07e05f37241a44cf25133ff467a5 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2022-03-03Prepare 6.2.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: Ic2dde88bee3242169d6fa50956f8938f3fc4ba8e
2021-11-24Prepare 6.1.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: Ied07b1298bd32672a5025cec5079440ab9b9a100
2021-09-29Bump minimum required Java version to 11Matthias Sohn1-1/+1
Bug: 569917 Change-Id: Ifdcdb022a3f29321b4d10da1cc34acca68ed7b03 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2021-02-27Merge branch 'master' into nextMatthias Sohn1-2/+0
* master: (143 commits) Prepare 5.11.0-SNAPSHOT builds JGit v5.11.0.202102240950-m3 [releng] japicmp: update last release version IgnoreNode: include path to file for invalid .gitignore patterns FastIgnoreRule: include bad pattern in log message init: add config option to set default for the initial branch name init: allow specifying the initial branch name for the new repository Fail clone if initial branch doesn't exist in remote repository GPG: fix reading unprotected old-format secret keys Update Orbit to S20210216215844 Add missing bazel dependency for o.e.j.gpg.bc.test GPG: handle extended private key format dfs: handle short copies [GPG] Provide a factory for the BouncyCastleGpgSigner Fix boxing warnings GPG: compute the keygrip to find a secret key GPG signature verification via BouncyCastle Post commit hook failure should not cause commit failure Allow to define additional Hook classes outside JGit GitHook: use default charset for output and error streams ... Change-Id: I689f4070e79f4a0ac1c02b35698ccaab68ad2f34
2021-01-18Correct the minimum required version of Apache httpclientThomas Wolf1-2/+0
org.eclipse.jgit.http.apache uses several features that exist only since httpclient 4.4, but its MANIFEST.MF still had a lower bound of 4.3.0. Bump this to 4.4.0 for all packages from httpclient. 4.3.0 for the packages from httpcore is fine. Do a similar clean-up in the other bundles using packages from Apache httpclient (http.test, lfs, lfs.server, lfs.server.test) Bug: 570451 Change-Id: Iffdde2a9bd0d65db2e5201a08cffbf03597e2866 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
2021-01-12Update orbit to S20210105214148 and com.google.gson to 2.8.6Matthias Sohn1-2/+2
Also fix target name of jgit-4.18 target. Change-Id: Ib5a13281398e7c5589de2e4a34fae0d08346db9c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2020-12-02Prepare 5.11.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I91e5532526775191fbd34f81e2ef777cba605e3b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2020-08-27Prepare 5.10.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I9a2b39e9e85f27179ceb3b1709d75c466089a3bc Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2020-06-09Prepare 5.9.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: Ia998e2772df1285a4c674b07201f15d53156eb78 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2020-03-09Prepare 5.8.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I056b45806a82eae80177932e42e3dc806015351a Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2020-02-23Prepare 6.0.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Purpose of the next branch is preparation of breaking changes before we know when we will release it. Bump the version to the next major release 6.0.0-SNAPSHOT in order to prevent build results compete with build results from the version currently used on the master branch (5.7.0-SNAPSHOT). Bug: 560424 Change-Id: Iba64a0124f5bfc167098d829a7ef29650948e2d0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-12-05Prepare 5.7.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I7efa0cd08dee711d6fefc3e6bb478a3cb11fe85c Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-08-29Prepare 5.6.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I9eceb7b1272b27b979144041c75eb09ab4eeca6b Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-06-21Fix bundle localization of Apache SSH bundleMichael Keppler1-2/+2
The placeholders in manifest and plugin.properties did not match. To avoid similar issues, all placeholders have been changed to Bundle-Vendor and Bundle-Name now. Bug:548503 Change-Id: Ibd4b9bc237b323e614506b97e5fbc99416365040 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
2019-06-13Prepare 5.5.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I177d637e552a79014816dc5d2ef5ccda506adb39 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-06-12Prepare 5.4.1-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I8620d03c1cd5c1d0ad04e7607553e9aa18def9bb Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-06-12JGit v5.4.0.201906121030-rv5.4.0.201906121030-rMatthias Sohn1-1/+1
Change-Id: Ie68828af68d07cf8e3fe778d39436f539f1c73d0 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-06-12JGit v5.4.0.201906120450-rMatthias Sohn1-1/+1
Change-Id: Iea17cba848d4e53d69d34e952a2476c375721aa4 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-22Prepare 5.4.0-SNAPSHOT buildsMatthias Sohn1-1/+1
Change-Id: I9df6fccee253d4087f9afab4cb46e0a40b8a5699 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-22JGit v5.4.0.201905221418-m3v5.4.0.201905221418-m3Matthias Sohn1-1/+1
Change-Id: I8a7e687acfcf8c341abd726ae60b5ee173422215 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-15Prepare 5.4.0-SNAPSHOT buildsMatthias Sohn1-1/+1
Change-Id: Ieb4b049972509631f06b5268a90f432a1b9ee207 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-05-08JGit v5.4.0.201905081430-m2v5.4.0.201905081430-m2Matthias Sohn1-1/+1
Change-Id: I535a98d8ef507d3c8cda7b0f042a2ae835da1279 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2019-03-06Prepare 5.4.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I90a4791f63d0eba23da744c720e869f1830b86e7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-12-03Prepare 5.3.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I8951c2cf650cc3e41d2baa0b330b94468cfed5c2 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-09-06Prepare 5.2.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: If8e8ca20e745901a5e0239c16cb4acc7934b4ec8 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-05-23Prepare 5.1.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I8523a993ae1f7b62573d7547273bc1356bf64fa7 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-03-08Prepare 5.0.0-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: I2d2f50ed8a12f310e7cac68eed5536bd460c403f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-03-08Prepare 4.11.1-SNAPSHOT buildsMatthias Sohn1-23/+23
Change-Id: Id9aa6b7e8f56de5183b6cd57ef0e790ec9debd4d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-03-08JGit v4.11.0.201803080745-rv4.11.0.201803080745-rMatthias Sohn1-1/+1
Change-Id: Ie24a33bc8a24c30db06fe7b175f405efb95776ec Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-03-03LFS: support merge/rebase/cherry-pick/diff/compare with LFS filesMarkus Duft1-0/+2
Respect merge=lfs and diff=lfs attributes where required to replace (in memory) the content of LFS pointers with the actual blob content from the LFS storage (and vice versa when staging/merging). Does not implement general support for merge/diff attributes for any other use case apart from LFS. Change-Id: Ibad8875de1e0bee8fe3a1dffb1add93111534cae Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
2018-02-27LFS: pre-push upload supportMarkus Duft1-0/+3
If JGit built in LFS support is enabled for the current repository (or user/system), any existing pre-push hook will cause an exception for the time beeing, as only a single pre-push hook is supported. Thus either native pre-push hooks OR JGit built-in LFS support may be enabled currently, but not both. Change-Id: Ie7d2b90e26e948d9cca3d05a7a19489488c75895 Signed-off-by: Markus Duft <markus.duft@ssi-schaefer.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

Back to the top