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
5aaae07b94
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-11 21:09:14 +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
a8e9a8a78b
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-11 14:21:49 +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
olivier lamy
32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
olivier lamy
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
.
2018-09-06 09:27:11 +10:00
Jan Bartel
ffb11fd98f
Fix junit version in jetty-maven-plugin
2018-09-06 07:36:47 +10:00
Joakim Erdfelt
e24fc48539
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 21:27:18 +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
5afe2e215f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-23 17:17:46 +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
Greg Wilkins
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +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
Simone Bordet
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02: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
Joakim Erdfelt
0cd4dacbac
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# VERSION.txt
# aggregates/jetty-all-compact3/pom.xml
# aggregates/jetty-all/pom.xml
# apache-jsp/pom.xml
# apache-jstl/pom.xml
# examples/async-rest/async-rest-jar/pom.xml
# examples/async-rest/async-rest-webapp/pom.xml
# examples/async-rest/pom.xml
# examples/embedded/pom.xml
# examples/pom.xml
# jetty-alpn/jetty-alpn-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-client/pom.xml
# jetty-alpn/jetty-alpn-conscrypt-server/pom.xml
# jetty-alpn/jetty-alpn-java-client/pom.xml
# jetty-alpn/jetty-alpn-java-server/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-client/pom.xml
# jetty-alpn/jetty-alpn-openjdk8-server/pom.xml
# jetty-alpn/jetty-alpn-server/pom.xml
# jetty-alpn/pom.xml
# jetty-annotations/pom.xml
# jetty-ant/pom.xml
# jetty-bom/pom.xml
# jetty-cdi/cdi-2/pom.xml
# jetty-cdi/cdi-core/pom.xml
# jetty-cdi/cdi-full-servlet/pom.xml
# jetty-cdi/cdi-servlet/pom.xml
# jetty-cdi/cdi-websocket/pom.xml
# jetty-cdi/pom.xml
# jetty-cdi/test-cdi-webapp/pom.xml
# jetty-client/pom.xml
# jetty-continuation/pom.xml
# jetty-deploy/pom.xml
# jetty-distribution/pom.xml
# jetty-documentation/pom.xml
# jetty-fcgi/fcgi-client/pom.xml
# jetty-fcgi/fcgi-server/pom.xml
# jetty-fcgi/pom.xml
# jetty-gcloud/jetty-gcloud-session-manager/pom.xml
# jetty-gcloud/pom.xml
# jetty-hazelcast/pom.xml
# jetty-home/pom.xml
# jetty-http-spi/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-common/pom.xml
# jetty-http2/http2-hpack/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-http2/pom.xml
# jetty-infinispan/pom.xml
# jetty-io/pom.xml
# jetty-jaas/pom.xml
# jetty-jaspi/pom.xml
# jetty-jmx/pom.xml
# jetty-jndi/pom.xml
# jetty-jspc-maven-plugin/pom.xml
# jetty-maven-plugin/pom.xml
# jetty-memcached/jetty-memcached-sessions/pom.xml
# jetty-memcached/pom.xml
# jetty-nosql/pom.xml
# jetty-osgi/jetty-osgi-alpn/pom.xml
# jetty-osgi/jetty-osgi-boot-jsp/pom.xml
# jetty-osgi/jetty-osgi-boot-warurl/pom.xml
# jetty-osgi/jetty-osgi-boot/pom.xml
# jetty-osgi/jetty-osgi-httpservice/pom.xml
# jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi-context/pom.xml
# jetty-osgi/test-jetty-osgi-fragment/pom.xml
# jetty-osgi/test-jetty-osgi-server/pom.xml
# jetty-osgi/test-jetty-osgi-webapp/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-plus/pom.xml
# jetty-proxy/pom.xml
# jetty-quickstart/pom.xml
# jetty-rewrite/pom.xml
# jetty-runner/pom.xml
# jetty-security/pom.xml
# jetty-server/pom.xml
# jetty-server/src/main/config/etc/jetty-http.xml
# jetty-server/src/main/config/etc/jetty-ssl.xml
# jetty-servlet/pom.xml
# jetty-servlets/pom.xml
# jetty-spring/pom.xml
# jetty-start/pom.xml
# jetty-unixsocket/pom.xml
# jetty-util-ajax/pom.xml
# jetty-util/pom.xml
# jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
# jetty-util/src/test/java/org/eclipse/jetty/util/MultiExceptionTest.java
# jetty-webapp/pom.xml
# jetty-websocket/javax-websocket-client-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/pom.xml
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/AnnotatedServerEndpointConfig.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/TrackingSocket.java
# jetty-websocket/pom.xml
# jetty-websocket/websocket-api/pom.xml
# jetty-websocket/websocket-client/pom.xml
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientCloseTest.java
# jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/ClientConnectTest.java
# jetty-websocket/websocket-common/pom.xml
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulator.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/extensions/compress/CompressExtension.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/WebSocketRemoteEndpointTest.java
# jetty-websocket/websocket-server/pom.xml
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketUpgradeFilterTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/misbehaving/MisbehavingClassTest.java
# jetty-websocket/websocket-servlet/pom.xml
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/extensions/FragmentExtensionTest.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/jsr356/sockets/pong/PongContextListener.java
# jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/jsr356/ConfiguratorTest.java
# jetty-xml/pom.xml
# pom.xml
# tests/pom.xml
# tests/test-continuation/pom.xml
# tests/test-http-client-transport/pom.xml
# tests/test-integration/pom.xml
# tests/test-jmx/jmx-webapp-it/pom.xml
# tests/test-jmx/jmx-webapp/pom.xml
# tests/test-jmx/pom.xml
# tests/test-loginservice/pom.xml
# tests/test-quickstart/pom.xml
# tests/test-sessions/pom.xml
# tests/test-sessions/test-file-sessions/pom.xml
# tests/test-sessions/test-gcloud-sessions/pom.xml
# tests/test-sessions/test-hazelcast-sessions/pom.xml
# tests/test-sessions/test-infinispan-sessions/pom.xml
# tests/test-sessions/test-jdbc-sessions/pom.xml
# tests/test-sessions/test-memcached-sessions/pom.xml
# tests/test-sessions/test-mongodb-sessions/pom.xml
# tests/test-sessions/test-sessions-common/pom.xml
# tests/test-webapps/pom.xml
# tests/test-webapps/test-http2-webapp/pom.xml
# tests/test-webapps/test-jaas-webapp/pom.xml
# tests/test-webapps/test-jetty-webapp/pom.xml
# tests/test-webapps/test-jndi-webapp/pom.xml
# tests/test-webapps/test-mock-resources/pom.xml
# tests/test-webapps/test-proxy-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/pom.xml
# tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
# tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
# tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
# tests/test-webapps/test-webapp-rfc2616/pom.xml
2018-06-12 11:11:38 -05: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
Joakim Erdfelt
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -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
67d887758d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-03-29 17:36:29 +11: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
Joakim Erdfelt
f56fb440a5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-03-26 11:50:47 -05: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
1c04f9838d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-22 16:42:42 -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
Joakim Erdfelt
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06: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
7b2e490036
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-12 22:24:17 +01: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
650b804142
Issue #2108 - Updating license headers for year 2018
2018-01-09 10:14:52 -06:00
Joakim Erdfelt
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06: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
Greg Wilkins
45e3abbdcf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 13:17:32 +01: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
1a807b5195
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-11 16:19:09 +11:00
Jan Bartel
98f57fa97f
Issue #1868
...
Fix javadoc
2017-10-11 16:18:30 +11:00
Jan Bartel
6df5377634
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-11 15:41:54 +11:00
Jan Bartel
5656594b4b
Issue #1868
2017-10-11 15:40:55 +11:00
Jan Bartel
e9d813552b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-05 17:37:11 +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
b04e8a285a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-03 18:31:19 +11:00
Jan Bartel
d5ff4fa075
Issue #1640
...
Fix integration test for run mojo.
2017-10-03 17:59:03 +11:00
Jan Bartel
f4ccbc8c70
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-03 16:35:58 +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
3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -07: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
Simone Bordet
4bee2e877f
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-02 23:02:06 +02:00
Jan Bartel
4e1105a526
Issue #1623
...
Remove projects.classes.dirs, using only lib.jars property.
2017-08-02 15:37:39 +10:00
Jan Bartel
580310f523
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-20 13:27:03 +02:00
Jan Bartel
41938b2310
Issue #1623
...
Ensure restarts recreate classpath.
2017-07-20 13:24:46 +02:00
Jan Bartel
5e04d8160b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-20 13:14:51 +02:00
olivier lamy
1b5b59cca3
some cleanup per Jan review
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-07-20 14:10:42 +10:00
olivier lamy
c78ba059c0
simplify code, add more details in junit failure #1623
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-07-19 21:50:37 +10:00
Joakim Erdfelt
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
Joakim Erdfelt
5b6b80ef81
Merge remote-tracking branch 'origin/jetty-9.4.x' into backport-jws11
2017-07-12 11:18:20 -07:00
Joakim Erdfelt
c465a9d833
Renaming to fit Eclipse Jetty naming guidelines
2017-07-10 18:17:16 -07:00
Joakim Erdfelt
ee8d4c1587
gitattributes followup
2017-07-06 16:24:31 -07:00
olivier lamy
8146001093
add it test for run war exploded mojo
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-24 21:27:24 +10:00
olivier lamy
388106303f
add it test for run war mojo
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-24 21:22:06 +10:00
olivier lamy
008158d975
fix fragment from dependent projects #1623
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 21:32:11 +10:00
olivier lamy
4d43261031
version in only one place
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 20:46:09 +10:00
olivier lamy
52fa23b968
try to fix web fragment for directory classes #1623
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 20:35:59 +10:00
olivier lamy
7e27f03884
add test with fragment for #1623
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 15:51:38 +10:00
olivier lamy
5f96644cf8
Add it test for Maven Plugin #1638
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 15:07:18 +10:00
olivier lamy
d72718b67f
fix run forked support of reactor projects
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 14:55:44 +10:00
olivier lamy
1e7e356865
add test for run forked mojo
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-23 10:42:03 +10:00
olivier lamy
a275032915
add it for run mojo #1638
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-22 16:24:13 +10:00
Greg Wilkins
23c8e64fd8
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-21 14:40:13 +02:00
Greg Wilkins
11b5cf5a2b
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-06-21 11:48:41 +02:00
Joakim Erdfelt
5638f7b25b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-16 14:33:01 -07:00
olivier lamy
43f778946f
use outputDirectory from reactor projects rather than having to install dependencies first #1623
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-16 10:46:21 +10:00
Greg Wilkins
b5a3eb1f70
removed Configuration marker classes
2017-05-11 11:32:23 +02:00
Jan Bartel
976ffb7ecd
Issue #877
...
And also #1117
2017-03-23 11:24:22 +11:00
Jens Reimann
4acaf2c250
Remove "and others" in order to pass Jetty CI
...
Signed-off-by: Jens Reimann <jreimann@redhat.com>
2017-02-07 09:06:20 +01:00
Jens Reimann
0f19cb7e97
Allow to externally provide 'daemon' parameter
...
This change allows to provide the 'daemon' parameter using a property
using "-Djetty.daemon" in addition.
Signed-off-by: Jens Reimann <jreimann@redhat.com>
2017-02-06 16:17:30 +01:00
Simone Bordet
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01: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
79c364368d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-11-24 15:51:06 +11:00
Jan Bartel
40d9e56d92
Issue #1117
2016-11-24 14:04:37 +11:00
Jan Bartel
749b68341d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-28 15:38:22 +10:00
Jan Bartel
6a17019235
Issue #785
2016-07-28 15:36:02 +10:00
Jan Bartel
c3da8b27eb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-06 13:43:52 +10:00
Jan Bartel
c913bc7150
Issue #690
2016-07-06 13:41:59 +10:00
Joakim Erdfelt
43ba169b43
Fixing broken javadoc
2016-05-04 13:35:15 -07:00
Greg Wilkins
a5ad291add
Squashed commit of the following: ( #528 )
...
commit 4bf6b7c951
Merge: a50e882
301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 27 12:12:08 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 23 09:38:00 2016 +1000
work in progress
commit 4e286266c0
Merge: 5ae7da0
f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 16:34:12 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 12:12:24 2016 +1000
Work in progress on Features
commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 22:05:55 2016 +1000
Refactor Configurations.isEnabledByDefault, enable all configurations by default.
commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 17:32:22 2016 +1000
Fix features for jsp with osgi
commit 22d2b251e9
Merge: 571d503
2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 14 16:19:43 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 13 15:36:36 2016 +1000
code comment
commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 9 21:24:22 2016 +1000
fixed quickstart validation
commit 154d58bf62
Merge: 8e54aad
ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:25:17 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:21:30 2016 +1000
general cleanup of Configuration and ClasspathPattern usage
commit 65f8e5dbd0
Merge: ea1deda
2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 09:15:28 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit ea1deda4f9
Merge: cfe9c83
f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 18:21:56 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 17:57:23 2016 +1100
work in progress
commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 10:11:49 2016 +1100
work in progress
commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 14:01:00 2016 +1100
progress on OSGi
commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:52:33 2016 +1100
Fixed plugin
commit f08b84ba0e
Merge: f19bd2c
8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:55 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:06 2016 +1100
work in progress... all but OSGi
commit 2f15c3e4f9
Merge: 36b5687
7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 16:52:43 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 36b5687329
Merge: 13d914a
e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 07:20:05 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 04:41:30 2016 +1100
Work in progress on Features
Moved jar discovery to META-INF
commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 17:48:15 2016 +0100
Work in progress towards new quickstart arch
commit c5c23698c4
Merge: fd34007
692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:29:18 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:04:35 2016 +0100
Work in progress on Features for QuickStart
commit c5f0c80cd2
Merge: 0e6d886
b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 4 16:05:23 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 0e6d886b01
Merge: d150405
2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 17:32:36 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit d1504055de
Merge: 22a6cd0
3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 15:21:20 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 20:53:17 2016 +0100
Features work in progress
convert more server/system classes to Configurations
commit 037e04bfe5
Merge: add9876
bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 17:11:04 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit add9876f83
Merge: 5263f15
eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Feb 25 10:11:08 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5263f15acd
Merge: 89803ae
21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 23 14:35:31 2016 +0100
Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature
commit 89803aec95
Merge: 5fed7c7
779317d
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 16:09:38 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 11:21:13 2016 +0100
fixed merge
commit ec22a1ba0b
Merge: 4c8257d
d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 10:53:16 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 17 09:34:28 2015 +1100
Do not default quickstart
commit 57ce87770a
Merge: 14bde1f
96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 16 17:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 16:26:58 2015 +1100
work in progress on Configurations as services
commit 46ce2aef3a
Merge: 9e82fa0
ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 10:11:09 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 08:52:37 2015 +1100
work in progress to Configurations as ServiceLoader
commit 6e11f22de4
Merge: 120e330
5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 18:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 120e33034f
Merge: 6c5b95d
384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 14:20:52 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 6c5b95d6b8
Merge: 722eb60
5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 2 11:16:37 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 13:58:16 2015 +1100
Configurations can add server/system classes
commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 11:47:03 2015 +1100
Self ordering WebApp Configurations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-05-02 17:55:54 +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
Jan Bartel
1dcb7dd986
439194 Do not configure fake server for jetty:run-forked
2014-07-17 08:28:38 +10:00
Jan Bartel
28998e4913
439399 Scan tlds for apache jasper standard taglib with jetty-maven-plugin
2014-07-11 17:38:31 +10:00
Jan Bartel
c674c41003
438895 Add mvn jetty:effective-web-xml goal
2014-07-10 17:29:03 +10:00
Jan Bartel
b13859c641
Fix javadoc for jetty:run mojo to point to correct documentation.
2014-07-10 17:29:03 +10:00
Greg Wilkins
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
Jan Bartel
10da0e1015
439194 Refactor mvn jetty:run-forked so that it is configurable the same as the other jetty:run-X goals
2014-07-09 15:07:39 +10:00
Jan Bartel
723640edbd
437430 jettyXml not consistent between jetty:run and jetty:run-forked
2014-06-16 18:31:14 +02:00
Jan Bartel
1386f20cf5
435217 Remove deprecated TagLibConfiguration
2014-05-19 18:20:52 +02:00
Greg Wilkins
0bbec3826c
430341 use apache jsp/jstl for maven plugins
2014-04-03 14:27:27 +11:00
Jan Bartel
8384b0febe
428418 JettyStopMojo prints some messages on System.err
2014-02-19 12:06:10 +11:00
Joakim Erdfelt
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
Jan Bartel
7ecbd97588
418769 Allow resourceBases in run-forked Mojo
2013-11-21 16:55:45 +11:00
Greg Wilkins
f567bddad9
global clean up imports
2013-11-04 13:48:03 +11:00
Jan Bartel
9d756dc018
294531 Unpacking webapp twice to the same directory name causes problems with updated jars in WEB-INF/lib
2013-10-28 15:25:21 +11:00
Jan Bartel
c5fe3bcfd3
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
2013-10-21 17:27:45 +11:00
Jan Bartel
3f852cf3db
416597 Allow classes and jars on the webappcontext extraclasspath to be scanned for annotations by jetty-maven-plugin
2013-10-21 16:44:33 +11:00
Jan Bartel
278dab08b8
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/resources/org/eclipse/jetty/start/usage.txt
2013-10-14 17:03:02 +11:00
Jan Bartel
9a330dad1b
418767 run-forked goal ingores test scope dependencies with useTestScope=true
2013-10-14 16:51:59 +11:00
Jan Bartel
d505350a9f
418596 Faults in JARs during class scanning should report the jar that caused the problem
2013-10-04 11:02:06 +10:00
Jan Bartel
0400289826
417561 Refactor annotation related code - make annotation phase able to be multithreaded
2013-09-30 13:27:05 +10:00
Greg Wilkins
5f02620603
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
2013-09-30 13:20:13 +10:00
Jan Bartel
cb554948a2
417574 Setting options with _JAVA_OPTIONS breaks run-forked with <waitForChild>true</waitForChild>
2013-09-30 12:23:14 +10:00
Joakim Erdfelt
1fcede8b8b
Merge branch 'master' into jetty-9.1
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/MultiMapTest.java
2013-09-26 06:07:06 -07:00
Joakim Erdfelt
ac40e7ab6a
Fixing various javadoc errors
2013-09-25 08:11:32 -07:00
Joakim Erdfelt
a20b39e9ab
Fixing build error
2013-09-23 14:11:04 -07:00
Jan Bartel
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00
Jan Bartel
f44787075a
417382 - Upgrade to asm 4.1 and refactor annotation parsing
2013-09-17 13:12:54 +10:00
Simone Bordet
a23e899aff
Enabled JSR WebSocket out of the box.
2013-09-13 11:20:17 +02:00
Simone Bordet
c86ecc50fa
Fixed logger name and reduced logging level.
2013-09-13 11:20:17 +02:00
Mikhail Mazursky
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Jan Bartel
1ad9d6cff6
411934 War overlay configuration assumes src/main/webapp exists
2013-08-22 20:03:46 +10:00
Jesse McConnell
ae3286f9fc
[Bug 412713] add dumpOnStart configuration to jetty-maven-plugin
2013-07-10 15:54:48 -05:00
Jan Bartel
fde47b1083
412637 ShutdownMonitorThread already started
2013-07-10 17:21:43 +10:00
Jan Bartel
232eb4491a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-06-17 13:13:59 +10:00
Greg Wilkins
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
Jan Bartel
d581dac287
409684 Ids and properties not set for execution of jetty xml config files with mvn plugin
2013-06-03 12:34:37 +10:00
Jesse McConnell
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
Jan Bartel
79f6121894
407812 - jetty-maven-plugin can not handle whitespaces in equivalent of WEB-INF/classes paths
2013-05-13 17:51:12 +10:00
Jan Bartel
28d4f41572
405631 Plugin gives error when its started twice
2013-04-26 16:31:10 +10:00
Jan Bartel
4951b1ccc4
404176 Jetty's AnnotationConfiguration class does not scan non-jar resources on the container classpath
2013-03-28 19:33:52 +11:00