Commit Graph

205 Commits

Author SHA1 Message Date
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
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
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 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
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
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
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 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
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 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
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
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
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
Jan Bartel 65101b776b
Issue #2080 Exclude cdi packages coming from maven plugin dependencies (#2084)
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-01-12 18:56:00 +01:00
Joakim Erdfelt 21365234f8 Issue #2108 - Updating license headers for year 2018 2018-01-09 09:44:41 -06:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Joakim Erdfelt fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt 067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
olivier lamy 5a323a01dd more javadoc fixes #2056
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-09 13:35:58 +11:00
olivier lamy 041a3260b6 more javadoc fixes #2056
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-09 09:04:29 +11:00
Jan Bartel 98f57fa97f Issue #1868
Fix javadoc
2017-10-11 16:18:30 +11:00
Jan Bartel 5656594b4b Issue #1868 2017-10-11 15:40:55 +11:00
Jan Bartel 09e9cd1bef Issue #1640
Use unique package names for it tests for jenkins tracking.
2017-10-04 13:24:26 +11:00
Jan Bartel d5ff4fa075 Issue #1640
Fix integration test for run mojo.
2017-10-03 17:59:03 +11:00
Jan Bartel b451ee7a63 Issue #1640
Update javadoc.
2017-10-03 14:19:59 +11:00
Jan Bartel 2f5f01a160 Issue #1640
Documentation.
2017-09-21 16:08:33 +10:00
Jan Bartel 303784042e Issue #1640
Clean up import statements.
2017-09-21 14:10:55 +10:00
Jan Bartel c124803e6d Issue #1640
Change jetty:run-forked to use presence of file as signal child process has started.
2017-09-21 08:57:17 +10:00
Jan Bartel 320f734fcd Issue #1640
Improve javadocs
2017-09-14 08:53:27 +10:00
Jan Bartel 860e0ec904 Allow setting of env for forked process that runs distro 2017-08-24 16:50:07 +10:00
Jan Bartel b37fcf3f2c Issue #1768 2017-08-24 16:35:41 +10:00
Jan Bartel 87d0598d8c Add it tests for jetty:run-distro 2017-08-15 16:35:17 +10:00
Jan Bartel 2acb97db2f Issue #1640
Replay changes after change to jetty-9.4.x base branch.
2017-08-10 13:56:05 +10:00
Joakim Erdfelt 1311052b15 Cleaning up state of branch to match the original jetty-9.4.x
+ Does not include changes to /jetty-cdi/
+ Does not include changes to /jetty-websocket/ for javax.websocket-1.1
2017-08-08 09:47:04 -07:00
Jan Bartel 19e539a87d Issue #1623
Remove projects.classes.dirs, using only lib.jars property.
2017-08-08 09:15:48 -07:00
Jan Bartel ccf89b81ad Issue #1623
Ensure restarts recreate classpath.
2017-08-08 09:15:06 -07:00
olivier lamy 2c60f59325 some cleanup per Jan review
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:15:04 -07:00
olivier lamy 0fac9c390a simplify code, add more details in junit failure #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:14:56 -07:00
Joakim Erdfelt b8759bc2c7 Renaming to fit Eclipse Jetty naming guidelines 2017-08-08 09:14:23 -07:00
olivier lamy 6ac625e226 add it test for run war exploded mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:55 -07:00
olivier lamy 4b513c61e8 add it test for run war mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:55 -07:00
olivier lamy dfb4e85c0a fix fragment from dependent projects #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:54 -07:00
olivier lamy aae7b38b82 version in only one place
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:53 -07:00
olivier lamy 8095da3848 try to fix web fragment for directory classes #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:52 -07:00
olivier lamy 7dcab0e5a2 add test with fragment for #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:52 -07:00
olivier lamy 4024273fa6 Add it test for Maven Plugin #1638
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:51 -07:00
olivier lamy 2f9dc58699 fix run forked support of reactor projects
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:50 -07:00
olivier lamy 1cdc94f0a5 add test for run forked mojo
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:49 -07:00
olivier lamy b0e5681451 add it for run mojo #1638
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:47 -07:00
Greg Wilkins a105be95e4 Issue #1637 Thread per HTTP/2 Connection
This fix simplifies the EWYK scheduler by factoring out the preallocated producer into a
ReservedThreadExecutor class.   A shared ReservedThreadExecutor can then be used by multiple
EWYK instances to avoid over allocation of threads.

Squashed commit of the following:

commit c435dc20e25bd274d69423be1be7b0565925f249
Merge: 58a5a9a 90e5b56
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 21 10:48:22 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 58a5a9a655ee1a72a66f54ac8c95d7c9d73afe85
Author: Simone Bordet <simone.bordet@gmail.com>
Date:   Wed Jun 14 15:56:43 2017 +0200

    Code cleanups.

commit 4e5296216b52948523572352cba391438ff6b494
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:34:58 2017 +0200

    refixed Producing to Reproducing

commit a1f8682f86d1f0803121162e3f14d7768286d3ed
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Jun 14 07:26:29 2017 +0200

    fixed Producing to Reproducing

