16092 Commits

Author SHA1 Message Date
Simone Bordet
7e68ef1e17 Issue #2191 - JPMS Support.
Now server.mod patches the servlet.api JPMS module with jetty-schemas.jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-26 13:22:29 +02:00
Simone Bordet
81d02893dc Issue #2191 - JPMS Support.
Using BaseHome.getPaths() to resolve paths for patches modules.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-26 13:21:40 +02:00
Simone Bordet
22cbbdc900 Issue #2191 - JPMS Support.
Reverted wrong change in WebInfConfiguration.findAndFilterContainerPaths().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-26 12:41:12 +02:00
Simone Bordet
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
Simone Bordet
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
Olivier Lamy
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
Greg Wilkins
a9566d429c
Issue #2912 Remove Content-Length from inflated requests (#2915)
Issue #2912 Remove Content-Length from inflated requests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-21 07:44:53 +10:00
Joakim Erdfelt
b225ebe756
Merge pull request #2902 from eclipse/jetty-9.4.x-issue-2875-websocketclient-redirect
Issues #2875 and #2901 WebSocketClient Redirected Upgrade
2018-09-20 13:56:55 -05:00
Simone Bordet
f6474f9b8c
Merge pull request #2922 from eclipse/jetty-9.4.x-2913-CNFE_sun_reflect_Reflection
Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
2018-09-20 11:06:59 +02:00
Olivier Lamy
f340b404a8
get rid of maven warning due to duplicate plugin declaration (#2920)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-20 15:59:42 +10:00
Simone Bordet
3a8a20557d Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Another update after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 17:07:49 +02:00
Simone Bordet
bae502681c Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Another update after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 13:50:33 +02:00
Simone Bordet
9a9a52b960 Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Updated after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 13:44:12 +02:00
Simone Bordet
3384ff90ea Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Replaced usage of sun.reflect.Reflection with a
SecurityManager subclass, so that it works in all JDKs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 12:46:39 +02:00
Greg Wilkins
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
WalkerWatch
be564ecd59 Updated example. Resolves #2916 2018-09-18 10:53:07 -04:00
Olivier Lamy
cfe7fa1cb2
Issue #2906 excluded reactor projects with provided scope (#2914)
* Issue #2906 excluded reactor projects with provided scope

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

* avoid test project within reactors to be in the classpath

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-18 21:17:25 +10:00
Simone Bordet
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
Simone Bordet
60e3562f99 Issue #2191 - JPMS Support
Turns out that Package.getImplementationVersion() and similar return
null when running from the module path, so the logic in StartArgs
broke and prevented Jetty to start.

Introduced ManifestUtils to retrieve the manifest file from JarFile,
so that attribute entries can be retrieved independently from the JDK
version or module-path vs class-path.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-17 19:32:00 +02:00
Simone Bordet
b0f34fec3f Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-14 10:01:58 +02:00
Olivier Lamy
3793fe5ae9
upgrade junit 5.3.1 (#2904) 2018-09-14 12:00:08 +10:00
Olivier Lamy
98cc338d2e
get rid of remaining legacy junit (#2900)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-13 07:11:09 +10:00
Joakim Erdfelt
ae169aa624 Fixing #2875 - WebSocketClient upgrade with redirect support
+ Using HttpClient fixes from #2901 to allow upgrader to be
  held for entire conversation regardless of authentication
  or redirect behaviors.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 15:57:31 -05:00
Joakim Erdfelt
00843c8ed9 Issue #2901 - Moving Http Upgrader to Http Conversation
+ Solves for Authentication and Redirect

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-12 14:35:01 -05:00
Greg Wilkins
4b461b7556 DelegatingThreadPool as TryExecutor
Noticed while looking at #2718, it is more efficient if tryExecute semantics are available.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-12 16:42:05 +10:00
Joakim Erdfelt
aebe436e00 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-09-11 13:22:12 -05:00
Joakim Erdfelt
a69ad3912d Fixing #2481 - PathWatcherDemo NPE
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-11 13:21:37 -05:00
Olivier Lamy
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
Алексей Пастухов
04941fd44c Issue #2691 replace static dn by subtee based ldap lookup for an entry inside _userBaseDn (#2842)
* replace static dn by subtee based ldap lookup for an entry inside _userBaseDn
* additional ldap tests to cover enhancement of #2842

Signed-off-by: Alexei Pastuchov <alexei.pastuchov@telecolumbus.de>
2018-09-11 15:57:48 +10:00
Jan Bartel
2dd5fec4f4
Issue #2740 Ensure OSGiWebappClassLoader uses bundleloader for all loadClass methods. (#2804)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-11 12:04:31 +10:00
Jan Bartel
5056ac5895
Issue #2834 Make ASM version error message friendlier (#2887)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-11 09:28:06 +10:00
Olivier Lamy
154e5ea1a5
align plugin version (#2893)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 18:38:34 +10:00
Olivier Lamy
0c97d28cba
java 8 required (#2885)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 12:32:45 +10:00
olivier lamy
5910c064e8 remove unused import
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 12:05:32 +10:00
Joakim Erdfelt
bcb5da0224 Minor correction in JRE execution for SslBytesClientTest now that Java 12-ea's are out 2018-09-07 09:55:37 -05:00
Simone Bordet
82c04f3ae8 Fixed typos SPENGO -> SPNEGO.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-07 10:12:06 +02:00
Simone Bordet
f3fb290b2a Fixed test to not run on JDK 11 due to TLS 1.3.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-06 11:29:14 +02:00
Olivier Lamy
2cbe395f29
Cleanup jaas ldaptest (#2881)
* reduce test verbosity

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

* reduce verbosity of failed login

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

* apply jan changes

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

* fix javadoc

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-06 08:05:47 +10:00
Jan Bartel
ffb11fd98f Fix junit version in jetty-maven-plugin 2018-09-06 07:36:47 +10:00
Jesse McConnell
c249685953
merge from 9.3.x 2018-09-05 10:27:31 -05:00
Joakim Erdfelt
ba3c95abd0 Removing updatePolicy/always 2018-09-05 08:09:00 -05:00
Joakim Erdfelt
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
Jesse McConnell
863a19bccf
Updating to version 9.3.26-SNAPSHOT 2018-09-04 17:23:31 -05:00
Jesse McConnell
3ce520221d
Updating to version 9.3.25.v20180904 jetty-9.3.25.v20180904 2018-09-04 16:08:21 -05:00
Jesse McConnell
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
Jan Bartel
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
Jan Bartel
fe3816d05a
Issue #2866 Put back jstl dep for jetty jspc maven plugin (#2869)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-04 14:25:10 +10:00
Olivier Lamy
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
Jesse McConnell
3bea46c03c
clean out comment 2018-08-31 16:22:25 -05:00
Jesse McConnell
e893dd2546
update instructions 2018-08-31 16:05:00 -05:00