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

1678 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 3030ccb2df Merge branch 'jetty-9.4.x-checkstyle' into jetty-9.4.x 2019-06-22 09:00:15 -05:00
Joakim Erdfelt c7b6110267 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-21 16:05:17 -05:00
Simone Bordet 2a2a11cd2e Improvements after merge. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-13 10:23:55 +02:00
Simone Bordet 790051556f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-13 10:03:54 +02:00
Olivier Lamy 370a85b921
Jetty 9.4.x aggregate javadoc fix (#3780) 
* fix javadoc plugin configuration fixing searchbox when navigating to class found, as jetty 10 has module defined we probably do not need to merge this to 10 except other parameters

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-13 11:28:22 +10:00
Joakim Erdfelt ae21126cad Updating to version 9.4.20-SNAPSHOT 2019-06-10 13:40:17 -05:00
Joakim Erdfelt afcf563148 Updating to version 9.4.19.v20190610 2019-06-10 11:17:56 -05:00
Simone Bordet bf53925cfb Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-06 17:58:49 +02:00
Olivier Lamy 8f4cdf1c83
upgrade log4j2 version and fix log4j2.xml provided sample (#3721) 
* upgrade log4j2 version and fix log4j2.xml provided sample, add disruptor if users wants to use async logging

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-06 20:44:41 +10:00
Jan Bartel 4340a382e5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-05-28 13:40:06 +02:00
Jan Bartel 73b417a116
Issue #3690 Upgrade to asm 7.1 (#3691) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-05-28 13:39:14 +02:00
Greg Wilkins b0bc9c9200 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-05-17 16:47:45 +02:00
olivier lamy 699026b08d upgrade maven plugins and configure clean plugin version 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-14 11:09:32 +10:00
Simone Bordet c578798370 Fixes #3197 - Use jetty specific websocket API jar. 
Introduced jetty-javax-websocket-api artifact with proper
OSGi manifest entries and JPMS Automatic-Module-Name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-05-10 19:33:12 +02:00
Joakim Erdfelt 8246011020 Initial /build-resources/ with jetty-checkstyle.xml 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-08 10:57:15 -05:00
Joakim Erdfelt 52bb963186 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	aggregates/jetty-all-compact3/pom.xml
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
#	jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
#	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
#	jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
#	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
#	jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
#	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
#	jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
#	jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
#	jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
#	pom.xml
#	tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
#	tests/test-http-client-transport/pom.xml
#	tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
 2019-05-01 15:02:31 -05:00
Joakim Erdfelt e33dfabba9 Moving to IPv6 Assumption (from junit Group/Tag) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-30 12:26:14 -05:00
Joakim Erdfelt 2b93a4e7ea Updating jetty-test-helper + junit5 + hamcrest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-30 12:23:55 -05:00
Joakim Erdfelt 734be56938 Updating to version 9.4.19-SNAPSHOT 2019-04-29 16:27:23 -05:00
Joakim Erdfelt e1bc35120a Updating to version 9.4.18.v20190429 2019-04-29 15:40:33 -05:00
Greg Wilkins f28bfa9377 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-04-29 13:21:59 +02:00
Joakim Erdfelt 29b960551f Merge branch `release-9.4.17` into `jetty-9.4.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-bom/pom.xml
 2019-04-25 09:15:42 -05:00
Jan Bartel 12ff78e06a Issue #3564 Update to apache jsp 9.0.19 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-04-25 08:38:26 +02:00