commit 9468932e062d2271d8dc1d43a78544757732fff5
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:33:44 2017 +0200

    fixed javadoc

commit 9d4941eb97638fec09b3fe34d423538d17943b6f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 16:05:27 2017 +0200

    Renamed Preallocated to ReservedThread

commit 6d3379ab64c6dcc2a7aa8ec7088afd77863816c2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 12:28:52 2017 +0200

    Added configuration in modules

commit 1bd1adea4682538e1546c2ae53f4c9340dafb3bb
Merge: 83418a9 6702248
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:09:29 2017 +0200

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-ewyk3

commit 83418a91320c8bfc54465ca02efdce0d2c874a0e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Jun 13 10:08:35 2017 +0200

    javadoc

commit 62918fd39189fed3414fec4a7c8380c21e90a4b8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Sat Jun 10 00:04:06 2017 +0200

    Improved EatWhatYouKill implementation

    Simplified by abstracting out PreallocatedExecutor
    Removed invocation execution
    HTTP2 now uses a shared PreallocationExcecutor between connection
2017-08-08 09:13:44 -07:00
olivier lamy 20ca6277a8 use outputDirectory from reactor projects rather than having to install dependencies first #1623
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:38 -07:00
Jan Bartel 976ffb7ecd Issue #877
And also #1117
2017-03-23 11:24:22 +11:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Jan Bartel 40d9e56d92 Issue #1117 2016-11-24 14:04:37 +11:00
Jan Bartel 6a17019235 Issue #785 2016-07-28 15:36:02 +10:00
Jan Bartel c913bc7150 Issue #690 2016-07-06 13:41:59 +10:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Greg Wilkins 3527c6a71b StringUtil.csvSplit(String)
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2015-12-08 14:54:33 -07:00
Jan Bartel ac416d21e8 481203 Add ability to set configurations to apply to WebAppContext for jetty-maven-plugin 2015-11-02 12:36:39 +11:00
Joakim Erdfelt 80675ce1d2 Javadoc fixes 2015-10-06 08:03:51 -07:00
Jan Bartel 77bdf84f5c 470505 jetty-maven-plugin JettyWebAppContext#setQuickStartWebDescriptor should accept a Maven-friendly type 2015-07-08 17:10:31 +10:00
Jan Bartel 2349f20edf 470963 Update jetty-maven-plugin mojo annotations for maven 3 2015-06-26 16:35:55 +10:00
Jan Bartel 3ac6a727cf 470803 If a webapp is not fully started do not fully stop it 2015-06-25 18:29:51 +10:00
Greg Wilkins 3e401a62e9 StringUtil.csvSplit(String) 2015-06-19 16:48:53 +10:00
Jan Bartel 1b635ff2f6 462346 Change classesPattern to scanClassesPattern and testClassesPattern to scanTestClassesPattern to clarify purpose 2015-06-17 13:59:54 +10:00
Jan Bartel 1f3be625e6 462346 Add pattern to jetty:run default classes and test classes scan paths 2015-06-17 13:18:56 +10:00
Jan Bartel e30c05cc2b Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	tests/test-integration/src/test/java/org/eclipse/jetty/test/support/TestableJettyServer.java
	tests/test-integration/src/test/resources/BIOHttp.xml
	tests/test-integration/src/test/resources/BIOHttps.xml
	tests/test-integration/src/test/resources/NIOHttp.xml
	tests/test-integration/src/test/resources/NIOHttps.xml
2015-04-30 10:44:44 +10:00
Jan Bartel d7de34af76 465202 Forked Mojo does not extract war overlays/dependencies 2015-04-29 18:01:41 +10:00
Joakim Erdfelt 4db2784354 464727 - Update Javadoc for Java 8 DocLint 2015-04-22 16:54:50 -07:00
Simone Bordet 599ab9bb1b 460671 - Rationalize property names.
Property format is now "jetty.<module|component>.<propertyName>".

Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Jan Bartel 247a94c8e5 Integrate cdi with jetty-maven-plugin 2015-03-27 16:18:58 +11:00
Jan Bartel 576892d739 461415 Maven Jetty Plugin ignores ZIP overlays 2015-03-20 16:42:30 +11:00
Joakim Erdfelt a3201a3c81 Happy New Year 2015 2015-01-07 17:06:59 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Jan Bartel 947a872203 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-31 13:31:12 +11:00
Jan Bartel 30081946d7 449372 Make jvmArgs of jetty:run-forked configurable from command line 2014-10-31 13:29:45 +11:00
Jan Bartel d0a6a34fcc 448675 Impossible to set own Threadpool when using jetty-maven-plugin 2014-10-30 17:19:22 +11:00
Jan Bartel 3eb42e7183 445830 Support setting environment variables on forked jetty with jetty:run-forked 2014-10-03 14:27:35 +10:00
Jan Bartel 607797b005 444676 Goal jetty:deploy-war produces errors with version 9.2.3 2014-09-24 14:33:32 +10:00
Jan Bartel 75c92bf76a 438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal 2014-08-01 12:44:30 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00