Commit Graph

848 Commits

Author SHA1 Message Date
Matthias Sohn b54592c8ee Prepare 6.9.0-SNAPSHOT builds
Change-Id: Id1d784ec4870cfb53c4b140fe0bb3fad9eef651d
2023-12-04 23:02:44 +01:00
Matthias Sohn 796fb2e5c7 Prepare 6.8.1-SNAPSHOT builds
Change-Id: I56458c5345dcd9544868c948e90c9827d25c6850
2023-11-29 16:53:24 +01:00
Matthias Sohn c43560487b JGit v6.8.0.202311291450-r
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: Iecfe3f628cfdc437ee0d63fe52653ef952c8c494
2023-11-29 15:49:43 +01:00
Matthias Sohn 5a717a7054 Update Orbit to orbit-aggregation/2023-12
Change-Id: Ifde28f60461e0a9d7b1278f8f178ceb2c4e1db7a
2023-11-28 23:53:29 +01:00
Matthias Sohn 9a05ca42ba Prepare 6.8.0-SNAPSHOT builds
Change-Id: I89178175549541111cddb88da401899960c0ecac
2023-11-22 01:41:02 +01:00
Matthias Sohn 7bc697dfde JGit v6.8.0.202311212206-rc1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: I6a40cdef68538fa769f4525eb2ff1ed4a810f11c
2023-11-21 23:05:56 +01:00
Matthias Sohn 705e3d686b Update org.apache.commons:commons-compress to 1.25.0
Change-Id: Ic9c6910853ad00075501aa3e03888fefbe634bf6
2023-11-17 01:13:57 +01:00
Matthias Sohn 8af2f785e3 Update bouncycastle to 1.77
Change-Id: I2dc011247ace2eeea8c46587cae55a39be086f36
2023-11-16 14:16:08 -05:00
Matthias Sohn 8db605620b Update jetty to 10.0.18
Change-Id: I34c9f7c062400bb69849812d57390dd2e7b04cac
2023-11-15 22:20:29 +01:00
Thomas Wolf ac0a995975 SSH: bump org.apache.sshd to 2.11.0
Update maven build, bazel build, and target platform.

Also remove a file in a ./bin directory that got committed by mistake
in commit f5f4bf0ad.

Change-Id: Ia653c71643f8fad290874d723dacdafbef25c13f
Signed-off-by: Thomas Wolf <twolf@apache.org>
2023-11-15 21:38:23 +01:00
Matthias Sohn 50d6701334 Update mockito to 5.7.0 and bytebuddy to 1.14.9
Change-Id: I7c93847054050a0af0d2c16e724e5755f9fa33bf
2023-11-09 00:08:42 +01:00
Matthias Sohn 6007371e3a Enable Maven reproducible builds
- configure Maven to run build reproducibly [1]
- use UTC timestamp of checked out commit as build timestamp
- add git-describe, git-commit-id, git-commit-id, git-tags,
  git-remote-origin-url to MANIFEST.MF files
- configure cyclonedx-maven-plugin to also use UTC timestamp of
  checked out commit
- for packaging build use tycho-buildtimestamp-jgit [2] to ensure
  version uses the timestamp of the last commit
- SBOMs are not reproducible by design [3] they should have a build
  timestamp matching the time when the build was executed and a serial
  number which is a unique UUID per build run. Hence exclude them from
  comparison [4].
- Use gmavenplus-plugin to format build timestamps. Maven expects
  build timestamp in ISO-8601 format, to replace the qualifier in
  versions the timestamp format must be compatible with rules for OSGi
  version numbers. Didn't find a way to read the properties set by the
  git-commit-id-maven-plugin from another plugin. Hence use JGit in a
  groovy script to get the commit time of the current HEAD and provide
  it in these two formats.

TODO: packaging build (features and p2 repository) is not yet binary
reproducible since that's not yet supported by Tycho [5], artefacts have
reproducible version numbers but file lastModified timestamps are not
yet reproducible.

Test plan for Maven build:
- build using
  mvn clean install"
