Commit Graph

1944 Commits

Author SHA1 Message Date
Joakim Erdfelt ca7db8be32
Moving /examples/ to /demos/
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-24 10:39:13 -05:00
Joakim Erdfelt f7dedd8e7d
Addressing javadoc aggregate issues under JPMS
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-24 09:04:28 -05:00
Joakim Erdfelt 9bce085291
Skipping gcloud module for javadoc-aggregate
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-24 06:56:32 -05:00
Joakim Erdfelt 35bca82e35
Issue #5264 - Addressing (some) aggregate-javadoc issues
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 20:20:27 -05:00
Joakim Erdfelt 23b6eca489
Issue #5264 - More javadoc skippedModules
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 17:04:04 -05:00
Joakim Erdfelt 413eb4ccfe
Issue #5264 - Javadoc processing excludes for demos
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 16:44:34 -05:00
Joakim Erdfelt faf6d80390
Issue #5264 - Moving demo webapps to /demos/ tree
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 13:35:19 -05:00
Greg Wilkins 55f1046c81 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5264-demo-modules 2020-09-23 18:48:17 +02:00
Joakim Erdfelt ccec28e7d4
Issue #5317 - Remove jetty-all from Jetty 10
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 10:35:50 -05:00
Greg Wilkins eedcac314b Merge branch 'jetty-10.0.x' into jetty-10.0.x-5264-demo-modules 2020-09-23 15:27:56 +02:00
olivier lamy 6c2a44ed54 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-09-23 17:25:40 +10:00
olivier lamy 730a442499 use last jacoco plugin version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-23 17:20:12 +10:00
olivier lamy a2cd9b3a50 fix maven plugin starting distribution as jetty home has different name, configure invoker plugin to be faster when running locally
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-23 17:18:22 +10:00
Simone Bordet 35305b6a5c Improvements to the Jetty documentation.
Reworked the start documentation.

Started skeleton of the operations guide.
Removed old_docs/deploying/hot-deployment.adoc and
old_docs/gettingstarted/getting-started/jetty-deployment.adoc,
since its content has been moved to the refactored documentation.

Restructured the skeleton of the operations guide.
Removed old_docs/deploying/anatomy-of-a-webapp.adoc,
since its content has been moved to the refactored documentation.

Removed old_docs/deploying/automatic-webapp-deployment.adoc,
since its content has been moved to the refactored documentation.

Removed old_docs/deploying/configuring-virtual-hosts.adoc,
since its content has been moved to the refactored documentation.

Removed old_docs/contexts/serving-webapps-from-particular-port.adoc
and example-jetty-embedded/src/main/resource/jetty-otherserver.xml,
since its content has been moved to the refactored documentation.

Simplified POMs.
Simplified index.adoc files, refactoring common things into config.adoc.

