072de1ba3c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-13 10:22:25 +10:00
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
20bbeeebdf
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-08-12 17:47:02 +02:00
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
62758122c3
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-08-10 00:39:54 +02:00
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
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
0a1722d652
order test and cleanup map ( #3932 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-08-06 11:10:41 +10:00
e398ecebe1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-05 17:25:03 +10:00
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
5be9f1a927
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-02 13:46:45 +10:00
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
302341f9c9
Limping along with known semi-working invoker plugin
2019-08-01 13:13:04 -05:00
f67504c4da
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-08-01 17:47:37 +10:00
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
ae004171e0
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-30 11:21:31 +10:00
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
ba05117a0d
use build-resources released version
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-22 21:23:04 +10:00
40fc4ef340
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2019-07-20 19:56:14 +02:00
6a0a2883ad
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2019-07-20 19:51:12 +02:00
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
d0963178d4
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-18 17:06:38 +10:00
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
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
6df9ef3a15
Updating to version 10.0.0-SNAPSHOT
2019-07-12 06:54:56 +10:00
8cbfd51e80
Updating to version 10.0.0-alpha0
2019-07-12 06:54:56 +10:00
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
a34e641a27
Updating to version 10.0.0-SNAPSHOT
2019-07-11 17:20:27 +10:00
2e58f2f515
Updating to version 10.0.0-alpha0
2019-07-11 14:19:45 +10:00
3082d5a4cf
disable all version name rule enforcer..
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-11 14:13:53 +10:00
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
30513f9afc
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-10 20:20:33 +10:00
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
4df544afc6
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-07-09 12:57:26 +10:00
0362595a40
javadoc plugin version 3.1.1
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-07-07 19:44:03 +10:00
d545fca96e
test with last javadoc plugin snapshot
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-28 10:03:33 +10:00
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
69b6160445
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-06-27 07:04:06 +10:00
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
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
b54dbcff63
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
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
484c7538d6
fix version of build-resources module
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-27 07:01:18 +10:00
c97403fb0d
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
2019-06-25 16:01:02 -05:00
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
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
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
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
3030ccb2df
Merge branch 'jetty-9.4.x-checkstyle' into jetty-9.4.x
2019-06-22 09:00:15 -05:00
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
2a2a11cd2e
Improvements after merge.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-13 10:23:55 +02:00
790051556f
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-13 10:03:54 +02:00
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
ae21126cad
Updating to version 9.4.20-SNAPSHOT
2019-06-10 13:40:17 -05:00
afcf563148
Updating to version 9.4.19.v20190610
2019-06-10 11:17:56 -05:00
bf53925cfb
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-06-06 17:58:49 +02:00
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
4340a382e5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-05-28 13:40:06 +02:00
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
b0bc9c9200
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-05-17 16:47:45 +02:00
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
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
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
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
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
2b93a4e7ea
Updating jetty-test-helper + junit5 + hamcrest
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 12:23:55 -05:00
734be56938
Updating to version 9.4.19-SNAPSHOT
2019-04-29 16:27:23 -05:00
e1bc35120a
Updating to version 9.4.18.v20190429
2019-04-29 15:40:33 -05:00
f28bfa9377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-04-29 13:21:59 +02:00
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
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
1b7221a997
Issue #3563 Update to apache jsp 8.5.40
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-04-25 08:38:01 +02:00
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
926a8428a8
Updating maven-javadoc-plugin config for JDK-8212233 bug
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-18 14:09:34 -05:00
5882d63ba7
Updating to version 9.3.28-SNAPSHOT
2019-04-18 13:54:17 -05:00
d3e249f869
Updating to version 9.3.27.v20190418
2019-04-18 13:10:03 -05:00
3232d73282
Updating maven-javadoc-plugin config for JDK-8212233 bug
2019-04-18 13:08:41 -05:00
d83e1164fc
Bumping up javadoc-plugin due to NPE during release
2019-04-18 12:44:44 -05:00
2c14d93885
Updating to version 9.2.29-SNAPSHOT
2019-04-18 12:17:07 -05:00
1dffa36fe3
Updating to version 9.2.28.v20190418
2019-04-18 11:23:17 -05:00
038c7ee6d7
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2019-04-18 18:07:00 +02:00
1f31f52a5a
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2019-04-18 18:01:59 +02:00
03243ebfbd
Updated ALPN version for JDK 8u211 and 8u212.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-18 17:55:06 +02:00
c75136fe63
Merge branch 'release-9.4.16' into jetty-9.4.x
2019-04-18 10:13:20 -05:00
72b4f92280
Updating to tests to protect if IPv6 is unavailable.
...
+ Updating to jetty-test-helper 4.2.1 with new Net.class
+ Assume.assumeTrue(Net.isIpv6InterfaceAvailable());
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 18:10:55 -05:00
879e161c22
Updating to tests to protect if IPv6 is unavailable.
...
+ Updating to jetty-test-helper 3.1.1 with new Net.class
+ Assume.assumeTrue(Net.isIpv6InterfaceAvailable());
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-16 16:34:12 -05:00
c7a2d8b7c6
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-15 18:22:09 +02:00
64549fb19c
Updated Conscrypt to 2.1.0.
...
Tagged tests that connect to external servers as "external".
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-04-15 18:10:21 +02:00
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
19f81c0ada
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-04-10 16:15:53 -05:00
5b3edbbc26
oops my bad we need if invoker plugin snapshot
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-10 17:50:01 +10:00
7d4577d1ed
comment access to repository.apache.org and remove duplicate jetty snapshots repository declaration
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-10 12:53:36 +10:00
40c2e76786
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-04-06 13:45:54 +02:00
aa7e9ee060
Merge pull request #3474 from eclipse/jetty-9.4.x-3180-review_unixsocket
...
Issue #3180 - Review client support for Unix sockets.
2019-04-06 11:55:29 +02:00
8829602201
Exclude ipv6 tests for ci profile (Jenkins) ( #3528 )
...
* exclude ipv6 test as currently failing on kubernetes, using junit tag and ci profile activated via Jenkinsfile
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade surefire to 3.0.0-M3
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-04-06 13:27:42 +10:00
9b19374c5d
Updating to version 9.2.28-SNAPSHOT
2019-04-03 19:38:05 -05:00
84dfe74b97
Updating to version 9.2.27.v20190403
2019-04-03 19:04:45 -05:00
c70034766e
Updating to version 9.3.27-SNAPSHOT
2019-04-03 18:46:31 -05:00
dae476e369
Updating to version 9.3.26.v20190403
2019-04-03 18:16:32 -05:00
2ccde9772b
Undoing bad release-9.3.26
2019-04-03 18:11:16 -05:00
9f4b3542cb
Updating to version 9.3.27-SNAPSHOT
2019-04-03 17:32:08 +11:00
7ec6d2fb32
Updating to version 9.3.26.v20190403
2019-04-03 13:06:51 +11:00
bfc5b1fac5
Issue #3180 - Review client support for Unix sockets.
...
Reviewed the implementation.
Got rid of the single channel stored in the HttpClientTransport.
Re-enabled tests on the Unix socket transport.
Updated JNR to 0.22.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-03-19 17:37:12 +01:00
95a6b76851
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebApp.java
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-03-15 16:00:59 -05:00
adbfcbcf60
- Issue #3425 upgrade conscrypt to 2.0.0 and get rid of reflection usage
...
- align conscrypt version in conscrypt.mod file
- add more simple unit test to test conscrypt alpn usage
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-13 11:35:10 +01:00
8e21c968d5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-03-12 12:14:46 +11:00
4f1b28eb3c
Issue #3415 re enable infinispan test with using correct version of infinispan ( #3443 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-03-12 11:20:05 +11:00
c3719b2bab
Add jdk12 build in Jenkinsfile ( #3376 )
...
* add jdk12 build stage
* test last release of infinispan for jdk12 build
* fix upperBound dependency for jboss logging
* upgrade juniper to 5.4.0 and disable infinispan test if JRE.JAVA_12
* Fixed annotations to exclude any JDK > 11 for 3 tests.
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-27 12:37:21 +10:00
cff63f2b6a
Merge of `jetty-9.4.x` to `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim@erdfelt.com>
2019-02-21 09:45:12 -05:00
aec2ebd27d
issue #2878 add an aggregated javadoc jar excluding some tests packages
...
+ force attach and use default phase bind (package)
+ fixing some dependencies to build aggregate javadoc jar
+ configure release plugin to build aggregated javadoc jar
+ test javadoc build with jdk11 including aggregated javadoc
+ Fixing bad javadoc
+ Excluding tests from aggregate-javadoc
+ Cannot aggregate-javadoc on CI (requires clean build of snapshot to work)
+ standardizing javadoc config
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-02-18 17:44:51 -05:00
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
7b686fa4b6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-02-14 10:25:59 -05:00
a6c626a891
Fixing Javadoc
2019-02-13 17:17:11 -05:00
1b904c0b77
Fixed #3351 - Restructure jetty-unixsocket module.
...
Split the original module into modules -common, -client, -server.
Added module-info.java for the new modules, referencing the JNR
JPMS module names.
Updated depedencies from old module to new modules.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:16:56 +01:00
1c55e2bf79
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.annotation -> jakarta.annotation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 18:56:16 +01:00
a1e6d5856a
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.transaction -> jakarta.transaction.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 14:41:05 +01:00
5ce3d1bd61
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 11:23:56 +01:00
2d88b3b959
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Refactored streamers into class Run.
Added javadocs.
Moved "maven.resolver.version" to main POM for consistency.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 09:04:45 +01:00
9c59db6fdd
Issue #3343 - Add an API/tools to be able to test Jetty Distribution.
...
Updated maven.version to 3.6.0.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 21:41:29 +01:00
875af5c692
Restored Automatic-Module-Name that was removed in 471dab752.
...
Cleaned up pom.xml files that required a correct JPMS module name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-11 10:16:07 +01:00
107170adf8
Issue #3162 - Use Jetty specific Servlet API jar.
...
Updated to jetty-servlet-api:4.0.2, based on jakarta.servlet 4.0.2.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 22:55:21 +01:00
0d89f29e1b
Issue #3162 - Use Jetty specific Servlet API jar.
...
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
to match the new Jetty Servlet API jar.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-04 18:51:26 +01:00
b9281e323d
fix merge
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-04 18:49:12 +01:00
d8d1ecf6a1
use snapshot of maven-invoker-plugin because of NPE https://issues.apache.org/jira/browse/MINVOKER-247
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-02-04 18:49:12 +01:00
6fee10d537
use snapshot of maven-invoker-plugin because of NPE https://issues.apache.org/jira/browse/MINVOKER-247
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-31 09:40:08 +10:00
c30c8d4339
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-quickstart/pom.xml
# jetty-servlets/pom.xml
# jetty-util/pom.xml
# jetty-websocket/javax-websocket-client/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# pom.xml
2019-01-30 11:56:58 -06:00
ce976b5aa3
Issue #3249 Update to apache jsp 9.0.14 ( #3299 )
...
* Issue #3249 Update to apache jsp 9.0.14
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-01-30 14:31:58 +11:00
15d998b269
fix javadoc with jdk 11.0.2
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-24 21:20:01 +10:00
3ffdd9427d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-24 14:41:39 +10:00
34b2678e6d
issue #3254 add jsp test need to remove cdi-api and exclude it fron upperBound rule ( #3268 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-24 14:34:41 +10:00
826c27a2b2
- move duplicate configuration to parent pom ( #3265 )
...
- upgrade invoker plugin version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-24 07:29:49 +10:00
2a8b4c4c47
Updated ALPN to JDK 8u201 and 8u202.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:25:39 +01:00
0e17b56aaf
Updated ALPN to JDK 8u201 and 8u202.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-01-16 17:12:25 +01:00
cdd553332c
Updated ALPN version for JDK 8u201 and 8u202.
2019-01-16 17:03:51 +01:00
14aa789738
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-16 21:48:57 +10:00
027a91d224
maven assembly plugin 3.1.1
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-15 21:20:46 +10:00
a90fda5488
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-01-01 12:18:15 +10:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
b0f13d80c3
fix bundle Copyright
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:14:48 +10:00
9b7afd8a03
Happy new year!! ( #3232 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +10:00
6ff23e296d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-22 22:00:07 +10:00
72ebcc51af
interpolate version from main pom for maven plugin it test ( #3223 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 21:55:31 +10:00
ab2a8b0fe3
upgrade logback and log4j-slf4j (new artifact log4j-slf4j18-impl) to support slf4j api 1.8 ( #3209 )
...
* upgrade logback and version of log4j-slf4j support slf4j 1.8 (new artifact log4j-slf4j18-impl)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-22 10:01:48 +10:00
bd4933b33c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-21 21:48:36 +10:00
63820e5405
activate Maven enforcer Upper bound dependencies check ( #3116 )
...
* add requireUpperBoundDeps rule
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-21 21:35:31 +10:00
4abc4f8dd4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-12-19 10:54:41 +11:00
bbd45fa66d
Update to Maven JAR Plugin 3.1.1 to pick up the fix of MJAR-241
...
surefire plugin 3.0.0-M2
remove use of Automatic-Module-Name jar plugin property so we avoid failure on jpms module name validation by jar plugin 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-18 17:40:11 +10:00
471dab752b
Update to Maven JAR Plugin 3.1.1 to pick up the fix of MJAR-241
...
surefire plugin 3.0.0-M2
remove use of Automatic-Module-Name jar plugin property so we avoid failure on jpms module name validation by jar plugin 3.1.1
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-17 10:05:53 +10:00
3acb98f477
Issue #3161 Update to Apache JSP 8.5.35 ( #3163 )
...
* Issue #3161 Update to Apache JSP 8.5.35
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-12-13 14:57:14 +11:00
0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) ( #3183 )
...
* surefire.argLine replaced by jetty.surefire.argLine
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-06 09:09:06 +10:00
c0655ce634
Revert "fix argLine inheritance ( #3177 )"
...
This reverts commit 3e6ab2d1ac
2018-12-03 13:25:00 +10:00
3e6ab2d1ac
fix argLine inheritance ( #3177 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-03 11:20:20 +10:00
c3348a0a03
Issue #3162 - Correcting websocket issues in OSGi
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-30 15:03:44 -06:00
bfa2dbf68c
Issue #3162 - Use Jetty specific Servlet API jar.
...
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
to match the new Jetty Servlet API jar.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 16:51:29 +01:00
4080cc6c3b
Fix websocket module name changes, etc file changes, and jetty-schemas
...
to make jetty-osgi work.
2018-11-23 16:16:22 +01:00
f0fbd63a55
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-22 12:56:25 +01:00
14c2431b1d
Updated Conscrypt to 1.4.1.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:46:11 +01:00
5f972b451c
Jetty 10.0.x 2978 add module info ( #3120 )
...
Fixes #2978 - Add module-info to relevant Jetty modules.
Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01:00
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
32af885580
Issue #3104 Update to org.mortbay.apache-jsp 8.5.33.1
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-11-14 12:18:40 +01:00
aaa9a1e410
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-13 18:12:16 +01:00
77095c626d
Adding profile to ensure release uses JDK11 (or newer)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-11-13 07:37:30 -06:00
4f4e720a63
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-12 16:37:48 +01:00
a903017f5f
Updating to version 9.4.14-SNAPSHOT
2018-11-11 21:06:50 -06:00
49123a3313
Updating to version 9.4.13.v20181111
2018-11-11 20:02:42 -06:00
2707d69033
shade plugin released version 3.2.1
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-12 11:01:24 +10:00
b57c05999e
Bumping up jetty-schemas to 3.1.2
2018-11-11 10:36:49 -06:00
027cc240ca
Bumping up jetty-schemas and jetty-test-helper version
2018-11-09 12:47:37 -06:00
d81c0cad24
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-07 14:06:21 +01:00
872eafef06
Issue #2858 upgrade jnr-unixsocket to 0.19 ( #2859 )
...
* upgrade jnr-unixsocket to 0.19 #2858
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* remove hack as issue has been fixed on jnr project
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade jnr-unixsocket to 0.20
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-07 08:28:44 +01:00
b5d058d128
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-11-02 19:27:14 +10:00
af7dba1249
make compiler.target/source as a property so we can override those with the command line
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-02 19:20:35 +10:00
254dc88743
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-11-01 20:24:43 +01:00
d33f65d322
Merge pull request #2957 from eclipse/jetty-9.4.x-2941-asm_jdk11
...
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
2018-11-01 17:49:22 +01:00
97c37f998b
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
...
Updated ASM version in the main POM to 7.0.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-01 17:48:39 +01:00
42c49cd503
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-11-01 13:17:20 +10:00
392260a232
maven-plugin-plugin 3.6.0
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-11-01 12:38:48 +10:00
f39d1a31cb
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-31 09:27:16 +10:00
bc1e58b0f5
*issue #2923 add LICENSE and NOTICE files ( #2940 )
...
*remove html license version
* use org.eclipse.jetty.toolchain:jetty-artifact-remote-resources:1.2 released version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-31 09:24:20 +10:00
7dbe056521
Signed-off-by: olivier lamy <oliver.lamy@gmail.com> ( #3035 )
2018-10-29 17:14:59 +10:00
b4a0d7ebcb
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-26 12:40:36 +10:00
b19d9b27ab
use maven pmd plugin 3.11.0
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-26 12:38:11 +10:00
1d00091bd1
Removed scope=provided from javax.activation and javax.transaction
...
dependencies, since they are not bundled with Java 11 anymore.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-23 19:25:41 +02:00
cb9301ab1d
Dropping jetty-rhttp
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 06:59:45 -05:00
5f5fa98a30
Eclipse CBI notes
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 06:59:09 -05:00
993d261e36
jetty-all-compact3 no longer exists
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 06:56:42 -05:00
a0fa62108b
Correcting my timezone
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 06:56:07 -05:00
fe1b515d25
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-10-21 10:18:36 +11:00
edc47818e2
Merge pull request #2899 from quaff/jetty-9.4.x
...
Fix outdated bundle vendor
2018-10-19 10:45:42 -05:00
5e2c0600d3
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2941-asm_jdk11'.
2018-10-18 15:50:07 +02:00
be9ca8aa5d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-18 16:59:05 +10:00
3490add2a9
remove not anymore used javadoc tages
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-18 16:58:25 +10:00
d048dd321e
Merge branch 'jetty-9.4.x' into jetty-9.4.x
2018-10-18 17:07:24 +11:00
932f1a7516
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2018-10-17 15:49:54 +02:00
44ac57040a
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-10-17 12:36:56 +02:00
add74bf889
Updated ALPN version for JDK 8u191 and 8u192.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-17 11:56:39 +02:00
fc230ba7c6
Issue #114 Remove Overlay Deployer
...
Removed the unmaintained Overlay Deployer
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-17 10:11:37 +11:00
9fd95a329c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-10-14 10:51:43 +10:00
64e561dcb1
upgrade surefire plugin 2.22.1 ( #2980 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-14 10:50:02 +10:00
813b526cb2
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
Removed references to ALPN API.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-12 09:45:23 +02:00
41663d8e5c
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-10-11 00:36:10 +02:00
56ce28b49d
maven-plugin-plugin is working now
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-09 12:17:35 +10:00
1ba945b39b
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
...
Updated to ASM 7.0-beta, and defaulted AnnotationParser to ASM 7.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-04 13:47:56 +02:00
bd3eeeaa3f
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'.
2018-10-04 12:27:31 +02:00
75942298f5
Issue #2191 - JPMS Support.
...
Restored previous OSGi bundle name for apache-jsp.
Introduced a new property for the JPMS Automatic-Module-Name.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-04 10:51:16 +02:00
1fe6c92ee9
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
First pass at making Jetty 10.x require JDK 11.
* Removed JDK 8 modules (in particular ALPN and ALPN *.mod files).
* Removed profiles targeting JDK 8, 9 and 10.
* Updated dependencies to newer versions that support JDK 11.
* Temporarily commented out the Jetty Maven Plugins due to
maven-plugin-plugin not working with JDK 11.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-03 11:15:30 +02:00
8213a95a7b
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-10-02 22:51:46 +02:00
a094dbaa69
fix osgi tests not running as paxexam is not junit5 ready ( #2945 )
...
* fix osgi tests not running as paxexam is not junit5 ready
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade pax exam to 4.12.0
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* cleanup comment, using transitive deps from pax-exam-junit4
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-02 16:44:24 +10:00
e4ff653295
Issue #2191 - JPMS Support.
...
Introduced --jpms option in jetty-start to run Jetty from the module-path.
Introduced [jpms] sections in *.mod files, to specify JPMS command line
options that needs to be added to the command line generated by jetty-start.
Bumped java.transaction-api to 1.3 because it has Automatic-Module-Name.
Fixed ASM version lookup using ManifestUtils.
Fixed WebInfConfiguration.findAndFilterContainerPaths() to properly
scan the module-path, which may contain both files and directories.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-25 22:11:25 +02:00
78d529b13a
Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'.
2018-09-24 15:23:30 +02:00
5e8a7403d1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-22 20:11:03 +10:00
71a1801433
Issue #2918 restore a TestTracker with junit5 ( #2927 )
...
* add TestTracker junit5 extension #2918
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-21 14:03:05 +10:00
cf59a8aa65
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-20 07:36:11 +10:00
9fae0c2fa0
Move snapshot repositories to profile ( #2917 )
...
Issue #2917
* Move snapshot repositories to profile
* feedback from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-19 11:20:14 +10:00
defa9e42f2
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-18 10:54:36 -04:00
a6abd0b741
Issue #2191 - JPMS Support
...
Fixed apache-jsp JPMS module name.
Fixed jetty-ant JPMS module name.
ASM 6.2 contains a proper module-info.class that requires also
asm-tree and asm-analysis, so added them to the jetty-home module
so that they are present in the distribution.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-18 00:35:29 +02:00
3793fe5ae9
upgrade junit 5.3.1 ( #2904 )
2018-09-14 12:00:08 +10:00
cd7138131e
Fix outdated bundle vendor
...
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2018-09-12 10:56:05 +08:00
5aaae07b94
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-11 21:09:14 +10:00
1b330f2efc
inherit plugin versions from main pom ( #2897 )
...
* inherit plugin versions from main pom
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-11 21:05:37 +10:00
0ec0216542
Fixing bad merge of pom.xml
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 14:56:20 -05:00
32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
2018-09-06 09:27:11 +10:00
ba3c95abd0
Removing updatePolicy/always
2018-09-05 08:09:00 -05:00
e24fc48539
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 21:27:18 +10:00
a3f1592c50
Issue #2431 - Upgrade to Junit 5 ( #2436 )
...
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
- this will be a formal release once this issue has been
resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration
junit 4 | junit 5 / jupiter
------------ | -----------
@Before | @BeforeEach
@After | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass | @AfterAll
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
863a19bccf
Updating to version 9.3.26-SNAPSHOT
2018-09-04 17:23:31 -05:00
3ce520221d
Updating to version 9.3.25.v20180904
2018-09-04 16:08:21 -05:00
8dd05ac3f7
merge from 9.4.x
2018-09-04 13:48:43 -05:00
0ae0c500f0
Merge pull request #2879 from eclipse/jetty-9.4.x-2878-javadoc-gen-fix
...
Issue #2878 fix post release javadoc generation
2018-09-04 13:34:15 -05:00
d0b98186c0
Issue 2865 update to jasper 8.5.33 ( #2870 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-04 14:25:27 +10:00
44ace1f8c8
cleanup Jenkinsfile: non needed/unused variable ( #2880 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-03 16:19:18 +10:00
e893dd2546
update instructions
2018-08-31 16:05:00 -05:00
44c95865f2
Issue #2878 fix post release javadoc generation
2018-08-31 15:57:38 -05:00
78894c4aae
Issue #2191 - JPMS Support.
...
Added "Automatic-Module-Name" to jetty modules.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-31 15:18:41 +02:00
dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT
2018-08-30 10:48:22 -05:00
2720868475
Updating to version 9.4.12.v20180830
2018-08-30 08:56:44 -05:00
9cb9be83fd
Issue #2846 Jaas ldap unit test ( #2864 )
...
* #2846 add jaas ldap unit tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-30 14:17:08 +10:00
d95b39f5f7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-08-29 12:16:26 -04:00
1383f60249
Updated Maven Plugin and dependencies versions.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-29 12:22:51 +02:00
5afe2e215f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-23 17:17:46 +10:00
7f3c75a6c6
Using released Jacoco 0.8.2
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-22 16:03:21 -05:00
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +10:00
e5f0531db0
fixes after merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 11:59:15 +10:00
9ff37122db
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-08-15 11:58:52 +10:00
e0a92f6181
Issue #2794 - Add profile for jar signing with eclipse-jarsigner-plugin. ( #2803 )
...
Create a profile 'eclipse-sign' that is enabled when the property by
the same name is defined, in order to handle the signing of Eclipse
bundles by the configured signing service.
Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
2018-08-15 09:26:37 +10:00
olivier lamy
Simone Bordet
Greg Wilkins
Joakim Erdfelt
olivier lamy
Jan Bartel
Joakim Erdfelt
WalkerWatch
Yanming Zhou
Jesse McConnell
Roland Grunberg