- verify second build is reproducible:
  mvn -T1 clean verify artifact:compare
  verification seems not to be thread-safe, hence run it with a single
  thread using option -T1

For packaging build (still fails due to non-reproducible file
timestamps):
- build using
  mvn -f org.eclipse.jgit.packaging/pom.xml clean install
- verify second build is reproducible:
  mvn -T1 -f org.eclipse.jgit.packaging/pom.xml clean verify artifact:compare

[1] https://maven.apache.org/guides/mini/guide-reproducible-builds.html
[2] https://wiki.eclipse.org/Tycho/Reproducible_Version_Qualifiers
[3] https://github.com/CycloneDX/cyclonedx-maven-plugin/issues/84
[4] https://maven.apache.org/plugins/maven-artifact-plugin/compare-mojo.html
[5] https://github.com/eclipse-tycho/tycho/issues/233

Change-Id: I0202f55a1b6ae0edd922cfef638beb39d2ce9417
2023-11-09 00:08:42 +01:00
Matthias Sohn 8ca649c165 Generate SBOMs using cyclonedx maven plugin
and specify JGit's license using its SPDX identifier.

See https://gitlab.eclipse.org/eclipsefdn/emo-team/sbom/-/blob/main/docs/sbom.adoc#sbom-maven

Change-Id: I8f022002c84200ea430325916fa38c3764979c02
2023-10-18 17:04:23 +02:00
Matthias Sohn 0b5d4c3aad Use net.i2p.crypto.eddsa 0.3.0 from new Orbit build
consuming it directly from Maven Central.

The bundle net.i2p.crypto.eddsa 0.3.0 contains bad OSGi metadata,
earlier it was repackaged in Orbit tweaking its mandatory dependency to
sun.security.x509 to an optional dependency.

This project seems to be orphaned, probably because Java 15 added
support for eddsa with JEP339 [1].

This repackaged bundle is no longer available after Orbit was renovated
[2] to consume the vast majority of bundles directly from Maven Central
without repacking them. Hence we have to workaround this (probably
false) mandatory dependency. For that export an empty dummy package
"sun.security.x509" to satisfy OSGi.

[1] https://openjdk.org/jeps/339
[2] https://github.com/eclipse-orbit/orbit-simrel/issues/15

Change-Id: I2267e15823ebce6cf1d448e1e16a129f703e0f80
2023-10-13 21:24:11 +02:00
Matthias Sohn 790fa7e81d Update orbit to orbit-aggregation/2023-12
- add target platform for Eclipse 4.30 (2023-12)
- update org.apache.ant to 1.10.14

Change-Id: Ib7fa7cb79e93ecd6009784bc0ad4269bfa71cb29
2023-10-05 10:30:56 +02:00
Thomas Wolf cf9d054855 Eclipse features: update copyright year
Set upper bound to 2023.

Change-Id: I67acc12b3fe80ab7ca4a9303b0e96325a1e707e9
Signed-off-by: Thomas Wolf <twolf@apache.org>
2023-09-26 19:35:48 +02:00
Matthias Sohn 136b8953e2 Update jetty to 10.0.16
Change-Id: I918e308e71fa978c9f25e3fad63c5f2e94ec3be7
2023-09-22 17:04:19 +02:00
Matthias Sohn 12e9c3f1f6 Update org.apache.commons:commons-compress to 1.24.0
Change-Id: I896298f9e94b50dda6c6396e652f4a191a722a68
2023-09-15 00:55:17 +02:00
Matthias Sohn 8d62e5d04d Update bytebuddy to 1.14.8
Change-Id: I60ad9ea9300099eeabbb5023d7a5264593e60dc0
2023-09-15 00:48:47 +02:00
Matthias Sohn 3a3b72cf90 Prepare 6.8.0-SNAPSHOT builds
Change-Id: Ifc81f0a96c2ced0b25926b9daa539d9cfc951925
2023-09-07 02:24:53 +02:00
Matthias Sohn bb12dd4cbd Prepare 6.7.1-SNAPSHOT builds
Change-Id: I96097ef8c6f198220f513bbc6d5f8881834a1491
2023-09-07 02:03:54 +02:00
Matthias Sohn ea02caf1e7 JGit v6.7.0.202309050840-r
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: Ibe952d97bc178adb909cdd40f48957f5b68af699
2023-09-05 14:41:09 +02:00
Matthias Sohn 43681ee744 Fix list of 3rd party bundles in p2 repo
The jgit p2 repo should contain all 3rd party dependencies needed at
runtime but not dependencies only used in tests.

