1611 Commits

Author SHA1 Message Date
olivier lamy
b0f13d80c3 fix bundle Copyright
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:14:48 +10:00
Olivier Lamy
9b7afd8a03
Happy new year!! (#3232)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 11:52:16 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 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
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
e893dd2546
update instructions 2018-08-31 16:05:00 -05:00