Commit Graph

26506 Commits

Author SHA1 Message Date
Jan Bartel f1e39433e8 Fix context paths for some ee10 and ee8 demos 2022-10-06 14:59:07 +11:00
Olivier Lamy eb9d07378a
move flatten mojo configuration in top pom, fix boms and remove non needed content (#8686)
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-10-06 06:50:45 +10:00
Jan Bartel b85f904520
Re-enable and fix loginservice tests ee10 (#8683) 2022-10-06 07:33:51 +11:00
Joakim Erdfelt 4c74dac122
Fixing left-over ee10 replace -> replaceAll javascript usages 2022-10-05 15:31:55 -05:00
Joakim Erdfelt 9a7ce7a1f1
Fixing jackson-databind use in maven-plugins 2022-10-05 15:24:49 -05:00
Joakim Erdfelt 04dd551919
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-10-05 13:04:56 -05:00
Joakim Erdfelt b37c1fe311
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-05 13:04:18 -05:00
Joakim Erdfelt f8a6a0f5bc
Merge pull request #8687 from eclipse/fix/jetty-10-javascript-replace
Fix bad Javascript `replace` usage in demos / test
2022-10-05 13:03:56 -05:00
Joakim Erdfelt 1e13cf4069
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-10-05 09:28:58 -05:00
Joakim Erdfelt 7497f9ec05
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-10-05 09:24:16 -05:00
Joakim Erdfelt 9b94bcd340
Merge pull request #8684 from eclipse/jetty-10.0.x-jackson-bom
Issue #8576 use jackson bom
2022-10-05 09:22:58 -05:00
Joakim Erdfelt d3050dee7b
Fix bad js replace in demos / test
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-10-05 09:13:57 -05:00
Simone Bordet 7ed59f46c8
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-05 12:16:02 +02:00
Simone Bordet 76b6f9cfe7
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-05 11:51:37 +02:00
Simone Bordet ecea0e6d0a
Fixes #7993 - HttpClient idleTimeout configuration being ignored/over… (#8672)
* Fixes #7993 - HttpClient idleTimeout configuration being ignored/overridden

The problem was that the timeout scheduling was not happening,
because for TunnelRequest the timeouts were set in normalizeRequest(),
which runs after the scheduling.

Now a call to request.sent() is made also after normalizeRequest()
so that the timeouts is scheduled (if it was not scheduled before).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-05 11:46:00 +02:00
Simone Bordet 58f0e0744b Fixes #8584 - HttpRequest.send() never returns
Fixed handling of the idle timeout in case the SOCKS proxy does not reply to the SOCKS bytes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-05 11:45:13 +02:00
Lachlan ccb2cc0637
Merge pull request #8682 from eclipse/jetty-10.0.x-jetty-start-expand-properties
expand jetty properties when generating dry-run command line
2022-10-05 14:21:03 +11:00
Olivier Lamy 01b4d5c0d1
Issue #8576 use jackson bom
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-10-04 18:11:02 +10:00
Lachlan 05a4b96632
Merge pull request #8621 from eclipse/jetty-12.0.x-CachedContentFactory
Fix Caching ContentFactories in Jetty-12
2022-10-04 18:57:29 +11:00
Lachlan Roberts 7e85c2a54c add distribution test to reproduce issue with dry-run
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-04 17:43:02 +11:00
Lachlan Roberts f60bbf3b11 expand jetty properties when generating dry-run command line
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-04 17:17:33 +11:00
Jan Bartel f76df2c1bc Reenable test 2022-10-04 11:01:11 +11:00
Joakim Erdfelt 03ec361b57
Fixing bad osgi merge from 10.0.x 2022-10-03 12:14:49 -05:00
Simone Bordet a3f2268766
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-03 18:28:36 +02:00
Simone Bordet acc14a841a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-03 17:51:01 +02:00
Simone Bordet 8e63e872f7 Fixes a test tagged as "external" that
fails during local builds with Java 17+.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-10-03 17:50:33 +02: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
dependabot[bot] 3128e45545
Merge pull request #8649 from eclipse/dependabot/maven/jetty-11.0.x/org.infinispan.protostream-protostream-4.5.0.Final 2022-10-02 09:20:35 +00: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
dependabot[bot] a427d7622d
Bump grpc-core from 1.49.0 to 1.49.2 (#8677)
Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.49.0 to 1.49.2.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.49.0...v1.49.2)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
  dependency-type: direct:production
  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-02 00:00:48 -05:00
dependabot[bot] b679cff3e2
Bump infinispan-bom from 11.0.15.Final to 11.0.16.Final (#8661)
Bumps [infinispan-bom](https://github.com/infinispan/infinispan) from 11.0.15.Final to 11.0.16.Final.
- [Release notes](https://github.com/infinispan/infinispan/releases)
- [Changelog](https://github.com/infinispan/infinispan/blob/main/Jenkinsfile-release)
- [Commits](https://github.com/infinispan/infinispan/compare/11.0.15.Final...11.0.16.Final)

---
updated-dependencies:
- dependency-name: org.infinispan:infinispan-bom
  dependency-type: direct:production
  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-02 00:00:36 -05:00
dependabot[bot] 6248e70955
Merge pull request #8642 from eclipse/dependabot/maven/jetty-10.0.x/org.eclipse.platform-org.eclipse.osgi.services-3.11.0 2022-10-02 00:49:44 +00:00
Olivier Lamy 2b7ad6a477
Merge pull request #8674 from eclipse/jetty-10.0.x-codeql-log-readable-with-batch-mode
codeql make log readable with using batch mode -B
2022-10-02 10:31:52 +10: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
dependabot[bot] 8f9bac6939
Bump grpc-core from 1.49.0 to 1.49.2 (#8673)
Bumps [grpc-core](https://github.com/grpc/grpc-java) from 1.49.0 to 1.49.2.
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.49.0...v1.49.2)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-core
  dependency-type: direct:production
  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 17:30:23 -05:00
dependabot[bot] b1a4b54078
Bump protostream from 4.4.4.Final to 4.5.0.Final (#8655)
Bumps [protostream](https://github.com/infinispan/protostream) from 4.4.4.Final to 4.5.0.Final.
- [Release notes](https://github.com/infinispan/protostream/releases)
- [Commits](https://github.com/infinispan/protostream/compare/4.4.4.Final...4.5.0.Final)

---
updated-dependencies:
- dependency-name: org.infinispan.protostream:protostream
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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 17:30:05 -05:00
dependabot[bot] 8034674400
Bump protostream from 4.4.4.Final to 4.5.0.Final
Bumps [protostream](https://github.com/infinispan/protostream) from 4.4.4.Final to 4.5.0.Final.
- [Release notes](https://github.com/infinispan/protostream/releases)
- [Commits](https://github.com/infinispan/protostream/compare/4.4.4.Final...4.5.0.Final)

---
updated-dependencies:
- dependency-name: org.infinispan.protostream:protostream
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-01 20:15:47 +00: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
dependabot[bot] 9f0725259d
Bump asciidoctorj from 2.5.5 to 2.5.6 (#8650)
Bumps [asciidoctorj](https://github.com/asciidoctor/asciidoctorj) from 2.5.5 to 2.5.6.
- [Release notes](https://github.com/asciidoctor/asciidoctorj/releases)
- [Changelog](https://github.com/asciidoctor/asciidoctorj/blob/v2.5.6/CHANGELOG.adoc)
- [Commits](https://github.com/asciidoctor/asciidoctorj/compare/v2.5.5...v2.5.6)

---
updated-dependencies:
- dependency-name: org.asciidoctor:asciidoctorj
  dependency-type: direct:production
  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:31 -05:00
dependabot[bot] 651b51c8ae
Bump maven-jar-plugin from 3.2.2 to 3.3.0 (#8666)
Bumps [maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.2 to 3.3.0.
- [Release notes](https://github.com/apache/maven-jar-plugin/releases)
- [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.2...maven-jar-plugin-3.3.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-jar-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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:08:33 -05:00
dependabot[bot] 2475277c95
Bump infinispan-bom from 11.0.15.Final to 11.0.16.Final (#8664)
Bumps [infinispan-bom](https://github.com/infinispan/infinispan) from 11.0.15.Final to 11.0.16.Final.
- [Release notes](https://github.com/infinispan/infinispan/releases)
- [Changelog](https://github.com/infinispan/infinispan/blob/main/Jenkinsfile-release)
- [Commits](https://github.com/infinispan/infinispan/compare/11.0.15.Final...11.0.16.Final)

---
updated-dependencies:
- dependency-name: org.infinispan:infinispan-bom
  dependency-type: direct:production
  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:08:18 -05:00
dependabot[bot] f6e3ca756e
Bump mariadb-java-client from 3.0.7 to 3.0.8 (#8658)
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.0.7 to 3.0.8.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.0.7...3.0.8)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  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:08:08 -05:00
dependabot[bot] c6f118ecc8
Bump jetty-test-helper from 5.9 to 6.0 (#8636)
* Bump jetty-test-helper from 5.9 to 6.0

Bumps [jetty-test-helper](https://github.com/eclipse/jetty.toolchain) from 5.9 to 6.0.
- [Release notes](https://github.com/eclipse/jetty.toolchain/releases)
- [Commits](https://github.com/eclipse/jetty.toolchain/compare/jetty-test-helper-5.9...jetty-test-helper-6.0)

---
updated-dependencies:
- dependency-name: org.eclipse.jetty.toolchain:jetty-test-helper
  dependency-type: direct:production
  update-type: version-update:semver-major
...

* Fixing broken testcase

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-10-01 15:07:42 -05:00
dependabot[bot] 7eafcd6867
Merge pull request #8648 from eclipse/dependabot/maven/jetty-10.0.x/org.testcontainers-testcontainers-bom-1.17.4 2022-10-01 13:00:18 +00:00
Olivier Lamy 3565d60f08
make log readable with using batch mode -B
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-10-01 19:36:00 +10:00
Olivier Lamy f3c28c86e6
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-10-01 19:30:59 +10:00