Commit Graph

1427 Commits

Author SHA1 Message Date
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
Jesse McConnell 44c95865f2
Issue #2878 fix post release javadoc generation 2018-08-31 15:57:38 -05:00
Simone Bordet 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
Jesse McConnell dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT 2018-08-30 10:48:22 -05:00
Jesse McConnell 2720868475
Updating to version 9.4.12.v20180830 2018-08-30 08:56:44 -05:00
Olivier Lamy 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
Simone Bordet 1383f60249 Updated Maven Plugin and dependencies versions.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-29 12:22:51 +02:00
Joakim Erdfelt 7f3c75a6c6 Using released Jacoco 0.8.2
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-22 16:03:21 -05:00
Greg Wilkins e5f0531db0 fixes after merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 11:59:15 +10:00
Greg Wilkins 9ff37122db Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-08-15 11:58:52 +10:00
Roland Grunberg 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
Roland Grunberg 33228edc7d Issue #2794 - Add profile for jar signing with eclipse-jarsigner-plugin. (#2802)
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:19:00 +10:00
Roland Grunberg bd38bc905b Issue #2639 - Add profile for jar signing with eclipse-jarsigner-plugin. (#2786)
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-09 22:12:03 +10:00
Olivier Lamy c8fe66dd3a
#2778 upgrade h2spec-maven-plugin to 0.4 (#2779)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-07 21:17:07 +10:00
Joakim Erdfelt 516d93c488 Updating to version 9.2.27-SNAPSHOT 2018-08-06 11:33:22 -05:00
Joakim Erdfelt 8c637489ae Updating to version 9.2.26.v20180806 2018-08-06 10:51:25 -05:00
Joakim Erdfelt cfcecce2f9 Bumping up jetty-version-maven-plugin version 2018-08-06 10:29:57 -05:00
Joakim Erdfelt 9e97c50d90 Merge branch 'release-9.2.25' into jetty-9.2.x 2018-08-06 10:27:39 -05:00
Olivier Lamy f4a0bfbdd8
Issue #2746 jmh module (#2750)
#2746 move jmh classes to a dedicated jmh module

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-04 14:08:13 +10:00
Olivier Lamy 0ba1d9b5a5
Issue #307 datecache contention (#2725)
* use DateTimeFormatter which is threadsafe so no need of synchronized block  #307

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-07-26 20:46:50 +10:00
Simone Bordet 9a22dd820a Issue #2679 - h2spec compliance.
Integrated h2spec execution in the Maven build.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-21 15:55:43 +02:00
Simone Bordet eceaff7bed Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-07-18 16:21:00 +02:00
Simone Bordet 37e4da24cb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-07-18 16:15:27 +02:00
Simone Bordet 7845497702 Updated ALPN version for JDK 8u181.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-07-18 15:47:39 +02:00
Joakim Erdfelt 0b69f00665 Updating to version 9.4.12-SNAPSHOT 2018-07-11 17:32:16 -05:00
Joakim Erdfelt 260596dd10 Updating to version 9.4.12.RC0 2018-07-11 16:30:55 -05:00
Carter Kozak cd60da7a12 fix #2342 Upgrade Conscrypt to 1.1.4
Fixes https://github.com/google/conscrypt/issues/491

Signed-off-by: Carter Kozak <c4kofony@gmail.com>
2018-06-29 08:41:34 -04:00
Joakim Erdfelt 3932b11e64 Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x 2018-06-07 14:31:24 -05:00
Joakim Erdfelt ce09e48b5b [WIP] Issue #2597 - Improving UnixSocketTest behavior. (#2635)
* Issue #2597 - Improving UnixSocketTest behavior.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

