Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 08:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,041 Commits 55 Branches 466 Tags
Commit Graph

1679 Commits

Author SHA1 Message Date
Greg Wilkins
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
Simone Bordet
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
Simone Bordet
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
olivier lamy
42c49cd503 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-11-01 13:17:20 +10:00
olivier lamy
392260a232 maven-plugin-plugin 3.6.0 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-11-01 12:38:48 +10:00
olivier lamy
f39d1a31cb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-31 09:27:16 +10:00
Olivier Lamy
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
Olivier Lamy
7dbe056521
Signed-off-by: olivier lamy <oliver.lamy@gmail.com> (#3035) 2018-10-29 17:14:59 +10:00
olivier lamy
b4a0d7ebcb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-26 12:40:36 +10:00
olivier lamy
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
Simone Bordet
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
Joakim Erdfelt
cb9301ab1d Dropping jetty-rhttp 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-10-22 06:59:45 -05:00
Joakim Erdfelt
5f5fa98a30 Eclipse CBI notes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-10-22 06:59:09 -05:00
Joakim Erdfelt
993d261e36 jetty-all-compact3 no longer exists 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-10-22 06:56:42 -05:00
Joakim Erdfelt
a0fa62108b Correcting my timezone 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-10-22 06:56:07 -05:00
Greg Wilkins
fe1b515d25 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-10-21 10:18:36 +11:00
Joakim Erdfelt
edc47818e2
Merge pull request #2899 from quaff/jetty-9.4.x 
Fix outdated bundle vendor
 2018-10-19 10:45:42 -05:00
Simone Bordet
5e2c0600d3 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2941-asm_jdk11'. 2018-10-18 15:50:07 +02:00
olivier lamy
be9ca8aa5d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-18 16:59:05 +10:00
olivier lamy
3490add2a9 remove not anymore used javadoc tages 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-10-18 16:58:25 +10:00
Greg Wilkins
d048dd321e
Merge branch 'jetty-9.4.x' into jetty-9.4.x 2018-10-18 17:07:24 +11:00
Simone Bordet
932f1a7516 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-10-17 15:49:54 +02:00
Simone Bordet
44ac57040a Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-10-17 12:36:56 +02:00
Simone Bordet
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
Greg Wilkins
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
olivier lamy
9fd95a329c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-14 10:51:43 +10:00
Olivier Lamy
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
Simone Bordet
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
Simone Bordet
41663d8e5c Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-10-11 00:36:10 +02:00
olivier lamy
56ce28b49d maven-plugin-plugin is working now 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-10-09 12:17:35 +10:00
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
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
Simone Bordet
8213a95a7b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-10-02 22:51:46 +02:00
Olivier Lamy
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
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
5e8a7403d1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-22 20:11:03 +10: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
olivier lamy
cf59a8aa65 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-20 07:36:11 +10: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
defa9e42f2 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-18 10:54:36 -04: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
Olivier Lamy
3793fe5ae9
upgrade junit 5.3.1 (#2904) 2018-09-14 12:00:08 +10:00
Yanming Zhou
cd7138131e Fix outdated bundle vendor 
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2018-09-12 10:56:05 +08:00
olivier lamy
5aaae07b94 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-11 21:09:14 +10: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
Joakim Erdfelt
0ec0216542 Fixing bad merge of pom.xml 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-09-07 14:56:20 -05:00
olivier lamy
32912b922d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-06 17:39:57 +10:00