Expanded the deploy configuration documentation.
Expanded the protocols configuration documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-09-22 19:28:43 +02:00
Olivier Lamy 00d403170d
Jetty 10.0.x upgrade last schemas (#5298)
* jetty servlet api 4.0.4-SNAPSHOT

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* jetty servlet api 4.0.4

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix it

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-22 07:12:32 +10:00
Joakim Erdfelt d0b8a31411
Issue #5264 - Disabling jetty-distribution from build reactor
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-21 13:56:50 -05:00
olivier lamy 8a36c18c7c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-09-18 06:27:46 +10:00
Olivier Lamy 53f3bbd32d
upgrade ant dependencies version to 1.10.8 to avoid security warning (#5275)
* upgrade ant dependency version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* ant 1.10.8
2020-09-18 06:25:04 +10:00
Olivier Lamy ccab123f20 h2s spec maven plugin 1.0.0 with h2spec 2.6.0 (#5231)
* use our fork of h2spec-maven-plugin and upgrade version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-14 21:07:53 +10:00
Olivier Lamy 3849a9118f
h2s spec maven plugin 1.0.0 with h2spec 2.6.0 (#5231)
* use our fork of h2spec-maven-plugin and upgrade version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* add a profile to run spec server

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use h2spec plugin new version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* version h2spec 1.0.0

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* exclude specs we know not working

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use our own package name

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* test no exclusion

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* restore known failure

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* h2spec maven plugin version 1.0.0

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* change default port for manual testing

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-14 21:01:10 +10:00
dependabot[bot] b1b48060ef
Bump exec-maven-plugin from 1.6.0 to 3.0.0 (#5262)
Bumps [exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 1.6.0 to 3.0.0.
- [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/exec-maven-plugin/compare/exec-maven-plugin-1.6.0...exec-maven-plugin-3.0.0)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-14 20:13:34 +10:00
Olivier Lamy 26d50c8e29
Jetty 9.4.x not skipping tests failure and fix jaas test (#5255)
* remove -Dmaven.test.failure.ignore=true

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* get JAASLdapLoginServiceTest working

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* increase memory

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use only single thread to have more readable log in Jenkins

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* disable java8

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* test only java8

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* increase memory

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* try -T3

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* restore jdk11/14

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* try more memory

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* archive logs from Jenkins

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* archive logs from Jenkins

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* more memory

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* skip jacoco

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* test useManifestOnlyJar true

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* junit

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* useManifestOnlyJar false

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* debug maven surefire

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* very simple build to debug

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* try M5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* try not using withMaven

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* no debug surefire M4

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* all jdk and M5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* enable jacoco only for java8

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* reduce memory usage for test

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* avoid duplications of warnings parsing

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix my bad

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-11 13:11:04 +10:00
dependabot[bot] 4ee0abaf0e
Bump tycho-version from 1.4.0 to 2.0.0 (#5239)
Bumps `tycho-version` from 1.4.0 to 2.0.0.

Updates `tycho-pack200a-plugin` from 1.4.0 to 2.0.0

Updates `tycho-pack200b-plugin` from 1.4.0 to 2.0.0

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-09 06:26:32 +10:00
Joakim Erdfelt d331f6acce
Merge pull request #5238 from eclipse/dependabot/maven/jmh.version-1.25.2
Bump jmh.version from 1.25.1 to 1.25.2
2020-09-08 09:54:39 -05:00
gregw d7b3d62982 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-09-07 15:59:27 +02:00
olivier lamy 03836c8d7f revert back to surefire 3.0.0-M4
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-07 21:24:02 +10:00
dependabot[bot] 40db081523
Bump jmh.version from 1.25.1 to 1.25.2
Bumps `jmh.version` from 1.25.1 to 1.25.2.

Updates `jmh-core` from 1.25.1 to 1.25.2

Updates `jmh-generator-annprocess` from 1.25.1 to 1.25.2

Signed-off-by: dependabot[bot] <support@github.com>
2020-09-07 06:22:49 +00:00
dependabot[bot] c53868b325
Bump jmh.version from 1.21 to 1.25.1 (#5211)
Bumps `jmh.version` from 1.21 to 1.25.1.

Updates `jmh-core` from 1.21 to 1.25.1

Updates `jmh-generator-annprocess` from 1.21 to 1.25.1

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-02 07:04:41 +10:00
dependabot[bot] 89511635a4
Bump jnr-unixsocket from 0.24 to 0.34 (#5190)
* Bump jnr-unixsocket from 0.24 to 0.34

Bumps [jnr-unixsocket](https://github.com/jnr/jnr-unixsocket) from 0.24 to 0.34.
- [Release notes](https://github.com/jnr/jnr-unixsocket/releases)
- [Commits](https://github.com/jnr/jnr-unixsocket/compare/jnr-unixsocket-0.24...jnr-unixsocket-0.34)

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

* fix upperBound dependency

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-09-02 06:50:10 +10:00
Jan Bartel ad9d702adb
Issue #2609 - Uniform Find Expired Sessions (#5097)
* Issue #2609 Make all session stores use same algorithm to find expired sessions

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-08-31 12:39:30 +02:00
dependabot[bot] 85bd78ae34
Bump derbytools from 10.14.2.0 to 10.15.2.0
Bumps derbytools from 10.14.2.0 to 10.15.2.0.

Signed-off-by: dependabot[bot] <support@github.com>
2020-08-24 07:03:00 +00:00
Jan Bartel 728daadd92
Issue #5178 Update to asm8.0.1 (#5179)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-08-21 10:39:46 +02:00
Lachlan 471a06dc37
Merge pull request #5154 from eclipse/jetty-10.0.x-SurefireUpdateWebSocketFailure
Fix WebSocketServerExamplesTest to work after maven surefire update
2020-08-17 09:45:52 +10:00
olivier lamy 3998d87d0f Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-08-15 09:13:28 +08:00
Olivier Lamy 2d9fcf20ea
upgrade some maven plugins version (#5143)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-15 10:32:01 +10:00
Lachlan Roberts de1077c375 Fix WebSocketServerExamplesTest to work with surefire update
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-13 22:04:56 +10:00
olivier lamy 320f850a4b revert to surefire M4 as jmps changes break our build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-13 17:02:39 +08:00
Joakim Erdfelt e1e8e50112
Merge pull request #5130 from eclipse/jetty-9.4.x-remove-overlay-deployer
Remove long dead jetty-overlay-deployer module
2020-08-12 10:04:43 -05:00
olivier lamy 495a1cb109 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-08-12 09:49:06 +08:00
Olivier Lamy 12667497e1
Jetty 9.4.x surefire 3.0.0 m5 (#5136)
* test surefire 3.0.0-M5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* simplify code to avoid some timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-12 10:27:12 +10:00
Joakim Erdfelt a700708165
Removing dead maven modules
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-11 08:30:34 -05:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
Joakim Erdfelt 980ad4c666
Reverting accidental upgrade to surefire
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-22 14:38:33 -05:00
Joakim Erdfelt 1b5268b511
Issue #5069 - Fixing assumeConnectTimeout test condition
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-07-21 16:04:27 -05:00
olivier lamy 3ddccfe4bc support gh token for github api
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:12:03 +10:00
olivier lamy eefe3d202b revert fail release
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
Joakim Erdfelt e1c8a0e8b8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-25 12:52:29 -05:00
Joakim Erdfelt cb898ac74a
Bumping up to Checkstyle 8.29
+ This is in response to a dependabot notification
  of vulnerabilities in Checkstyle 8.20

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-06-25 09:24:36 -05:00
olivier lamy f326ad065d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-06-20 12:05:14 +10:00
Olivier Lamy a644a4b390
no need of creating/attaching sources twice for release as it is done in the default build (and we do not need forking a lifecycle for that) (#4938)
* no need of creating/attaching sources twice for release as it is done in the default build

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* comment

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* no need to fork a lifecycle when attaching sources files

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-19 12:47:46 +10:00
Simone Bordet 0b854a1f5f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-06-18 15:37:09 +02:00
olivier lamy f745d5d5df remove unused imports and upgrade testcontainers.version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-15 17:40:15 +10:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
olivier lamy c48aee0a54 maven war plugin 3.3.0
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-06-11 10:08:41 +10:00
Jan Bartel 74a2ce7a42
Issue #4826 Upgrade to apache jsp 8.5.54 (#4932)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-06-03 10:04:55 +02:00
Jan Bartel 42155e889b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-01 14:47:07 +02:00
olivier lamy ab0d5e7121 simplify release script to not call goals already triggered by eclipse-release profile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-31 09:04:59 +10:00
olivier lamy d6c77a8a44 fix merge from 9.4.x
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 20:41:15 +10:00
olivier lamy 65dbcc7c86 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 18:26:08 +10:00
olivier lamy c05bd6c26d use testcontainers/docker to run jdbc sessions tests with Mariadb remote
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 16:00:23 +10:00
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00
olivier lamy 9c7d36fd51 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-16 20:03:09 +10:00
Jan Bartel 74a506161d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-05-13 12:13:29 +02:00
Jan Bartel 6527b3b083
Issue #4868 update asm 7.3.1 (#4869)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-05-13 12:12:14 +02:00
olivier lamy 33abe753de Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-11 15:41:51 +10:00
olivier lamy 933ab641ee test helper 5.4
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-11 15:38:15 +10:00
olivier lamy 8771360425 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-08 11:02:14 +10:00
olivier lamy cba05a3db0 increase surefire memory
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 11:00:49 +10:00
olivier lamy 972cd95ec0 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-08 10:21:41 +10:00
Olivier Lamy 78992a126c
Start a mongo instance for testing using docker via java code (#4840)
* remove slow mongo maven plugin which was forking an external process and now run mongodb in a container so we can even now test with different version using -Dmongo.docker.version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 07:06:03 +10:00
olivier lamy 72cb9bf3d8 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-04-22 15:14:43 +10:00
olivier lamy 32aa5d6453 not sure if it is used but at least we will not hit this repo when building
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-22 14:52:14 +10:00
Simone Bordet be4cbd69c1 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-04-19 16:50:04 +02:00
Simone Bordet fe7f71fda1 Excluding the "external" tests to make builds in Jenkins more reliable.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-19 16:47:49 +02:00
Simone Bordet 15f7e0671b Issue #4443 - Track backport of ALPN APIs to Java 8.
Removed Java 8 profiles, not needed anymore.
Jetty 9.4.x requires Java 9+ to be built, in order to build Java 9 specific modules.
The ALPN boot jar used in tests was either replaced by the ALPN agent or the tests only run in Java 9+.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-18 16:21:36 +02:00
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
Simone Bordet 2969a0a7af Do not emit compilation warnings for test sources.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-26 18:01:27 +01:00
Joakim Erdfelt 2c600f2b68
Issue #4685 - Mark jetty-slf4j-impl as test scope by default
+ Update logging in test-hazelcast-sessions
+ Update logging in test-infinispan-sessions

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 09:55:15 -05:00
Olivier Lamy 0541c5efb4
fix javadoc aggregate generation by using last maven javadoc plugin 3.2.0 (#4675)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-19 07:06:13 +10:00
Simone Bordet b22c0b196f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-18 17:00:01 +01:00
Simone Bordet 6df47dd183 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4443-alpn-backport-8u252'. 2020-03-18 10:57:23 +01:00
Simone Bordet 8a5fc6375b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-17 23:42:29 +01:00
Simone Bordet 785b640327 Fixes #2896 - Wrong Certificate Selected When Using Multiple Virtual Host Names in Conscrypt
Updating to a Conscrypt version that supports this feature.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 23:40:38 +01:00
Simone Bordet 9bb92f81bd Issue #4443 - Track backport of ALPN APIs to Java 8.
Modified jetty-alpn-openjdk8-* classes to support both
pre 8u252 (via alpn-boot) and post 8u252 (via standard API).

Replaced usages of -Xbootclasspath with -javaagent, and
using Jetty ALPN Agent jar rather than Jetty ALPN boot jar.

Removed all alpn-1.8.0*.mod files since now it is
possible to use a fixed version of the ALPN Agent
to cover all the versions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:40:29 +01:00
Joakim Erdfelt 57604d0955
Issue #4572 - Mechanical Change to use org.slf4j
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 15:48:25 -05:00
Joakim Erdfelt 8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
       org.eclipse.jetty.util.log.Logger but as
  simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
  to org.eclipse.jetty.logging.StacklessLogging found in
  the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
  + and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
  + Also adding note to jetty-util classes that are used by
    jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 11:21:54 -05:00
olivier lamy 1c4a21c9be Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-03-09 14:28:53 +10:00
Olivier Lamy 3a77542303
upgrade shade plugin and align version (#4639)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-05 09:10:12 +10:00
olivier lamy 77a54c21a1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-03-03 20:53:26 +10:00
Olivier Lamy 3a8b45d20c
Issue #4619 align derby version (#4626)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 10:20:27 +10:00
Joakim Erdfelt 8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00