jnr doesn't like filename/path with strange character so use a new property for jenkins build with docker

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-07 15:39:56 +10:00
Joakim Erdfelt 0e6c91b604 Updating to version 9.2.26-SNAPSHOT 2018-06-06 18:54:58 -05:00
Joakim Erdfelt 4830fd15e9 Updating to version 9.2.25.v20180606 2018-06-06 16:42:54 -05:00
Joakim Erdfelt e4bfe00dce Updating to version 9.4.12-SNAPSHOT 2018-06-05 14:18:37 -05:00
Joakim Erdfelt d5fc0523cf Updating to version 9.4.11.v20180605 2018-06-05 13:23:02 -05:00
Joakim Erdfelt 5eefa90e05 Updating to version 9.3.25-SNAPSHOT 2018-06-05 13:13:07 -05:00
Joakim Erdfelt 84205aa28f Updating to version 9.3.24.v20180605 2018-06-05 12:11:03 -05:00
Joakim Erdfelt f0ff571c98 Reverting version to 9.3.24-SNAPSHOT 2018-06-05 12:06:58 -05:00
Joakim Erdfelt 13640c297c Bumping version to 9.3.25-SNAPSHOT 2018-06-05 11:58:37 -05:00
Joakim Erdfelt e84def53e5 Adding -html5 argument to maven-javadoc-plugin to squelch warnings from java 9+ 2018-06-01 13:32:10 -05:00
Joakim Erdfelt 8eb7faeccc Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-05-31 10:11:01 -05:00
Joakim Erdfelt 519d36ae40 Restoring badly merged maven-javadoc-plugin configuration 2018-05-31 09:56:44 -05:00
Joakim Erdfelt d065f1e068 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2018-05-31 09:25:41 -05:00
Jan Bartel 1509d1c9aa
Issue #2586 update to asm6.2 (#2588)
Issue #2586 update to asm6.2
2018-05-30 11:29:18 +02:00
Olivier Lamy 154298af64
run maven it tests as default #2576
* run maven its test per default #2576

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-30 08:33:25 +10:00
olivier lamy 72ed06a630 upgrade javadoc and plugin tools maven plugins
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-29 08:08:37 +10:00
Joakim Erdfelt e7eecc270d Updating pom.xml 2018-05-22 16:47:10 -05:00
Joakim Erdfelt 9019c83517 Update pom.xml 2018-05-22 16:45:14 -05:00
Jesse McConnell 718a855911
Update pom.xml
remove the javadoc page tracker
2018-05-22 15:20:17 -05:00
olivier lamy 60c47c24a8 remove link to self javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-15 10:17:45 +10:00
Joakim Erdfelt 1732ffca51 Updating to version 9.4.11-SNAPSHOT 2018-05-03 11:48:05 -05:00
Joakim Erdfelt daa59876e6 Updating to version 9.4.10.v20180503 2018-05-03 10:55:19 -05:00
Olivier Lamy d64d0348b7
test some Jenkinsfile changes (#2471)
* maven 3.5

* add surefire timeout to avoid build stuck
2018-04-25 19:29:21 +10:00
olivier lamy 1574ea1780 reduce pmd plugin noise
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-20 21:25:13 +10:00
Olivier Lamy 5758fb52c0
Merge pull request #2469 from olamy/feature/build_local_repo_test
test new local repository for CI and use PMD cache
2018-04-20 18:54:10 +10:00
Simone Bordet 6e2cd06c89 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-04-20 10:31:39 +02:00
Simone Bordet 8323417622 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-04-20 10:27:14 +02:00
Simone Bordet d7ce334f8f Updated ALPN version for JDK 8u171 and 8u172.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-20 10:16:50 +02:00
olivier lamy 06b04e9cda enable cache for pmd plugin
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-20 16:53:29 +10:00
Olivier Lamy c7e78ae896
update logging versions #2461 (#2465)
* update logging versions #2461

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 15:45:11 +10:00
olivier lamy 237d6280c3 upgrade pmd plugin
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
olivier lamy 9dd72454da upgrade jar plugin
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
olivier lamy c8bb36330a upgrade dependency plugin
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
olivier lamy d68e9ea23c upgrade compiler plugin
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
olivier lamy 01c08133de upgrade install plugin 2.5.2
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 09:42:01 +10:00
Jan Bartel ea6d18f919
Jetty 9.4.x issue 2397asm jdk10 support (#2417)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-06 12:00:09 +10:00
Jan Bartel 16e625adde
Issue #2109 remove warnings for unused imports and exports (#2390)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-04 12:06:43 +10:00
Jan Bartel b4e400f236 Jetty 9.4.x 2231 refactor session tests (#2382)
* Issue #2231 WIP

* Issue #2231 Add tests for FileSessionDataStore and MongoSessionDataStore.

* Issue #2231 create unit tests for every SessionDataStore

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #2231 Refactor session tests

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #2231 Refactor and cleanup session tests.

Signed-off-by: Jan Bartel <janb@webtide.com>

* hazelcast tests faster

Signed-off-by: olivier lamy <olamy@webtide.com>

* make hazelcasts tests even faster

Signed-off-by: olivier lamy <olamy@webtide.com>

* cleanup comments

Signed-off-by: olivier lamy <olamy@webtide.com>

* run mongodb test in embdedded mode

Signed-off-by: olivier lamy <olamy@webtide.com>

* mongodb embedded test enabled per default

Signed-off-by: olivier lamy <olamy@webtide.com>

* Issue #2231 more session tests

Signed-off-by: Jan Bartel <janb@webtide.com>

* fix mongodb embedded tests

Signed-off-by: olivier lamy <olamy@webtide.com>

* cleanup code

Signed-off-by: olivier lamy <olamy@webtide.com>

* use Logger rather than System.err.println

Signed-off-by: olivier lamy <olamy@webtide.com>

* Issue #2231 Add test for DefaultSessionCache

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #2231 Redisable mongo tests by default.

Signed-off-by: Jan Bartel <janb@webtide.com>

* fix issue with empty local repo build

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

* jenkins should run mongodb tests

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

* build this plugin last so we should not hit the maven invoker plugin

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

* build test first for this one

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

* use invoker plugin 3.0.2-SNAPSHOT as there is a fix for https://issues.apache.org/jira/browse/MINVOKER-191

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

* temporary use of apache snapshots repository because of maven-invoker-plugin 3.0.2-SNAPSHOT

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-28 20:14:15 +10:00
Olivier Lamy 636ed4a0fe
align maven version used #2373 (#2374)
align maven version used #2373

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-23 20:32:29 +10:00
olivier lamy 732a3c4d1c use released jacoco 0.8.1
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-23 07:12:54 +10:00
Joakim Erdfelt a74a328024 Merge branch 'release-9.4.9' into jetty-9.4.x 2018-03-21 16:33:56 -05:00
Olivier Lamy 5286fb8081
[WIP] add it test for jspc plugin so we can test it with jdk10 (#2363)
* add it test for jspc plugin so we can test it with jdk10

Signed-off-by: olivier lamy <olamy@webtide.com>

* record maven invoker results

Signed-off-by: olivier lamy <olamy@webtide.com>

* seems to be require as a dependency

Signed-off-by: olivier lamy <olamy@webtide.com>

* no need of install

Signed-off-by: olivier lamy <olamy@webtide.com>

* remove invoker as it do not support well parallel

Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-21 21:11:16 +10:00
olivier lamy 6f14b22a92 jacoco fixed for jdk 10
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-21 17:26:09 +10:00
Joakim Erdfelt c3cc138a3b Updating to version 9.4.10-SNAPSHOT 2018-03-20 08:25:59 -05:00
Joakim Erdfelt 1f8159b1e4 Updating to version 9.4.9.v20180320 2018-03-20 07:18:24 -05:00
olivier lamy c2b2935cee #2344 upgrade javadoc plugin to 3.0.0
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-17 11:18:07 +10:00
olivier lamy ff00f5383a fix bad copy/paste
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-16 12:26:04 +10:00
olivier lamy 98875c3097 add jdk11 profile
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-16 12:23:46 +10:00
Joakim Erdfelt 3f17f7853f
Merge pull request #2281 from joakime/issue-2278-dist-test-dep
Issue #2278 - making distribution pom not require tests
2018-03-15 04:45:16 -05:00
olivier lamy 39013cbc91 adding myself in developers section to test commit karma
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-15 10:09:39 +10:00
olivier lamy c22eedac8b upgrade surefire version to 2.21.0
Signed-off-by: olivier lamy <olamy@webtide.com>

use a property for surefire version and align version

Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-09 15:12:20 +10:00
Joakim Erdfelt 3c393da3f9 Issue #2278 - making distribution pom not require tests
- Speculative fix to ensure that the users of the jetty-distribution
  do not require the test artifacts to utilize the tarball / zip files
- Also disabled the snapshot repository as it causes false success
- Adding now unreferenced dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-06 16:11:07 -06:00
Jan Bartel c73ecae431
Jetty 9.4.x 2059 make osgi tests work jre9 (#2264)
* Issue #2059 WIP: make osgi tests work with jdk9

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-06 11:04:50 +11:00
Joakim Erdfelt a05b157c03 Updating to version 9.3.24-SNAPSHOT 2018-02-28 16:39:30 -06:00
Joakim Erdfelt 0554f8d8b4 Updating to version 9.3.23.v20180228 2018-02-28 15:45:57 -06:00
Lachlan Roberts 27a0cbfacd Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-2206-OperatorPrecedence 2018-02-27 14:56:33 +11:00
Lachlan Roberts 6e3f581ae4 Disabled errorprone OperatorPrecedence warnings #2206
brackets can be used optionally for clarity but aren't manditory #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-02-27 14:49:17 +11:00