Commit Graph

449 Commits

Author SHA1 Message Date
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
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
Olivier Lamy 154e5ea1a5
align plugin version (#2893)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-10 18:38:34 +10:00
Jan Bartel ffb11fd98f Fix junit version in jetty-maven-plugin 2018-09-06 07:36:47 +10: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 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
Greg Wilkins 460f3fcb9b
Close on graceful #2749 (#2772)
Cleanup of Graceful shutdown, plus ensure Connection:close if connector is shutdown for #2749 
* WIP close connection when shutting down
* WIP use HttpChannel.Listener
* cleanups
* support graceful stop of a context
* only close connections if the connector is shutdown
* minor cleanups
* fixed toString and test
* fixed imports
* Move close logic to HttpConnection
* fixed generator to not override persistent
* Issue #2749 - Close connections on graceful shutdown.
* Small fix after review.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-23 08:08:17 +10:00
Kazuhiro Sera 96218e8bc4 Fix typos detected by github.com/client9/misspell
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
2018-08-10 23:52:16 +09: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
lachan-roberts e05c11ae30 Changing default Http headerCacheSize from 512 to 4096
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2018-07-10 10:39:45 +10:00
olivier lamy 127b302999 increase default timeout to prevent failure on slow machines
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-13 12:13:59 +10:00
olivier lamy eed55854e5 #2600 increase wait time as start can be long for some machines
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-11 18:00:42 +10:00
Simone Bordet 4f1dd352d6
Issue #2468 - Remove SoLinger. (#2644)
* Issue #2468 - Remove SoLinger.

For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.

As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-06-09 13:21:24 +02: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
olivier lamy c134792d2d fix issue for windows build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-06 21:39:06 +10: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
Olivier Lamy 28466efa04
rework maven it test to avoid duplicate class, try to make port file creation atomic (#2607)
* use a single instance of the class TestGetContent.java #2600
* make the jetty.port file creation atomic
* enforce some tests
* ensure we use the correct java home to run invoker plugin, yes this should fail on ci for jdk9+
* use an other maven home for invoker runs
* include failsafe-reports from maven invoker plugin

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-06-05 18:18:42 +10: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
Greg Wilkins 2bcc528920 expand spruious tabs in java sources
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-29 10:40:09 +02:00
olivier lamy a52ff588dc no need of this field
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-06 20:48:05 +10:00
Olivier Lamy 4c4294ffc2
Issue #2496 - Add Integration Tests for jetty-maven-plugin skip behavior (#2507)
* Add Integration Tests for jetty-maven-plugin skip behavior #2496

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

* add missing license headers

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

* add missing license headers

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

* add missing license headers

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

* add missing license headers

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-05 10:03:56 +10:00
Olivier Lamy 5faf018fbc
[WIP] [DO NOT MERGE] ensure maven its run correctly (#2505)
* ensure we correctly run maven it tests

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

* ensure we correctly run maven it tests

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-05-04 13:35:54 +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
Joakim Erdfelt 4248388a77 Issue #2496 - Standardizing skip message syntax.
+ Both configuration based and manual skip now have the same
  skip message syntax.

+ Moving configuration based skip evaluation to earlier point
  to eliminate noise that is unrelated to skip message.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-02 13:34:30 -05:00
Joakim Erdfelt 97ace5a45c Issue #2496 - Improving plugin execution skip language.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-05-02 13:25:22 -05:00
Olivier Lamy ce1317f204
add it test for #2430 which works... (#2442)
* add it test for 2430 which works...

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

* fix missing header

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-16 10:22:56 +10:00
Olivier Lamy 42d9da56c0
use maven annotations for jetty plugins #2404 (#2400)
* use maven annotations for jspc mojo

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

* use maven annotation for jetty-maven-plugin

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-03 17:30:25 +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 6821506985 add list of supported packaging for run mojos #2372 (#2375)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-27 17:45:00 +11: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 682ac94373
rename classes to avoid using Servlet in the name as it is confusing #2370 (#2371)
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-23 13:03:15 +10:00
Olivier Lamy d726fe5c03
deploy war mojo it test (#2365)
* add it test for JettyDeployWar mojo #2213

Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-23 10:52:49 +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
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
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
Joakim Erdfelt f9658f06b5 Issue #2139 - updating all DTD references to to configure_9_3.dtd
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-13 14:36:12 -05: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
Lachlan Roberts a639ee9275 Resolved errorprone MissingOverride warnings #2206
`@Override` was added to methods which were missing the annotation #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-01 13:59:25 +11:00
olivier lamy 866461a501 use a separated local maven repo per build and run maven in multi thread surefire configuration improvement
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-27 10:06:52 +10:00
Jan Bartel 85ed19ce3f Issue #2209 Require war packaging only for some jetty maven plugin goals.
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-22 14:31:42 +11:00
Jan Bartel 8e9828bb66 Issue #2170 Add extra info re jetty maven plugin integration test log output 2018-02-21 17:19:34 +11:00
olivier lamy e24b88b433 fix typo
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-01 18:43:40 +10:00
olivier lamy 51c895db06 #2170 add a basic README for Maven integration tests
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-01 11:00:25 +10:00
olivier lamy bd24762d01 change failsafe plugin version to fix maven plugin its #2170
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-01 10:40:13 +10:00