Commit Graph

1666 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
Joakim Erdfelt fc06feab6b
Bump osgi.util.promise to 1.3.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-04-02 08:45:15 -05:00
Joakim Erdfelt 64b8a7fa2e
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi-3.18.300' into fix/10.0.x/dependabot-rollup-2023-april 2023-04-02 06:39:48 -05:00
dependabot[bot] 7e588c87ab
Bump org.eclipse.osgi.util from 3.7.100 to 3.7.200
Bumps [org.eclipse.osgi.util](https://github.com/eclipse-equinox/equinox) from 3.7.100 to 3.7.200.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.util
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 01:08:35 +00:00
dependabot[bot] 6d30eaeaec
Bump org.eclipse.osgi from 3.18.200 to 3.18.300
Bumps [org.eclipse.osgi](https://github.com/eclipse-equinox/equinox) from 3.18.200 to 3.18.300.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-04-01 01:01:21 +00: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
Jan Bartel 135f14f0d0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-02-22 15:35:57 +11:00
Jan Bartel b7075161d0 Fix osgi dependencies for update to org.eclipse.osgi.services. 2023-02-22 15:21:22 +11:00
gregw 7cfc239990 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: gregw <gregw@webtide.com>
2023-02-15 15:27:17 +11:00
gregw 7a7d69a69f Happy no year
Remove modification date from copyright notice and instead just have the
project inception year.

Signed-off-by: gregw <gregw@webtide.com>
2023-02-15 15:22:32 +11:00
Olivier Lamy 2d734cbe18
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-12-28 20:58:15 +10:00
Olivier Lamy cebf97375f
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-12-28 16:45:05 +10:00
dependabot[bot] ae7ff8de71
Bump org.eclipse.osgi.services from 3.11.0 to 3.11.100
Bumps [org.eclipse.osgi.services](https://github.com/eclipse-equinox/equinox) from 3.11.0 to 3.11.100.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.services
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-28 06:41:43 +00:00
dependabot[bot] a6437020ea
Merge pull request #9102 from eclipse/dependabot/maven/jetty-10.0.x/org.apache.aries.spifly-org.apache.aries.spifly.dynamic.bundle-1.3.6 2022-12-28 06:40:41 +00:00
dependabot[bot] 112c5fa217
Bump org.apache.aries.spifly.dynamic.bundle from 1.3.5 to 1.3.6
Bumps org.apache.aries.spifly.dynamic.bundle from 1.3.5 to 1.3.6.

---
updated-dependencies:
- dependency-name: org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-28 04:37:54 +00:00
dependabot[bot] 1303944f86
Bump org.eclipse.osgi from 3.18.100 to 3.18.200
Bumps [org.eclipse.osgi](https://github.com/eclipse-equinox/equinox) from 3.18.100 to 3.18.200.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-12-28 04:36:03 +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
Joakim Erdfelt 03ec361b57
Fixing bad osgi merge from 10.0.x 2022-10-03 12:14:49 -05:00
Joakim Erdfelt e06c134482
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-02 00:03:12 -05:00
Joakim Erdfelt fe016baa1a
Merge remote-tracking branch 'origin/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi.services-3.11.0' into dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi.services-3.11.0
# Conflicts:
#	jetty-osgi/pom.xml
2022-10-01 18:17:03 -05:00
Joakim Erdfelt 838fefd6c0
Fixing osgi deps
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-10-01 18:16:22 -05:00
Joakim Erdfelt 8867b9198a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-01 15:14:17 -05:00
dependabot[bot] b8aa7e462b
Bump org.eclipse.osgi.services from 3.10.200 to 3.11.0
Bumps [org.eclipse.osgi.services](https://github.com/eclipse-equinox/equinox) from 3.10.200 to 3.11.0.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.services
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-01 20:11:41 +00:00
dependabot[bot] 28afa8ab22
Bump org.eclipse.osgi.util from 3.7.1 to 3.7.100 (#8662)
Bumps [org.eclipse.osgi.util](https://github.com/eclipse-equinox/equinox) from 3.7.1 to 3.7.100.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.util
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-10-01 15:09:43 -05:00
Olivier Lamy f3c28c86e6
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-10-01 19:30:59 +10:00
dependabot[bot] 70dc01840b
Bump org.eclipse.osgi.services from 3.10.200 to 3.11.0
Bumps [org.eclipse.osgi.services](https://github.com/eclipse-equinox/equinox) from 3.10.200 to 3.11.0.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.services
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-01 09:29:56 +00:00
dependabot[bot] 0fe6fa7592
Bump org.eclipse.osgi from 3.18.0 to 3.18.100
Bumps [org.eclipse.osgi](https://github.com/eclipse-equinox/equinox) from 3.18.0 to 3.18.100.
- [Release notes](https://github.com/eclipse-equinox/equinox/releases)
- [Commits](https://github.com/eclipse-equinox/equinox/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-01 06:16:23 +00: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 228b58e345 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-09-02 14:51:07 +10:00
Olivier Lamy 6b1eb1486b
remove some unused plugins from poms (#8534)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-09-02 14:25:46 +10:00
Joakim Erdfelt 252539d77d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-18 12:39:14 -05:00
Olivier Lamy 9149945945
simplify pom by using simple property rather than xml fragment (#7580)
* simplify pom by using simple property rather than xml fragment

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-14 09:42:28 +10:00
Greg Wilkins b57e7eafdd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-07 23:11:11 +10:00
dependabot[bot] 93be234873
Merge pull request #8247 from eclipse/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi.util-3.7.1 2022-07-06 23:49:30 +00:00
Jan Bartel 764499a828 Add other dependencies introduced by org.eclipse.osgi.util upgrade 2022-07-07 08:11:40 +10:00
Joakim Erdfelt 26c44f4033
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-07-01 16:25:50 -05:00
dependabot[bot] 4251d965a0
Bump org.eclipse.osgi.util from 3.6.100 to 3.7.1
Bumps [org.eclipse.osgi.util](https://github.com/eclipse-equinox/equinox.binaries) from 3.6.100 to 3.7.1.
- [Release notes](https://github.com/eclipse-equinox/equinox.binaries/releases)
- [Commits](https://github.com/eclipse-equinox/equinox.binaries/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi.util
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:07:41 +00:00
dependabot[bot] 3f4ff748bb
Bump org.eclipse.osgi from 3.17.200 to 3.18.0
Bumps [org.eclipse.osgi](https://github.com/eclipse-equinox/equinox.binaries) from 3.17.200 to 3.18.0.
- [Release notes](https://github.com/eclipse-equinox/equinox.binaries/releases)
- [Commits](https://github.com/eclipse-equinox/equinox.binaries/commits)

---
updated-dependencies:
- dependency-name: org.eclipse.platform:org.eclipse.osgi
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-01 02:05:31 +00: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