- remove assertj-core since it's only used in tests
- add org.eclipse.osgi and org.osgi.service.cm which are runtime
  dependencies

Change-Id: Ie789cb8feab0905e7e23aae1d5378e82a0088992
2023-09-04 16:59:52 +02:00
Matthias Sohn ee0b20c641 Add missing source bundle org.osgi.service.cm.source to target platform
Change-Id: I6e61278467ad11d28c08ee6b49e04dac0593f3e6
2023-09-04 16:57:24 +02:00
Matthias Sohn e51a0e51e5 Update mockito to 5.5.0
Change-Id: Ic62864aaf15388b8f20b2db8aa65d1dcf03465a6
2023-08-31 12:08:36 +02:00
Matthias Sohn 24c5d0120b Update byte-buddy to 1.14.7
Change-Id: Iee257eef4cdc3235db6172e19d8d271ff9988fa4
2023-08-31 10:56:32 +02:00
Matthias Sohn c5d8936c80 Prepare 6.7.0-SNAPSHOT builds
Change-Id: I49751232464e70b7d1dc3292a9f36b7a7015e44f
2023-08-30 17:46:26 +02:00
Matthias Sohn c54acc5822 JGit v6.7.0.202308301100-rc1
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: I712a9f6830364ed404d03f3a145c055906273544
2023-08-30 16:57:25 +02:00
Matthias Sohn 2be8bf2b37 Remove the cbi-snapshots Maven repository
since it's not used anymore.

Change-Id: I884c5e5854d6a1f5b104d8d3bb0419e860fa34ca
2023-08-30 14:28:36 +02:00
Matthias Sohn 8995a64295 Update Orbit to orbit-aggregation/release/4.29.0
Switch to bundle dependencies for hamcrest 1.3 to avoid issues with
split packages in that version.

Don't allow hamcrest 2.x yet since junit 4.13.2 still requires hamcrest
1.3.

See Orbit restructuring in
https://github.com/orgs/eclipse-orbit/discussions/49

Change-Id: I8faf519b8f2c4e4a6bd255d694d1aa28017acd85
2023-08-30 14:28:33 +02:00
Matthias Sohn 2a64412e94 Add target platform for Eclipse 2023-09 (4.29)
Change-Id: I62f9bacebf0a2a2cba6ffde7936572e3f05a629c
2023-08-30 14:19:54 +02:00
Matthias Sohn 9fd44e0985 Use release p2 repo for Eclipse 2023-06 (4.28)
Change-Id: I3b8794bdb43db12c2eacda1de27651686c41abf5
2023-08-30 00:11:54 +02:00
Matthias Sohn 2d0a5fa643 Update tycho to 4.0.2
Change-Id: Ib619bc09bf79c0f9e7526c0303606f314e8c1209
2023-08-29 23:22:57 +02:00
Matthias Sohn 46264ba489 Update bouncycastle to 1.76
Change-Id: Ic569f348106e917001fbaa25a302fc20cca56244
2023-08-29 22:12:53 +02:00
Matthias Sohn abe155ea94 Merge branch 'stable-6.6' into stable-6.7
* stable-6.6:
  Update to Tycho 4.0.1
  Add verification in GcKeepFilesTest that bitmaps are generated
  Express the explicit intention of creating bitmaps in GC
  GC: prune all packfiles after the loosen phase
  Prepare 5.13.3-SNAPSHOT builds
  JGit v5.13.2.202306221912-r

