Commit Graph

38 Commits

Author SHA1 Message Date
Greg Wilkins fe83ea87dc Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-07-04 11:32:33 +10: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 d2df269752
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-05-23 16:38:12 +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 385f00f72b
Merge remote-tracking branch 'jetty-11.0.x' into `jetty-12.0.x` 2022-05-11 16:52:08 -05: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
Greg Wilkins 04acdb72f0 Jetty-12 Restructure
Copied over non ee10 components from the hackathon branch

Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Ludovic Orban <lorban@webtide.com>
Co-authored-by: Olivier Lamy <olamy@webtide.com>
Co-authored-by: Simone Bordet <sbordet@webtide.com>
2022-05-03 15:50:54 +02: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
Simone Bordet 4e02be57fd
Updating to version 11.0.9-SNAPSHOT 2022-02-07 12:42:04 +01:00
Simone Bordet 79cc9cf90e
Updating to version 11.0.8 2022-02-07 12:10:09 +01:00
Simone Bordet a4fda96f49
Updating to version 10.0.9-SNAPSHOT 2022-02-07 12:02:02 +01:00
Simone Bordet 716c7afd8e
Updating to version 10.0.8 2022-02-07 11:34:12 +01:00
Olivier Lamy 9ffec59d5a Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-01-24 07:31:22 +10:00
dependabot[bot] a6026714e2
Bump tycho-p2-repository-plugin from 2.5.0 to 2.6.0
Bumps tycho-p2-repository-plugin from 2.5.0 to 2.6.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-01-21 09:21:32 +00:00
Joakim Erdfelt b67ffd3d2d Updating to version 11.0.8-SNAPSHOT 2021-10-06 15:16:07 -05:00
Joakim Erdfelt 389a358772 Updating to version 11.0.7 2021-10-06 14:58:52 -05:00
Joakim Erdfelt cfc67f86d2 Updating to version 10.0.8-SNAPSHOT 2021-10-06 14:51:32 -05:00
Joakim Erdfelt da8a4553af Updating to version 10.0.7 2021-10-06 14:32:37 -05:00
Olivier Lamy abb7077180 fix new module pom parent version
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-10-01 18:05:45 +10:00
Christoph Läubrich aaaa48c5cc
Issue #6403 - add an automatic generated maven deployable p2 site (#6404)
* Fix 6403 - add an automatic generated maven deployable p2 site

Co-authored-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-10-01 18:03:55 +10:00