29b960551f
Merge branch `release-9.4.17` into `jetty-9.4.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-bom/pom.xml
2019-04-25 09:15:42 -05:00
812f3dbd2e
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-04-25 11:26:33 +02:00
ab03504a2f
Issue #3573 Update bom for infinispan.
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-04-25 06:22:24 +02:00
05bb111580
Updating to version 9.4.18-SNAPSHOT
2019-04-18 15:59:49 -05:00
aa1c656c31
Updating to version 9.4.17.v20190418
2019-04-18 14:44:28 -05:00
79537a5f51
Updating to version 9.4.17-SNAPSHOT
2019-04-11 11:00:24 -05:00
e0aa4ae4c0
Updating to version 9.4.16.v20190411
2019-04-11 10:01:26 -05:00
9cdb59d4d7
Updating to version 9.4.16-SNAPSHOT
2019-02-15 13:35:15 -05:00
eb70b24016
Updating to version 9.4.15.v20190215
2019-02-15 11:53:00 -05:00
1b904c0b77
Fixed #3351 - Restructure jetty-unixsocket module.
...
Split the original module into modules -common, -client, -server.
Added module-info.java for the new modules, referencing the JNR
JPMS module names.
Updated depedencies from old module to new modules.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-02-13 09:16:56 +01:00
5095c8a7b2
Issue #3288 - Correcting Jetty WebSocket API artifactIds
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-01-23 15:58:11 -06:00
1176b267b5
removed -impl from websocket name and fixed SCI
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-12-13 10:05:10 +11:00
21f66bb972
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-11-21 10:45:05 -06:00
b191d69bb0
bom: inherit project; use flatten plugin to sanitize bom ( #3114 )
...
Signed-off-by: Steven Schlansker <stevenschlansker@gmail.com>
2018-11-21 20:38:03 +10:00
52f316e5b3
Updating to 9.4.15-SNAPSHOT
2018-11-15 09:47:43 -06:00
29fd18e046
Updating to version 9.4.15-SNAPSHOT
2018-11-14 16:42:40 -06:00
c4550056e7
Updating to version 9.4.14.v20181114
2018-11-14 15:19:10 -06:00
6f34541bfd
Bumping up version of jetty-bom to 9.4.14-SNAPSHOT
2018-11-12 19:09:10 -06:00
bebd433740
Merge branch 'release-bom-9.4.13' into jetty-9.4.x
2018-11-12 19:08:24 -06:00
22484a18ce
Updating jetty-bom to 9.4.13.v20181111
2018-11-12 19:06:18 -06:00
a903017f5f
Updating to version 9.4.14-SNAPSHOT
2018-11-11 21:06:50 -06:00
49123a3313
Updating to version 9.4.13.v20181111
2018-11-11 20:02:42 -06:00
415cf64a37
Using released maven-javadoc-plugin for jetty-bom
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-22 16:27:39 -05:00
1fe6c92ee9
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
First pass at making Jetty 10.x require JDK 11.
* Removed JDK 8 modules (in particular ALPN and ALPN *.mod files).
* Removed profiles targeting JDK 8, 9 and 10.
* Updated dependencies to newer versions that support JDK 11.
* Temporarily commented out the Jetty Maven Plugins due to
maven-plugin-plugin not working with JDK 11.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-03 11:15:30 +02: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
c249685953
merge from 9.3.x
2018-09-05 10:27:31 -05: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
863a19bccf
Updating to version 9.3.26-SNAPSHOT
2018-09-04 17:23:31 -05:00
3ce520221d
Updating to version 9.3.25.v20180904
2018-09-04 16:08:21 -05:00
8dd05ac3f7
merge from 9.4.x
2018-09-04 13:48:43 -05:00
dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT
2018-08-30 10:48:22 -05:00
2720868475
Updating to version 9.4.12.v20180830
2018-08-30 08:56:44 -05:00
0b69f00665
Updating to version 9.4.12-SNAPSHOT
2018-07-11 17:32:16 -05:00
260596dd10
Updating to version 9.4.12.RC0
2018-07-11 16:30:55 -05:00
e4bfe00dce
Updating to version 9.4.12-SNAPSHOT
2018-06-05 14:18:37 -05:00
d5fc0523cf
Updating to version 9.4.11.v20180605
2018-06-05 13:23:02 -05:00
5eefa90e05
Updating to version 9.3.25-SNAPSHOT
2018-06-05 13:13:07 -05:00
84205aa28f
Updating to version 9.3.24.v20180605
2018-06-05 12:11:03 -05:00
f0ff571c98
Reverting version to 9.3.24-SNAPSHOT
2018-06-05 12:06:58 -05:00
734af26ccb
Updating to version 9.3.25-SNAPSHOT
2018-05-21 13:46:46 -05:00
e2a533fd3d
Updating to version 9.3.24.v20180521
2018-05-21 12:52:08 -05:00
1732ffca51
Updating to version 9.4.11-SNAPSHOT
2018-05-03 11:48:05 -05:00
daa59876e6
Updating to version 9.4.10.v20180503
2018-05-03 10:55:19 -05:00
f56fb440a5
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-03-26 11:50:47 -05:00
e2cd16f8aa
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2018-03-26 11:38:04 -05:00
c3cc138a3b
Updating to version 9.4.10-SNAPSHOT
2018-03-20 08:25:59 -05:00
1f8159b1e4
Updating to version 9.4.9.v20180320
2018-03-20 07:18:24 -05:00
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
e3e3f9eb0b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-06 11:16:25 -06:00
ae35ffdb38
Correcting jetty-bom versions
2018-02-28 16:43:11 -06:00
a05b157c03
Updating to version 9.3.24-SNAPSHOT
2018-02-28 16:39:30 -06:00
0554f8d8b4
Updating to version 9.3.23.v20180228
2018-02-28 15:45:57 -06:00
4d22576bf2
fix bom
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-19 15:46:38 +10:00
1458a232d5
Updating jetty-bom pom to 9.4.9-SNAPSHOT
2018-01-24 09:32:52 -05: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
b2ff7c5cb8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-08 21:30:12 +01:00
b3b0bf97e1
remove non valid pom dependency from bom and add distrib with type #2093
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 10:03:27 +11:00
0630256db0
remove pom dependency from bom and add type for non jar entries #2093
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-08 09:48:43 +11:00
ff53002fac
Updating to version 9.4.9-SNAPSHOT
2017-11-21 13:11:31 -07:00
82b8fb23f7
Updating to version 9.4.8.v20171121
2017-11-21 12:33:52 -07:00
a72eb0001d
Updating to version 9.3.23-SNAPSHOT
2017-10-30 15:39:57 -05:00
705048cc49
Updating to version 9.3.22.v20171030
2017-10-30 15:16:29 -05:00
54eb4a0f19
Merged branch 'jetty-9.4.x' into 'master'.
2017-10-23 15:32:47 +02:00
0dfdd43cc2
Correct groupId of websocket-servlet in jetty-bom ( #1860 )
...
Signed-off-by: Andy Wilkinson <awilkinson@pivotal.io>
2017-10-20 22:00:51 +11:00
050d593056
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-17 16:45:31 +11:00
c35d7724f4
fixed merge
2017-09-23 09:23:40 +10:00
6ef618e8cf
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 09:22:41 +10:00
9163ff20bb
Issue #215 Conscrypt module for SSL and ALPN
...
Added new modules to the bom
2017-09-23 09:22:03 +10:00
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
12874baaa8
Fixing jetty-bom references for Jetty 9.3.x
2017-09-18 14:15:46 -07:00
eee41174f2
Merge branch 'release-9.4.7' into jetty-9.4.x
2017-09-18 14:06:44 -07:00
ff11a3edd4
fix groupdId for websocket-servlet and comment jetty-monitor as it is not part of the build anymore
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-09-18 17:12:47 +10:00
f0df30cc94
fix artifactIds for fcgi
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-09-18 17:06:03 +10:00
d9865a02ba
Updating to version 9.4.8-SNAPSHOT
2017-09-14 08:44:27 -07:00
80fb788d0c
Updating to version 9.4.7.v20170914
2017-09-14 07:35:18 -07:00
651f422034
Merge branch 'jetty-9.4.x' to 'master'
2017-08-18 10:54:58 -07:00
f2cf8b9bf8
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2017-08-16 09:39:55 -07:00
b8ccd444ae
Bumping jetty-bom to same SNAPSHOT version as rest of project
2017-08-16 08:50:13 -07:00
3af1f11839
Issue #1741 - Java 9 javadoc failure in build.
...
Updated Maven Javadoc Plugin to 3.0.0-M1 and removed unused imports
that were influencing somehow the Javadoc generation.
2017-08-15 23:01:01 +02:00
27a7d2e634
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-15 19:47:40 +02:00
3c96cf200b
Updating plugins in jetty-bom
2017-08-15 10:41:32 -07:00
d8861c795c
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-15 18:54:11 +02:00
dea0a05043
Issue #1738 adding missing section in jetty-bom
2017-08-15 09:27:47 -07:00
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
0f06d4a480
update BOM to use ${project.version}
2017-08-08 09:13:26 -07:00
b8e4f72e38
add Hazelcast session management #1571
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-08-08 09:13:19 -07:00
a7bcac6d75
Updating to version 9.3.20.v20170531
2017-08-08 09:07:35 -07:00
11a544d6ac
Updating to version 9.3.22-SNAPSHOT
2017-08-01 11:26:37 -07:00
bb1d69ca52
Updating to version 9.3.21.M0
2017-08-01 10:47:04 -07:00
79cafb37a0
Issue #1676 Removed deprecated module jetty-continuations
2017-07-18 15:42:14 +02:00
a9c329859d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-07-12 13:18:12 -07:00
2e8f9fc748
Revert "Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch"
...
This reverts commit 38c112764d
2017-07-12 11:28:32 -07:00
38c112764d
Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch
2017-06-28 16:42:37 -07:00
157c4d7d76
Issue #1650 - removing cdi-websocket support
2017-06-28 16:39:40 -07:00
00beb607fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-13 10:40:02 -07:00
09bc4f3d8b
Merge pull request #1575 from olamy/feature/hazelcast_session_management
...
add Hazelcast session management #1571
2017-06-13 15:58:28 +02:00
5066dd7d13
update BOM to use ${project.version}
2017-06-08 08:55:10 +02:00
8a300613df
add Hazelcast session management #1571
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-06-08 13:02:22 +10:00
6a3c40e935
Updating to version 9.4.7-SNAPSHOT
2017-05-31 17:26:34 -07:00
8ba0f2d95d
Updating to version 9.4.6.v20170531
2017-05-31 16:22:52 -07:00
429380d36a
Updating to version 9.3.21-SNAPSHOT
2017-05-31 16:10:04 -07:00
0f3b1cbe36
Updating to version 9.3.20.v20170531
2017-05-31 15:24:57 -07:00
d3e50f8f80
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-22 23:37:51 +02:00
b32f652d7c
Issue #1536 adding missing artifacts
2017-05-22 10:33:01 -07:00
59c86307cb
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-05-18 16:05:57 -07:00
7f497e8720
Issue #1527 - jetty-bom, breaking the build again
2017-05-18 15:48:01 -07:00
59a70a3cf5
fix for #1527 9.4.x branch
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-05-11 14:03:36 +10:00
6d92c4c931
fix for #1527 9.3.x branch
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-05-11 13:46:57 +10:00
cf56168f7d
Updating to version 9.3.20-SNAPSHOT
2017-05-02 15:26:56 -07:00
d36d57d5c7
Updating to version 9.3.19.v20170502
2017-05-02 14:31:51 -07:00
782f36f157
Updating to version 9.4.6-SNAPSHOT
2017-05-02 14:29:09 -07:00
9d8ad7489c
Updating to version 9.4.5.v20170502
2017-05-02 13:22:18 -07:00
68caf72835
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-05-01 13:30:41 +02:00
8af0d153e0
Updated version to correct value.
2017-04-24 18:42:19 +02:00
a3f77a127c
update bom with new 9.4 modules
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-04-21 14:37:48 +10:00
a654c7c9e5
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
...
Conflicts:
pom.xml
2017-04-20 18:33:07 -07:00
a9fbfc0868
fix issues from pr review #1348
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-04-01 19:43:48 +11:00
9a8b753343
change to jetty-bom
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2017-03-30 11:07:24 +11:00
Joakim Erdfelt
Greg Wilkins
Jan Bartel
Simone Bordet
Steven Schlansker
olivier lamy
Jesse McConnell
olivier lamy
WalkerWatch
Andy Wilkinson