Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,210 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

1707 Commits

Author SHA1 Message Date
Joakim Erdfelt 3544283865 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	Jenkinsfile
#	jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/ReadState.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ReadStateTest.java
#	tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
 2019-08-14 09:39:06 -05:00
Joakim Erdfelt cbe34d9bc2 Revert "Jetty 9.4.x release faster (no need of triggering plugins already triggered) (#3944)" 
+ Breaks the release build.
  javadoc and source artifacts lack gpg signatures

This reverts commit 50aa1cf786.
 2019-08-13 16:05:35 -05:00
olivier lamy 072de1ba3c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-13 10:22:25 +10:00
Olivier Lamy 02c247be5f
include test sources in checkstyle report (#3948) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-13 10:20:55 +10:00
Simone Bordet 20bbeeebdf Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-12 17:47:02 +02:00
Simone Bordet 76612ea7ca Updated dependency to h2spec to 0.6. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-12 17:38:34 +02:00
Simone Bordet 62758122c3 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-10 00:39:54 +02:00
Olivier Lamy 50aa1cf786
Jetty 9.4.x release faster (no need of triggering plugins already triggered) (#3944) 
* source:jar javadoc:jar are already triggered by eclipse-release profile so no need to call directly as it add more jars to deploy :)

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

* no need of sources jar in release profile as it is already part of normal build, and use jar-no-fork in normal to avoid forking another lifecycle

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

* no need of triggering gpg plugin again as it is part of the release-jetty.sh script

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-09 11:24:31 +10:00
Greg Wilkins dc939d753a
Issue #3804 - Update Decorator integration for various CDI implementations (#3838) 
* Jetty Issue #3804 WELD-2587

Support CDI integration:
 + cdi2 module exposes jetty APIs
 + cdi module uses DecorationListener

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

* Jetty Issue #3804 WELD-2587

Remove DecoratingListener tests from test-jetty-webapp

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

* improve CDI test

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

* Jetty Issue #3804 WELD-2587

Reverted test to use released CDI and cdi2 module for now.
To test new mechanism, you need to build the weld snapshot locally,
rebuild and switch to cdi module

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

* remove cdi2 webapp references

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

* document attribute

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

* improved documentation

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

* logging

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

* improved javadoc

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

* Fixed version

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

* Reverted to also provide the DecoratingListener in the decorate module.
Renamed cdi-demo to weld-cdi-demo

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

* revert from Weld SNAPSHOT

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

* test all 3 weld integrations

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

* updated destory implementation to release creationalcontext

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

* reverted to released Weld version

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

* Issue #3804 CDI integration

dispose and release context in destroy

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

* Improved CDI module documentation

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

* WIP on OWB

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

* Updates from review
Parameterised CDITests

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

* share webapp resources for cdi webapp test

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

* Initialize OWB with a SCI so that listeners can be decorated

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

* Added OwbDecorator so that cdi2 module can be tested with OWB

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

* Lookup attribute name

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

* Cleanups

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

* Cleanup from Review

Don't do lazy bindings

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

* Cleanup from Review

Treat partial CDI same as no CDI

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

* fix maven it test no more need of weld-servlet

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

* cleanup it parent pom removing non needed weld servlet

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

* upgraded to Weld 3.1.2.Final

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

* Cleanup from Review

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

* Cleanup from Review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-08 04:04:07 +02:00
Olivier Lamy 0a1722d652
order test and cleanup map (#3932) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-06 11:10:41 +10:00
olivier lamy e398ecebe1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-05 17:25:03 +10:00
olivier lamy ab015f2653 timestamped snapshot are cleaned up on apache repo so definitely not to use 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-05 17:24:12 +10:00
olivier lamy 5be9f1a927 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-02 13:46:45 +10:00
Joakim Erdfelt 755317573e Skip large file test if not enough disk space available. (#3928) 
* Skip large file test if not enough disk space available.

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

* Being consistent with cleanup.

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

* Limping along with known semi-working invoker plugin

* back to normal maven-invoker-plugin configuration for local build, on CI use provided settings by Jenkins to keep using mirror

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-02 13:27:11 +10:00
Joakim Erdfelt 302341f9c9 Limping along with known semi-working invoker plugin 2019-08-01 13:13:04 -05:00
olivier lamy f67504c4da Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-01 17:47:37 +10:00
Olivier Lamy b7fdf9f9f3
upgrade to junit 5.5.1 (#3925) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-01 17:46:06 +10:00
olivier lamy ae004171e0 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-30 11:21:31 +10:00
Olivier Lamy 1b6bf389d6
Jetty 9.4.x pax exam upgrade for central repo https, pre download all artifacts for maven its (#3902) 
* ensure we use local repository first to avoid download, upgrade pax versions
pre download artifacts to avoid download by maven invoker its

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

* force using local repository first see https://issues.apache.org/jira/browse/MINVOKER-249

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

* use local setttings to use mirrors

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

* use https

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

* install build resources first to avoid checkstyle build issue

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

* downgrade pax-swissbox-framework as the pax exam seems to use this one and want to download it...

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

* fix enforcer rule RequireUpperBoundDeps...

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

* not used anymore

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

* force pax url to use provided settings via Jenkins withMvn

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

* renove debugging System.out

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

* version is defined in the project

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

* cleanup after Jan review comments

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-30 11:13:54 +10:00
olivier lamy ba05117a0d use build-resources released version 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-22 21:23:04 +10:00
Simone Bordet 40fc4ef340 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2019-07-20 19:56:14 +02:00
Simone Bordet 6a0a2883ad Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2019-07-20 19:51:12 +02:00
Simone Bordet baa325d56c Updated ALPN version for JDK 8u221 and 8u222. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-07-20 19:43:20 +02:00
olivier lamy d0963178d4 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-18 17:06:38 +10:00
Olivier Lamy 4ebf4b7477
Jetty 9.4.x invoker maven plugin use junit result files (#3887) 
* invoker plugin can now generate junit report file so use that to ease reading of results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-18 16:46:59 +10:00
Olivier Lamy 71268ae687
make jetty-all build tested by ci build to avoid issue at release time (#3867) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-12 09:51:42 +10:00
olivier lamy 6df9ef3a15 Updating to version 10.0.0-SNAPSHOT 2019-07-12 06:54:56 +10:00
olivier lamy 8cbfd51e80 Updating to version 10.0.0-alpha0 2019-07-12 06:54:56 +10:00
Olivier Lamy 9923fdfefc
Jetty 10.0.x fix dependency in jetty-all (#3864) 
* fix wrong dependency

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-11 20:16:57 +10:00
olivier lamy a34e641a27 Updating to version 10.0.0-SNAPSHOT 2019-07-11 17:20:27 +10:00
olivier lamy 2e58f2f515 Updating to version 10.0.0-alpha0 2019-07-11 14:19:45 +10:00
olivier lamy 3082d5a4cf disable all version name rule enforcer.. 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-11 14:13:53 +10:00
olivier lamy 9d92221a34 not using osgi rules for jetty 10 alpha/beta versions 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-11 13:59:34 +10:00
olivier lamy 30513f9afc Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-10 20:20:33 +10:00
Olivier Lamy 3c14ceab27
avoid transitive depdency on a range version which can failed the build... (#3862) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-10 20:19:06 +10:00
olivier lamy 4df544afc6 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-07-09 12:57:26 +10:00
olivier lamy 0362595a40 javadoc plugin version 3.1.1 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-07 19:44:03 +10:00
olivier lamy d545fca96e test with last javadoc plugin snapshot 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-28 10:03:33 +10:00
Olivier Lamy 38a3a51a54
Jetty 10.0.x javadoc fix (testing javadoc plugin SNAPSHOT) (#3831) 
* fix javadoc generation with jdk11

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

* currently disable javadoc:aggregate-jar as do not work yet

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-28 10:00:57 +10:00
olivier lamy 69b6160445 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-06-27 07:04:06 +10:00
olivier lamy 8a6d25fe25 suppression of generated files must work for ide as well 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-27 07:01:18 +10:00
olivier lamy 943d123798 checkstyle will only check our source files and not generated jmh etc.. 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-27 07:01:18 +10:00
olivier lamy b54dbcff63 fix merge 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-27 07:01:18 +10:00
olivier lamy 2443423eff simplify checkstyle check with not using site generation but only check as jenkins only need checkstyle result 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-27 07:01:18 +10:00
olivier lamy 484c7538d6 fix version of build-resources module 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-27 07:01:18 +10:00
Joakim Erdfelt c97403fb0d Merge branch `jetty-9.4.x` into `jetty-10.0.x` 2019-06-25 16:01:02 -05:00
Joakim Erdfelt 81894fb4ed Using property based lookup for Checkstyle suppressions filter. 
+ This is to be maximally compatible across all plugins and scenarios
  where the Checkstyle suppressions filter can be used.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-24 13:58:23 -05:00
Greg Wilkins b7a7a53a18
Jetty 10.0.x reformat (#3812) 
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Removing Legacy Method Separators
* Restyling branch `jetty-10.0.x`
* Applying checkstyle changes
* Applying checkstyle changes
* Applying XML restyling
* Restyling XML in branch `jetty-10.0.x`
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Fixing XML restyling in branch `jetty-10.0.x`
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Revert "Restyling XML in branch `jetty-10.0.x`"

# Conflicts:
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithAttr.xml
#	jetty-xml/src/test/resources/org/eclipse/jetty/xml/configureWithElements.xml

* Adding back build-resources
* Reformatting pom.xml files
* Disabling Checkstyle job
* fixed empty string on line wrap
* reformatted with latest intellij style
* misc checkstyle fixes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-24 17:42:39 +02:00
Greg Wilkins 9706d70484
Jetty 9.4.x reformat (#3811) 
* Removing Legacy Method Separators
* Restyling branch `jetty-9.4.x`
* Applying changes highlighted by checkstyle
* Applying XML restyling
* Fixing XML codestyle for IntelliJ
* Fixing XML style mistakes
* Revert "Applying XML restyling"
* Updating checkstyle for XML codestyle
* Reformatting pom.xml files
* Fixed empty string from line wraps
* Update intellij style to not do expression relative formatting. Reformatted code based on that.
* Increasing line split on Eclipse IDE Formatter to 512
* Restoring setting on internal default value.
+ IntelliJ will not export settings on things that set to their
  internal default values.
  We want to keep those values as a hedge against future default
  value changes in future releases of IntelliJ.
* Fixing intellij codestyle
* do not allow single line simple methods
* misc checkstyle fixes
* re-exported with correct name and all values

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-24 17:40:30 +02:00
Greg Wilkins e2193a303b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-23 10:50:47 +02:00