olivier lamy
6ff23e296d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-22 22:00:07 +10:00
Olivier Lamy
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
Olivier Lamy
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
olivier lamy
bd4933b33c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-12-21 21:48:36 +10:00
Olivier Lamy
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
Jan Bartel
4abc4f8dd4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-12-19 10:54:41 +11:00
olivier lamy
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
olivier lamy
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
Jan Bartel
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
Olivier Lamy
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
olivier lamy
c0655ce634
Revert "fix argLine inheritance ( #3177 )"
...
This reverts commit 3e6ab2d1ac
.
2018-12-03 13:25:00 +10:00
Olivier Lamy
3e6ab2d1ac
fix argLine inheritance ( #3177 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-12-03 11:20:20 +10:00
Jan Bartel
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
Simone Bordet
f0fbd63a55
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-22 12:56:25 +01:00
Simone Bordet
14c2431b1d
Updated Conscrypt to 1.4.1.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:46:11 +01:00
Simone Bordet
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
Joakim Erdfelt
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
Joakim Erdfelt
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
Jan Bartel
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
Simone Bordet
aaa9a1e410
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-11-13 18:12:16 +01:00
Joakim Erdfelt
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
Greg Wilkins
4f4e720a63
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-12 16:37:48 +01:00
Joakim Erdfelt
a903017f5f
Updating to version 9.4.14-SNAPSHOT
2018-11-11 21:06:50 -06:00
Joakim Erdfelt
49123a3313
Updating to version 9.4.13.v20181111
2018-11-11 20:02:42 -06:00
olivier lamy
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
Joakim Erdfelt
b57c05999e
Bumping up jetty-schemas to 3.1.2
2018-11-11 10:36:49 -06:00
Joakim Erdfelt
027cc240ca
Bumping up jetty-schemas and jetty-test-helper version
2018-11-09 12:47:37 -06:00
Greg Wilkins
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
Olivier Lamy
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
olivier lamy
b5d058d128
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-11-02 19:27:14 +10:00
olivier lamy
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
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