Commit Graph

891 Commits

Author SHA1 Message Date
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:07:46 +02:00
Simone Bordet ebeb6dd21b Point to jetty:help when redeployment is disabled.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-06 12:05:12 +02:00
Simone Bordet f575c65016 Merge branch 'inform-user-default-scan-mode' of git://github.com/dana-whitelow/jetty.project into dana-whitelow-inform-user-default-scan-mode 2021-05-06 11:59:57 +02:00
Jan Bartel f05fc25900
Issue #6153 Swap order of jetty maven plugin jvmArgs for EXTERNAL (#6155)
* Issue #6153 Swap order of jetty maven plugin jvmArgs for EXTERNAL

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-04-29 11:18:38 +10:00
Olivier Lamy 1294222797
Upgrade commons-io 2.7 (copy of https://github.com/eclipse/jetty.project/pull/6213) (#6216)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-04-27 15:59:18 +10:00
zahid 35b64fadd7 inform user of default scane mode and restructure wording 2021-04-16 19:35:56 +01:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Jan Bartel 56864bd43d
Issue #6020 Fix redeploy error jetty-maven-plugin (#6023)
* Issue #6020 Fix redeploy error jetty-maven-plugin

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-10 10:11:34 +01:00
Joakim Erdfelt 1cb0a4978f
Merge pull request #6022 from eclipse/jetty-10.0.x-better-xml-path-resolution
Issue #6021 - PoC for resolvePath within XmlConfiguration
2021-03-03 12:24:25 -08:00
Jan Bartel 9d40a754aa Use EXTERNAL mode for jetty-maven-plugin test.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-03 11:35:52 +01:00
Jan Bartel 76580d537a
Fix move from DISTRO to HOME for jetty-maven-plugin mode (#5991)
* Use mode EXTERNAL rather than HOME or DISTRO

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-03 11:28:53 +01:00
Joakim Erdfelt 613e0ecd54
Issue #6021 - PoC for resolvePath within XmlConfiguration
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-02 14:40:36 -06:00
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
olivier lamy 5fee0123d3 restore file deleted by mistake 40b42c9388
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-19 20:56:31 +10:00
Joakim Erdfelt 40b42c9388
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 16:09:11 -06:00
Joakim Erdfelt d6ec96fe1b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-15 14:18:08 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 12:48:24 -06:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Jan Bartel 8fd2e588a7
Issue #5763 Fix TestJettyEmbedded test (#5764)
* Issue #5763 Fix TestJettyEmbedded test

Signed-off-by: Jan Bartel <janb@webtide.com>

* Better test directory usage

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-14 10:19:31 +01:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Jan Bartel 4883332593 Issue #5086 Review and rework o.e.j.util.Scanner
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-01 14:58:18 +01:00
olivier lamy 54924213e8 make this test dynamic instead of hardcoded version...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-27 13:26:00 +10:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Joakim Erdfelt 390fa83d8e
Remove dead /jetty-spring/ module
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-20 12:12:20 -06:00
Joakim Erdfelt 6b82637624
Merge pull request #5629 from eclipse/dependabot/maven/jetty-9.4.x/org.apache.maven.shared-maven-artifact-transfer-0.12.0
Bump maven-artifact-transfer from 0.11.0 to 0.12.0
2020-11-11 10:35:14 -06:00
Lachlan Roberts 6934b94261 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-11 14:21:58 +11:00
dependabot[bot] 5ed40b251c
Bump maven-artifact-transfer from 0.11.0 to 0.12.0
Bumps [maven-artifact-transfer](https://github.com/apache/maven-artifact-transfer) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/apache/maven-artifact-transfer/releases)
- [Commits](https://github.com/apache/maven-artifact-transfer/compare/maven-artifact-transfer-0.11.0...maven-artifact-transfer-0.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-10 11:53:07 +00:00
Lachlan Roberts 4c172b5bbb Fix xml <Ref/> tags using id instead of refid.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:30:36 +11:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
Joakim Erdfelt 05f08fec4c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-20 17:35:56 -05:00
Joakim Erdfelt 227dd47157
Issue #5480 - Fail in jetty-maven-plugin if unable to create temp directory.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 16:29:22 -05:00
Joakim Erdfelt fc45286bab
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-09 13:36:42 -05:00
Joakim Erdfelt 72c5ed0ff7
Bumping gcloud from 1.0.0 to 1.105.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-08 14:59:34 -05:00
Joakim Erdfelt f66d7bd71f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-08 14:57:34 -05:00
Joakim Erdfelt ef0618489a
Fixing EOL on groovy (again) 2020-10-08 14:50:02 -05:00
dependabot[bot] 7018e21632
Bump maven-artifact-transfer from 0.11.0 to 0.12.0
Bumps [maven-artifact-transfer](https://github.com/apache/maven-artifact-transfer) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/apache/maven-artifact-transfer/releases)
- [Commits](https://github.com/apache/maven-artifact-transfer/compare/maven-artifact-transfer-0.11.0...maven-artifact-transfer-0.12.0)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-05 06:25:41 +00:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358)
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:02:32 -05:00
Joakim Erdfelt efb3216d59
Fixing bad EOL on groovy files
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-28 08:25:56 -05:00
Joakim Erdfelt b56733915b
Issue #5264 - identifying optional deps in jetty-home
+ Done to ease dependency / exclusions listing requirements
   elsewhere in the reactor.
   (Prevents accidental discovered components from
    triggering actions during use of jetty-home
    as a dependency)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 17:50:50 -05:00
Joakim Erdfelt 09d159d038
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5264-demo-modules 2020-09-23 15:38:49 -05:00
Joakim Erdfelt f7cf41109b
Issue #5264 - Fixing jetty-maven-plugin exclusions for demos
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-23 15:29:25 -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
Chris Walker 70c8822eef
Updated module descriptions for consistency. Resolves #5313 2020-09-23 13:10:47 -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 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
Joakim Erdfelt 33286db44b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5133-webappcontext-extraclasspath-cleanup 2020-09-22 12:24:01 -05:00
Joakim Erdfelt 63736990c5
Issue #5264 - Changing Distro to Home in jetty-maven-plugin
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-22 11:35:15 -05: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
Greg Wilkins 780e1207c7
Issue #5254 List/Show modules (#5257)
* Issue #5254 List/Show modules

 * simplified --list-modules output
 * added --show-module

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improve module descriptions

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-09-14 18:07:16 +02:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167)
* Issue #4996 Regularize logging

Signed-off-by: Jan Bartel <janb@webtide.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-24 17:15:13 +02: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
Lachlan Roberts c09e4d6f86 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 08:46:29 +10:00
Lachlan Roberts de1b6745c5 the DO NOT EDIT comment in .mod files should start with '#'
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 16:47:22 +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 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
Lachlan Roberts ce7ef4396f Issue #4913 - jetty-maven-plugin recursively delete target jetty-base
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-27 14:05:36 +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
Greg Wilkins 2addb6a655
Jetty 10.0.x use HandlerList instead of HandlerCollection (#4757)
* Use HandlerList instead of HandlerCollection

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Use HandlerList instead of HandlerCollection

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-04-15 18:42:28 +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
olivier lamy 5c2e0b32a4 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-04-02 12:32:22 +10:00
Olivier Lamy ea06ba1865
Issue #4699 fix jar files from multimodules not scanned (#4742)
* Issue #4699 fix jar files from multimodules not scanned

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

* fix license headers

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-02 08:06:10 +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 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
Greg Wilkins e35b3b29d6
Issue #4656 generalise XmlConfiguration elements (#4661)
* Issue #4656 generalise XmlConfiguration elements

Extended the use of Id, Class elements

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4657 Validation in XmlConfiguration

Default to validate if xerces is in the name
Fixed test harness to prepend DTD.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4657 Validation in XmlConfiguration

WIP on adding validation to XMLs

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #4656 - Fix bad xml id attribute usage in jetty-maven-plugin

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-17 09:38:21 +01: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
Joakim Erdfelt 8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00
Joakim Erdfelt a304fd9f35 Updating to version 9.4.27.v20200227 2020-02-27 12:21:57 -06:00
Lachlan Roberts 55748f12c2 Issue #4581 - remove unnecessary javadoc on Override methods
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 11:33:56 +11:00