Change-Id: I7294c21748897eb3f94eeffbda944b62e3206c0d
2023-08-03 10:17:22 +02:00
Matthias Sohn c64dfe5b49 Update to Tycho 4.0.1
Tycho 4.0.0-SNAPSHOT is no longer available and it's a bad practice to
depend on any snapshot version (we had to since this was the only way
to get gpg signing to work in time for releasing 6.6.0).

Change-Id: I1d4af5f69965b4cad50b379fd81f6f442b38c8d0
2023-08-03 10:12:57 +02:00
Matthias Sohn de7b5b7b26 Prepare 6.7.0-SNAPSHOT builds
Change-Id: I936d2d9106a1e3b7a98ec89fec8ae8a92ec765f2
2023-08-03 00:05:50 +02:00
Matthias Sohn 1d26471c16 JGit v6.7.0.202308011830-m2
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: I255a979e9f48f60a251ef7b74ced3f720f012706
2023-08-02 00:30:01 +02:00
Matthias Sohn eecd93714b Update commons-codec to 1.16.0
Change-Id: I64617b17a168da1966b93c283c150d549477f3e1
2023-07-25 23:22:46 +02:00
Thomas Wolf 8a053b57ad [releng] Use tycho 4.0.0 instead of 4.0.0-SNAPSHOT
Now that it is released there is no need anymore to use a snapshot
version.

Change-Id: Idd35c48022370abf18049ef4b6ddd6253613888e
Signed-off-by: Thomas Wolf <twolf@apache.org>
2023-07-11 18:24:35 +02:00
Matthias Sohn dceebe350e Update mockito to 5.4.0 and bytebuddy to 1.14.5
Change-Id: Ia9de3f9fb6f51ac55a7c551cab4ce199318c1114
2023-07-02 19:16:14 +02:00
Matthias Sohn d443588239 Merge branch 'stable-6.6'
* stable-6.6:
  Update Orbit to R20230531010532 for 2023-06
  Bazel: Fix remote build execution for Java 17
  Bump bazel vesion to 6.2.0

Change-Id: I107eb2cd1ce3cb7670e7418ffd74a7b94ab858a6
2023-07-01 09:13:48 +02:00
Matthias Sohn 00fa17680e Update bouncycastle to 1.75
Change-Id: I7538759005b9a4eb8f1ae9337ce0056500eb7227
2023-06-27 14:43:48 +02:00
Matthias Sohn 8f1693c2dc Update eclipse-jarsigner-plugin to 1.4.2
Change-Id: I3f92a32ccf795ae8c6c4e1699d0040ac84d743c2
2023-06-27 13:42:46 +02:00
Matthias Sohn 6f4f7e911f Update Orbit to R20230531010532 for 2023-06
Change-Id: I844efc4bec153931f0a7b3c694bade4f5b166295
2023-06-09 10:52:45 +02:00
Matthias Sohn ceeb9ad80d Prepare 6.6.1-SNAPSHOT builds
Change-Id: I0036999e2be076d4ad8231410faeff51bf9cbf52
2023-05-30 17:24:58 +02:00
Matthias Sohn d3962e0e72 JGit v6.6.0.202305301015-r
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Change-Id: I33b45b0cf36835b289ecbb5a1a9fc4ad7fc200cd
2023-05-30 16:11:53 +02:00
Matthias Sohn a9520419e2 Merge branch 'stable-6.6'
* stable-6.6:
  Update to Orbit S20230516204213
  Prepare 6.6.0-SNAPSHOT builds
  JGit v6.6.0.202305241045-m3
  Prepare 6.6.0-SNAPSHOT builds
  JGit v6.6.0.202305031100-m2

Change-Id: Ibceebbce6aebba7a8670de41eb39eb23b14b8c74
2023-05-25 23:09:17 +02:00
Matthias Sohn cae6d4e6b1 Update to Orbit S20230516204213
Change-Id: I4daae47b8d2e244b78dff5ca072e41153e7e6734
2023-05-24 18:24:21 +02:00
Matthias Sohn 264b91c3ee Prepare 6.6.0-SNAPSHOT builds
Change-Id: If0e4e8ce5f3e2f5170f313fb9b26b4ec0e34dab9
2023-05-24 18:23:45 +02:00