Commit Graph

62 Commits

Author SHA1 Message Date
Joakim Erdfelt 1efe9afdf8
Updating to version 11.0.16-SNAPSHOT 2023-04-11 13:53:30 -05:00
Joakim Erdfelt 5bc5e562c8
Updating to version 11.0.15 2023-04-11 13:37:23 -05:00
Joakim Erdfelt 33bb507751
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-04-02 10:35:03 -05:00
dependabot[bot] 98dbfe17a5
Bump tycho-p2-repository-plugin from 3.0.3 to 3.0.4
Bumps tycho-p2-repository-plugin from 3.0.3 to 3.0.4.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 01:13:22 +00:00
Joakim Erdfelt d1defd0363
Merge remote-tracking branch 'origin/jetty-11.0.x' into release/11.0.14 2023-03-02 04:04:53 -06:00
Joakim Erdfelt fc25648564
Merge pull request #9457 from eclipse/release/10.0.14
Merge `release/10.0.14` back to mainline
2023-03-01 17:14:02 -06:00
Olivier Lamy 22bb0d0788 Updating to version 11.0.15-SNAPSHOT 2023-03-01 18:56:07 +10:00
Olivier Lamy e62cc0344a Updating to version 10.0.15-SNAPSHOT 2023-03-01 18:55:10 +10:00
Joakim Erdfelt 3988bce057
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-02-26 07:27:41 -06:00
dependabot[bot] a224ff0b7b
Bump tycho-p2-repository-plugin from 3.0.2 to 3.0.3
Bumps tycho-p2-repository-plugin from 3.0.2 to 3.0.3.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-24 00:55:03 +00:00
Olivier Lamy ba359956d6 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2023-02-16 10:55:48 +10:00
dependabot[bot] 0ec8457cdf
Bump tycho-p2-repository-plugin from 3.0.1 to 3.0.2
Bumps tycho-p2-repository-plugin from 3.0.1 to 3.0.2.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-15 21:26:46 +00:00
Joakim Erdfelt 260245c012
Updating to version 11.0.14-SNAPSHOT 2022-12-07 15:04:55 -06:00
Joakim Erdfelt a04bd1ccf8
Updating to version 11.0.13 2022-12-07 14:46:29 -06:00
Joakim Erdfelt 54c4c03244
Updating to version 10.0.14-SNAPSHOT 2022-12-07 14:33:17 -06:00
Joakim Erdfelt 1c2636ea05
Updating to version 10.0.13 2022-12-07 14:12:50 -06:00
Simone Bordet 0e99ae0c8a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-12-07 19:16:18 +01:00
Joakim Erdfelt 355eebecc4 Update tycho-p2 from 2.7.5 to 3.0.1
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-12-07 19:15:39 +01:00
Joakim Erdfelt 6b8e23e0dc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-12-07 08:17:53 -06:00
Joakim Erdfelt 3d3c95462a
Fixing OSGi bundle + tycho-p2 build failures (#9017)
* Fixing errors/warnings from maven-bundle-plugin
* avoid issues with eclipse ranges
* Fixing version of p2.core
* revert bach tycho eclipse plugin to last working version 2.7.5

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2022-12-07 07:51:59 -06:00
Joakim Erdfelt 439c594e89
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-02 07:37:48 -05:00
dependabot[bot] 94f43548a0
Bump tycho-p2-repository-plugin from 2.7.5 to 3.0.0 (#8652)
* Bump tycho-p2-repository-plugin from 2.7.5 to 3.0.0

Bumps tycho-p2-repository-plugin from 2.7.5 to 3.0.0.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* activate jetty-p2 module only for jdk 17

Signed-off-by: Olivier Lamy <olamy@apache.org>

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2022-10-02 07:37:34 -05:00
Olivier Lamy 6b1611592d
merge back release branch to bump version to 11.0.13-SNAPSHOT (#8594)
* Updating to version 11.0.12

* Updating to version 11.0.13-SNAPSHOT

* add release jetty-9.4.49.v20220914 and 10.0.12 in VERSION.TXT
2022-09-16 19:50:26 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593)
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
2022-09-16 19:50:12 +10:00
Olivier Lamy fc45d82875 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-09-09 08:53:08 +10:00
dependabot[bot] d71b33c357
Bump tycho-p2-repository-plugin from 2.7.4 to 2.7.5
Bumps tycho-p2-repository-plugin from 2.7.4 to 2.7.5.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-09-08 10:37:58 +00:00
dependabot[bot] 975c93b488
Bump tycho-p2-repository-plugin from 2.7.3 to 2.7.4 (#8305)
Bumps tycho-p2-repository-plugin from 2.7.3 to 2.7.4.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-18 12:33:35 -05:00
dependabot[bot] 132095e8c3
Bump tycho-p2-repository-plugin from 2.7.3 to 2.7.4 (#8309)
Bumps tycho-p2-repository-plugin from 2.7.3 to 2.7.4.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-18 12:33:23 -05:00
Joakim Erdfelt 25d867f362
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-06-30 07:03:32 -05:00
Olivier Lamy db9eb08148
add jetty-osgi dependency to jetty-p2 to be sure it is included (#8034)
* add jetty-osgi dependency to jetty-p2 to be sure it is included

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-30 07:03:20 -05:00
Joakim Erdfelt eddff4d2ee
Merge Release 11.0.11 back into `jetty-11.0.x` (#8193)
* Updating to version 11.0.11

* Updating to version 11.0.12-SNAPSHOT
2022-06-22 16:24:57 -05:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194)
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
2022-06-22 16:24:48 -05:00
Joakim Erdfelt 8149350c10
Merge Release 11.0.10 back into `jetty-11.0.x` (#8181)
* Updating to version 11.0.11-SNAPSHOT
2022-06-21 14:45:00 +02:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180)
* Updating to version 10.0.11-SNAPSHOT
2022-06-21 14:41:41 +02:00
Simone Bordet fe0ee106ab
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-05-23 16:15:17 +02:00
Olivier Lamy 279574a07e
make jetty-p2 depending jetty-home so we sure it's build last even when using -Tx option (#8026)
see https://github.com/eclipse/jetty.project/issues/8021

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-05-20 21:55:59 +10:00
Joakim Erdfelt 2e19783377
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-05-10 06:53:14 -05:00
dependabot[bot] 135896181b
Bump tycho-p2-repository-plugin from 2.7.2 to 2.7.3 (#7972)
Bumps tycho-p2-repository-plugin from 2.7.2 to 2.7.3.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-10 06:15:47 -05:00
dependabot[bot] 2f9ff04d2a
Bump tycho-p2-repository-plugin from 2.7.1 to 2.7.2 (#7942)
Bumps tycho-p2-repository-plugin from 2.7.1 to 2.7.2.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-03 15:40:22 -05:00
dependabot[bot] 594b96c835
Bump tycho-p2-repository-plugin from 2.7.1 to 2.7.2 (#7945)
Bumps tycho-p2-repository-plugin from 2.7.1 to 2.7.2.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-05-03 15:40:10 -05:00
Joakim Erdfelt a546006eea
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-04-11 10:09:31 -05:00
Christoph Läubrich 1eeff0e9b5
Update pom.xml (#7866)
- Enable pgp signatures again
- Update to Tycho 2.7.1
2022-04-10 08:41:07 -05:00
Joakim Erdfelt 16420f0181
Set version to `10.0.10-SNAPSHOT` (#7823)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-04-03 20:33:44 +10:00
Joakim Erdfelt f079949a35
Merge Release 10.0.9 (#7821)
* Updating to version 10.0.9

* Updating to version 10.0.10
2022-04-02 08:43:44 -05:00
Joakim Erdfelt 9548ab0cc9 Updating to version 11.0.10-SNAPSHOT 2022-03-30 13:06:46 -05:00
Joakim Erdfelt 243a48a658 Updating to version 11.0.9 2022-03-30 12:43:51 -05:00
Joakim Erdfelt 89e9ac6aba
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-26 16:03:55 -05:00
Christoph Läubrich 3ab94d700e
Disable PGP signature propagation for now (#7783)
Due to a bug in Tycho invalid PGP signatures are generated. PGP signature propagation should therefore be disabled until fix in Tycho 3.0.0 is available.
2022-03-26 16:03:10 -05:00
Joakim Erdfelt 04356b61ab
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-03-01 16:44:40 -06:00
dependabot[bot] 07c1ec2167
Bump tycho-p2-repository-plugin from 2.6.0 to 2.7.0
Bumps tycho-p2-repository-plugin from 2.6.0 to 2.7.0.

---
updated-dependencies:
- dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-28 09:24:53 +00:00