a1e6d5856a
Issue #3303 - Update to jakarta ee javax artifacts for jetty-10.
...
Updated javax.transaction -> jakarta.transaction.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-12 14:41:05 +01:00
c30c8d4339
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-3162_jetty_servlet_api
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-client/pom.xml
# jetty-http/pom.xml
# jetty-http2/http2-client/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-http2/http2-server/pom.xml
# jetty-osgi/test-jetty-osgi/pom.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty-with-custom-class.xml
# jetty-osgi/test-jetty-osgi/src/test/config/etc/jetty.xml
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootHTTP2Conscrypt.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithAnnotations.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJavaxWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithWebSocket.java
# jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestOSGiUtil.java
# jetty-quickstart/pom.xml
# jetty-servlets/pom.xml
# jetty-util/pom.xml
# jetty-websocket/javax-websocket-client/pom.xml
# jetty-websocket/javax-websocket-server/pom.xml
# jetty-websocket/jetty-websocket-server/pom.xml
# pom.xml
2019-01-30 11:56:58 -06:00
63f2023e05
happy new year!!
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-01-01 12:17:53 +10:00
bfa2dbf68c
Issue #3162 - Use Jetty specific Servlet API jar.
...
* Updated module-info.java to reference the "jetty.servlet.api" module.
* Updated POMs to reference the o.e.j.toolchain:jetty-servlet-api artifact.
* Removed references to jetty-schemas.jar.
* Updated attribute "org.eclipse.jetty.server.webapp.ContainerIncludeJarPattern"
to match the new Jetty Servlet API jar.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-29 16:51:29 +01:00
5f972b451c
Jetty 10.0.x 2978 add module info ( #3120 )
...
Fixes #2978 - Add module-info to relevant Jetty modules.
Added module-info.java for Jetty modules that are not test modules.
Moved jetty-http test utility classes to new module "jetty-http-tools".
Removed generation of test-jar from websocket-core.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-11-22 12:37:35 +01:00
42cda7bc7f
Issue #2191 JPMS Support
...
Renamed ClasspathPattern to ClassMatcher as it also supports JPMS modules etc.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-17 10:08:20 +11:00
32912b922d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-06 17:39:57 +10:00
1504b7da93
Revert "Issue #2431 - Upgrade to Junit 5 ( #2436 )"
...
This reverts commit e24fc48539
2018-09-06 09:27:11 +10:00
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
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
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +10:00
23bf2504fe
Issue #2720 Ensure standard jetty properties available in jetty-env.xml ( #2806 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-08-16 08:29:12 +10:00
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
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
f36eba4577
class.newInstance is deprecated #2435 ( #2437 )
...
* Class.newInstance() is deprecated in Java 9+ #2435
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-17 19:07:20 +10:00
534b8ea38b
Add edit warning for .mod files. Resolves #173
2018-03-15 13:23:42 -04:00
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06:00
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
c9dd17bf9a
Merge pull request #2110 from eclipse/issue-1602-deployer-error
...
Issue #1602 - Deployment Error should fail fast
2018-02-08 08:44:19 -06:00
1440b2d1fa
Issue #1602 - WebAppContext Deployment fail should be on Throwable, not Exception
2018-01-09 11:58:57 -06:00
d5a0878019
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 10:08:30 -06:00
41ed9f29f4
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-01-09 09:37:25 -06:00
fa4c7b0ca9
Issue #2108 - Updating license headers for year 2018
2018-01-09 08:39:37 -06:00
067fc5d2d8
Issue #2108 - Upgrade licenses for 2018
2018-01-09 07:42:06 -06:00
45e3abbdcf
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-09 13:17:32 +01:00
e07ba49283
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-12-29 11:07:51 +11:00
56e40b3011
Issue #1597
...
Reinstate changes after incorrect merge from jetty-9.4.x branch.
2017-08-30 12:26:05 +10:00
3ec5f8fa3d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-09 16:21:08 -07:00
ce4a8df311
Fixing module [name] warning
2017-08-08 09:14:59 -07:00
3296c01e8e
Issue #1600
2017-08-08 09:13:29 -07:00
21b1ecef7b
Issue #1597
...
Removed javax.mail and javax.transaction jars and tidied up dependencies for test webapps.
2017-06-21 16:20:01 +02:00
76ace004b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-09 09:17:43 -07:00
10a6e5fa5e
Issue #1600
2017-06-09 11:55:21 +02:00
32bc9292a2
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-31 11:56:47 +02:00
e9f398cf41
Deprecate ConcurrentHashSet ( #1570 )
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-05-30 21:46:11 +02:00
1fc046fb3d
renamed for clarity
2017-05-09 09:52:20 +02:00
cef2ff9522
Happy New Year 2017.
2017-01-19 19:31:53 +01:00
0c8273f2ca
Happy New Year 2017.
2017-01-19 19:26:41 +01:00
07838b057f
Happy New Year 2017.
2017-01-19 18:54:03 +01:00
347c48d657
Revert "resolve merge and update license headers"
...
This reverts commit 53b31b03dd4565c186d7
2017-01-19 18:26:43 +01:00
53b31b03dd
resolve merge and update license headers
2017-01-19 09:33:16 -06:00
ce3e6dafec
update license headers to 2017
2017-01-19 09:30:00 -06:00
84f7fc31cb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-10-06 12:01:50 +11:00
d9669e7282
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-08-05 18:27:39 +10:00
9984ff533b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-05 18:26:39 +10:00
0ec64ee2a3
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x
2016-08-05 18:25:13 +10:00
6f643d6982
Issue #817
2016-08-05 18:12:24 +10:00
a5ad291add
Squashed commit of the following: ( #528 )
...
commit 4bf6b7c951a50e882301fc12a50e8825a34e286266c05ae7da0f550fcd5ae7da049badfc430ad470cca692cc22d2b251e9571d5032c4cdbe571d50315ed9b229f298154d58bf628e54aadef923388e54aad41465f8e5dbd0ea1deda2fb9b55ea1deda4f9cfe9c83f92588ccfe9c83691725be8c05161d2c07534a977536c7df08b84ba0ef19bd2c8a24798f19bd2c65a2f15c3e4f936b56877b1486b36b568732913d914ae7081d713d914aa7cd41bd264adc5c23698c4fd34007692aae0fd34007c3dc5f0c80cd20e6d886b61c5ff0e6d886b01d1504052b67e04d1504055de22a6cd03300d5422a6cd05b7037e04bfe5add9876bb08b65add9876f835263f15eb5e25c5263f15acd89803ae21fdaf589803aec955fed7c7779317d5fed7c713fec22a1ba0b4c8257dd0541e54c8257d23b57ce87770a14bde1f96e4d7214bde1f69646ce2aef3a9e82fa0ae9dc799e82fa0a226e11f22de4120e3305afa348120e33034f6c5b95d384caf06c5b95d6b8722eb605e40bf2722eb60ce52972354db7
2016-05-02 17:55:54 +10:00
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
Simone Bordet
Joakim Erdfelt
olivier lamy
Greg Wilkins
Jan Bartel
Kazuhiro Sera
Olivier Lamy
WalkerWatch
Lachlan Roberts
olivier lamy
Christoph Dreis
Jesse McConnell