Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,345 Commits 59 Branches 460 Tags 355 MiB
Commit Graph

1224 Commits

Author SHA1 Message Date
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 11:52:16 +10:00
Jan Bartel a5e89d0340 Fix last merge from 9.4 for TestAnnotations. 2018-12-19 12:55:54 +11:00
Jan Bartel 4abc4f8dd4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-12-19 10:54:41 +11:00
Greg Wilkins 6590dfe832 fixed javax websocket OSGi test 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 16:19:16 +11:00
Jan Bartel 6af567a4b9
Handle ServletContainerInitializer from WEB-INF/classes #3146 (#3158) 
* Handle the case where a ServletContainerInitializer comes from
WEB-INF/classes

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-12-11 06:33:44 +01:00
Olivier Lamy 0dcdcc7baf
Jetty 10.0.x fix surefire arg line (to avoid locale dependent build) (#3183) 
* surefire.argLine replaced by jetty.surefire.argLine

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-06 09:09:06 +10:00
Joakim Erdfelt 01e1f01933 Issue #3162 - Correcting package name exposure (missing 's') 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-12-03 17:33:51 -06:00
olivier lamy c0655ce634 Revert "fix argLine inheritance (#3177)" 
This reverts commit 3e6ab2d1ac.
 2018-12-03 13:25:00 +10:00
Olivier Lamy 3e6ab2d1ac
fix argLine inheritance (#3177) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-12-03 11:20:20 +10:00
Simone Bordet 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
Greg Wilkins c9d5b91c79 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-11-28 13:05:57 +01:00
Greg Wilkins 8c10d266b2 Merge branch 'jetty-9.4.x' into jetty-9.4.x-cleanup-webapp-context 2018-11-22 12:41:47 +01:00
Simone Bordet 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
Joakim Erdfelt 29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt c4550056e7 Updating to version 9.4.14.v20181114 2018-11-14 15:19:10 -06:00
Joakim Erdfelt a903017f5f Updating to version 9.4.14-SNAPSHOT 2018-11-11 21:06:50 -06:00
Joakim Erdfelt 49123a3313 Updating to version 9.4.13.v20181111 2018-11-11 20:02:42 -06:00
Greg Wilkins 6bec0e8357 Cleanup webapp context 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-07 12:05:55 +01:00
Greg Wilkins 254dc88743 Merge branch 'jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-01 20:24:43 +01:00
Simone Bordet 9d7d47f0a8 Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass. 
Updated ASM Import-Package version to be "5", which means from ASM 5 onwards.
Updated ASM version in the main POM to 7.0.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-01 17:40:15 +01:00
Simone Bordet 5e2c0600d3 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2941-asm_jdk11'. 2018-10-18 15:50:07 +02:00
Simone Bordet 41663d8e5c Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-10-11 00:36:10 +02:00
Simone Bordet 4db3c7100c Issue #2948 - Require JDK 11 for Jetty 10.x. 
Fixed AnnotationParser for ASM 7.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-10-10 23:45:57 +02:00
olivier lamy 56ce28b49d maven-plugin-plugin is working now 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-10-09 12:17:35 +10:00
Simone Bordet 1ba945b39b Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass. 
Updated to ASM 7.0-beta, and defaulted AnnotationParser to ASM 7.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-10-04 13:47:56 +02:00
Simone Bordet 4dcc7cbae6 Issue #2191 - JPMS Support. 
Restored String constant for the ASM version.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-10-04 00:43:52 +02:00
Simone Bordet 76a9be8a82 Issue #2191 - JPMS Support. 
Restored error message in case of wrong ASM version.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-10-03 19:24:05 +02:00
Simone Bordet 27e7b3287a Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'. 2018-09-26 13:51:21 +02:00
Jan Bartel c165d07492 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-09-26 12:13:31 +10:00
Jan Bartel 5593e5b479
Jetty 9.4.x 2903 delay listener instantiation (#2930) 
* Issue #2903 Ensure listeners not instantiated for quickstart gen

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-09-26 11:27:57 +10:00
Simone Bordet e4ff653295 Issue #2191 - JPMS Support. 
Introduced --jpms option in jetty-start to run Jetty from the module-path.

Introduced [jpms] sections in *.mod files, to specify JPMS command line
options that needs to be added to the command line generated by jetty-start.

Bumped java.transaction-api to 1.3 because it has Automatic-Module-Name.

Fixed ASM version lookup using ManifestUtils.

Fixed WebInfConfiguration.findAndFilterContainerPaths() to properly
scan the module-path, which may contain both files and directories.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-09-25 22:11:25 +02:00
olivier lamy a8e9a8a78b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-11 14:21:49 +10:00
Jan Bartel 5056ac5895
Issue #2834 Make ASM version error message friendlier (#2887) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-09-11 09:28:06 +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
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
Jesse McConnell 863a19bccf
Updating to version 9.3.26-SNAPSHOT 2018-09-04 17:23:31 -05:00
Jesse McConnell 3ce520221d
Updating to version 9.3.25.v20180904 2018-09-04 16:08:21 -05:00
Jesse McConnell dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT 2018-08-30 10:48:22 -05:00
Jesse McConnell 2720868475
Updating to version 9.4.12.v20180830 2018-08-30 08:56:44 -05:00
WalkerWatch b249021b6d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-08-07 21:18:25 -04:00
Jan Bartel 88d1ead25b
Issue #2754 Only instantiate listener if it will be used (#2763) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-08-07 12:23:09 +10:00
Joakim Erdfelt 516d93c488 Updating to version 9.2.27-SNAPSHOT 2018-08-06 11:33:22 -05:00
Joakim Erdfelt 8c637489ae Updating to version 9.2.26.v20180806 2018-08-06 10:51:25 -05:00
Joakim Erdfelt 0b69f00665 Updating to version 9.4.12-SNAPSHOT 2018-07-11 17:32:16 -05:00
Joakim Erdfelt 260596dd10 Updating to version 9.4.12.RC0 2018-07-11 16:30:55 -05:00
Joakim Erdfelt 30f6132117 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-07-03 10:55:22 -05:00
Greg Wilkins 346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x 
Issue #2662 Unnecessary boxing conversions
 2018-06-13 22:52:27 +02:00
Matthias Perktold f901efc413 Issue #2662 - Unnecessary boxing conversions 
Signed-off-by: Matthias Perktold <tias251@gmail.com>
 2018-06-13 16:20:12 +02:00
Joakim Erdfelt 0e6c91b604 Updating to version 9.2.26-SNAPSHOT 2018-06-06 18:54:58 -05:00
Joakim Erdfelt 4830fd15e9 Updating to version 9.2.25.v20180606 2018-06-06 16:42:54 -05:00
Joakim Erdfelt e4bfe00dce Updating to version 9.4.12-SNAPSHOT 2018-06-05 14:18:37 -05:00
Joakim Erdfelt d5fc0523cf Updating to version 9.4.11.v20180605 2018-06-05 13:23:02 -05:00
Joakim Erdfelt 5eefa90e05 Updating to version 9.3.25-SNAPSHOT 2018-06-05 13:13:07 -05:00
Joakim Erdfelt 84205aa28f Updating to version 9.3.24.v20180605 2018-06-05 12:11:03 -05:00
Joakim Erdfelt f0ff571c98 Reverting version to 9.3.24-SNAPSHOT 2018-06-05 12:06:58 -05:00
Joakim Erdfelt 13640c297c Bumping version to 9.3.25-SNAPSHOT 2018-06-05 11:58:37 -05:00
Joakim Erdfelt 1732ffca51 Updating to version 9.4.11-SNAPSHOT 2018-05-03 11:48:05 -05:00
Joakim Erdfelt daa59876e6 Updating to version 9.4.10.v20180503 2018-05-03 10:55:19 -05:00
Joakim Erdfelt 8763c6065d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-04-20 11:32:46 -05:00
Jan Bartel 0e88849a68
Issue #2164 Make osgi.serviceloader mostly optional (#2408) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-04-18 14:48:53 +10:00
Jan Bartel ea6d18f919
Jetty 9.4.x issue 2397asm jdk10 support (#2417) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-04-06 12:00:09 +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
Joakim Erdfelt c3cc138a3b Updating to version 9.4.10-SNAPSHOT 2018-03-20 08:25:59 -05:00
Joakim Erdfelt 1f8159b1e4 Updating to version 9.4.9.v20180320 2018-03-20 07:18:24 -05:00
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
olivier lamy 7004aaa538 #2298 Override the processor number with an environment variable 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2018-03-07 21:02:26 +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
Joakim Erdfelt a05b157c03 Updating to version 9.3.24-SNAPSHOT 2018-02-28 16:39:30 -06:00
Joakim Erdfelt 0554f8d8b4 Updating to version 9.3.23.v20180228 2018-02-28 15:45:57 -06:00
Joakim Erdfelt 3001c8af2f Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x 2018-02-07 15:35:04 -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 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 f07ea2bbf3 more javadoc fixes #2056 
Signed-off-by: olivier lamy <olamy@webtide.com>
 2018-01-06 20:26:22 +11:00
Joakim Erdfelt bd01e1877a Updating to version 9.2.25-SNAPSHOT 2018-01-05 11:35:42 -06:00
Joakim Erdfelt a617842695 Updating to version 9.2.24.v20180105 2018-01-05 10:11:08 -06:00
Joakim Erdfelt 2dd970b055 Updating to version 9.2.24-SNAPSHOT 2017-12-18 10:43:47 -06:00
Joakim Erdfelt cdbe733684 Updating to version 9.2.23.v20171218 2017-12-18 09:06:48 -06:00
Jan Bartel 7a8130eee0 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-14 09:46:09 +01:00
Jan Bartel eebe139494
Jetty 9.4.x 2043 concurrentmodification annotation parsing (#2052) 
* Issue #2043 Fix ConcurrentModificationException listing duplicate class scanning

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-14 09:45:29 +01:00
Jan Bartel 84c016571d Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-12-13 11:10:31 +01:00
Jan Bartel f21fb5d6d9
Issue #2030 fix NPE in AnnotationConfiguration with debug enabled (#2031) 
* Issue #2030 fix NPE in AnnotationConfiguration with debug enabled

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-12-13 11:04:55 +01:00
Jan Bartel 7f6e2e8dd0 Issue #1933 
Cherry-pick of 29373c6 and 44d170e
 2017-11-22 13:53:38 +01:00
Joakim Erdfelt ff53002fac Updating to version 9.4.9-SNAPSHOT 2017-11-21 13:11:31 -07:00
Joakim Erdfelt 82b8fb23f7 Updating to version 9.4.8.v20171121 2017-11-21 12:33:52 -07:00
Jan Bartel 406ebd9fe4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-11-16 15:32:41 +01:00
Jan Bartel 98d8c2400d Issue #1933 
Add some comments, changes from code review.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-11-16 10:01:44 +01:00
Jan Bartel 12327b8876 Issue #1933 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-11-15 10:33:51 +01:00
Simone Bordet e244aad86e Merged branch 'jetty-9.4.x' into 'master'. 2017-11-08 22:44:20 +01:00
Simone Bordet d496cc85b6 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-11-08 22:43:48 +01:00
Simone Bordet b1d5fea96c
Issue #1797 - JEP 238 - Multi-Release JAR files break bytecode scanning. (#1951) 
Made MultiReleaseJarFile closeable and using try-with-resources in
AnnotationParser to avoid leaking file descriptors.

Made few code simplifications.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2017-11-08 21:38:26 +01:00
Simone Bordet 7a6d7bd137 Code reformatting (tabs -> spaces). 2017-11-08 19:03:22 +01:00
Jesse McConnell a72eb0001d Updating to version 9.3.23-SNAPSHOT 2017-10-30 15:39:57 -05:00
Jesse McConnell 705048cc49 Updating to version 9.3.22.v20171030 2017-10-30 15:16:29 -05:00
Jan Bartel 84f69bdcc5 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-25 16:38:36 +11:00
Jan Bartel 7bc6ec6b32 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-25 16:37:48 +11:00
Jan Bartel 843f7e8ee4 Issue #1797 2017-10-25 16:36:10 +11:00
Jan Bartel 606e74f3e2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-19 09:23:02 +11:00
Jan Bartel 264aa61a2b Issue #1892 2017-10-19 09:19:06 +11:00
Jan Bartel 92dbf5b7b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 17:23:43 +11:00
Jan Bartel d5769c21a9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 17:16:19 +11:00
Jan Bartel da813488fb Issue #1213 
Ensure use asm5 for osgi tests
 2017-10-18 17:07:00 +11:00
Jan Bartel 1a69841600 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 12:46:49 +11:00
Jan Bartel 7517e7fdd9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 12:44:52 +11:00
Jan Bartel 84ffdf1447 Issue #1213 
Update annotation parser for asm 6 support.
 2017-10-18 12:42:10 +11:00
Greg Wilkins 7d9645cb11 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 12:26:40 +11:00
Greg Wilkins fa1f103da7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 12:26:07 +11:00
Greg Wilkins aa212df4b1 Use java platform not version 2017-10-18 12:24:53 +11:00
Greg Wilkins c12ba01014 Issue #1797 use platform for MR jars 2017-10-18 12:24:26 +11:00
Greg Wilkins 44a1f1e1a6 Issue #1797 use platform for MR jars 2017-10-18 12:19:33 +11:00
Jan Bartel 6a921b1180 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-18 11:44:07 +11:00
Jan Bartel 3cffbdf6be Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-18 11:24:04 +11:00
Jan Bartel 37c51710b0 Issue #1213 2017-10-18 10:05:59 +11:00
Greg Wilkins dd0eaa0f1f Issue #1901 Backport some java9 support to 9.3 2017-10-17 17:14:18 +11:00
Greg Wilkins 22f95ad847 Issue #1901 Backport some java9 support to 9.3 2017-10-17 17:01:21 +11:00
Jan Bartel 050d593056 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-10-17 16:45:31 +11:00
Greg Wilkins 5de895af88 Issue #1797 
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha  java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
 2017-10-17 15:06:09 +11:00
Jan Bartel e00182323b Issue #1692 2017-10-17 14:43:41 +11:00
Joakim Erdfelt 1295dc372d Issue #1797 - Safety checks for Java 9 and Multi-Release JARs during bytecode scanning 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2017-10-17 14:43:14 +11:00
Greg Wilkins 0f8bf0a64f Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-10-17 14:08:36 +11:00
Simone Bordet bee383c894 Merged branch 'jetty-9.4.x' into 'master'. 2017-10-03 01:22:35 +02:00
Jan Bartel 7b93c3c1e7 Issue #1863 2017-10-03 10:16:09 +11:00
Greg Wilkins 1b7ebf5599 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-09-23 00:22:57 +10:00
Greg Wilkins 50f861e8f2 Issue #1797 MR jar support in java8 code 2017-09-20 13:47:37 +10:00
Greg Wilkins 219b61f5b4 Issue #1797 
Converted jetty-util to be a multi release jar
Added org/eclipse/jetty/util/MultiReleaseJarFile as botha  java8 and java9 version
deprecated jarScanner
updated AnnotationParser to use MultiReleaseJarFile
 2017-09-19 13:40:59 +10:00
Joakim Erdfelt eee41174f2 Merge branch 'release-9.4.7' into jetty-9.4.x 2017-09-18 14:06:44 -07:00
Joakim Erdfelt d9865a02ba Updating to version 9.4.8-SNAPSHOT 2017-09-14 08:44:27 -07:00
Joakim Erdfelt 80fb788d0c Updating to version 9.4.7.v20170914 2017-09-14 07:35:18 -07:00
Simone Bordet 93d0d324ab Formatting cleanup and fixed javadocs. 2017-09-14 11:56:45 +02:00
Jan Bartel 7ad415b9b8 Issue #1819 2017-09-14 16:07:00 +10:00
Jan Bartel 5aa92552bd Issue #1809 2017-09-13 11:42:17 +10:00
Joakim Erdfelt 929e800111 Issue #1797 - Safety checks for Java 9 and Multi-Release JARs during bytecode scanning 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2017-09-07 09:34:09 -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 e81e17d348 Issue #1692 2017-08-08 09:15:27 -07:00
Joakim Erdfelt 3fdbcffbbd Updating to version 9.2.23-SNAPSHOT 2017-08-08 09:12:55 -07:00
Joakim Erdfelt a7bcac6d75 Updating to version 9.3.20.v20170531 2017-08-08 09:07:35 -07:00
Joakim Erdfelt 11a544d6ac Updating to version 9.3.22-SNAPSHOT 2017-08-01 11:26:37 -07:00
Joakim Erdfelt bb1d69ca52 Updating to version 9.3.21.M0 2017-08-01 10:47:04 -07:00
Simone Bordet 38f41e9676 Merged branch 'jetty-9.4.x' into 'master'. 2017-07-26 11:09:28 +02:00
Jan Bartel d9c8f89741 Issue #1692 2017-07-26 09:38:49 +02:00
Joakim Erdfelt 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
Joakim Erdfelt 38c112764d Issue #1650 - setting unique SNAPSHOT version to aide in 3rd party testing of branch 2017-06-28 16:42:37 -07:00
Joakim Erdfelt 4d2c299fe8 Updating to version 9.2.23-SNAPSHOT 2017-06-06 08:55:12 -07:00
Joakim Erdfelt 0af30bce5a Updating to version 9.2.22.v20170606 2017-06-06 07:03:05 -07:00
Joakim Erdfelt 6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt 8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt 429380d36a Updating to version 9.3.21-SNAPSHOT 2017-05-31 16:10:04 -07:00
Joakim Erdfelt 0f3b1cbe36 Updating to version 9.3.20.v20170531 2017-05-31 15:24:57 -07:00
Greg Wilkins 32bc9292a2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-31 11:56:47 +02:00
Christoph Dreis e9f398cf41 Deprecate ConcurrentHashSet (#1570) 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2017-05-30 21:46:11 +02:00
Greg Wilkins b5a3eb1f70 removed Configuration marker classes 2017-05-11 11:32:23 +02:00
Greg Wilkins 2e299a7ebd fixed test 2017-05-09 12:03:50 +02:00
Greg Wilkins 1fc046fb3d renamed for clarity 2017-05-09 09:52:20 +02:00
Joakim Erdfelt cf56168f7d Updating to version 9.3.20-SNAPSHOT 2017-05-02 15:26:56 -07:00
Joakim Erdfelt d36d57d5c7 Updating to version 9.3.19.v20170502 2017-05-02 14:31:51 -07:00
Joakim Erdfelt 782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt 9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Greg Wilkins 68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Joakim Erdfelt 6ca9bacee6 Issue #1448 - Eliminating Resource creation from TypeUtil.getLoadedFrom() 
+ Replaced with URI TypeUtil.getLocationOfClass(Class clazz)
+ and File TypeUtil.getLocationOfClassAsFile(Class clazz)
+ This is done to eliminate extraneous "new URL" and "URI.toURL" calls
  that can trigger URL Stream Handler creation and initialization
  which is the cause of the StackOverflowError
 2017-04-26 13:43:35 +02:00
Simone Bordet 99e5b118bd Fixes to make code compatible with JDK 9. 2017-04-24 11:04:05 +02:00
Joakim Erdfelt 92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt 3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Jan Bartel 2ba44ac058 Issue #1466 2017-04-14 14:07:36 +10:00
Jan Bartel 70160c5b3f Issue #1467 2017-04-13 16:49:55 +10:00
Joakim Erdfelt 9e2aeda052 Updating to version 9.3.19-SNAPSHOT 2017-04-06 07:47:53 -07:00
Joakim Erdfelt 63273aa40b Updating to version 9.3.18.v20170406 2017-04-06 06:31:02 -07:00
Joakim Erdfelt 1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt 95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt a6a0ab991f Updating to version 9.3.18-SNAPSHOT 2017-03-17 09:48:19 -07:00
Joakim Erdfelt 307d23975e Updating to version 9.3.17.v20170317 2017-03-17 09:07:39 -07:00
Joakim Erdfelt 523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt 4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Joakim Erdfelt c5c7be2bc5 Merge branch 'jetty-9.4.x' 2017-02-02 16:23:13 -07:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates 
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
 2017-02-02 15:51:38 -07:00
Jesse McConnell e695fc80d6 Updating to version 9.2.22-SNAPSHOT 2017-01-20 12:32:51 -06:00
Jesse McConnell 513b5e5f90 Updating to version 9.2.21.v20170120 2017-01-20 12:32:00 -06:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06: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
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Jesse McConnell 6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Jan Bartel 640801987c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-30 09:37:21 +11:00
dreis2211 9b0f6b1fd5 Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
(cherry picked from commit 16334c1893)
 2016-11-30 09:36:30 +11:00
dreis2211 16334c1893 Issue #1135 - Avoid allocations from Method.getParameterTypes() if possible 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2016-11-28 21:17:04 +01:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Joakim Erdfelt 2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt 14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Jan Bartel d2a98206df Issue #1018 
Remove deprecated Util class
 2016-10-21 16:38:47 +11:00
Jan Bartel 34f0015aa9 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-21 16:37:13 +11:00
Jan Bartel 638045764e Issue #1018 2016-10-21 16:32:45 +11:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Greg Wilkins dfabd48149 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-06 12:03:12 +11:00
Greg Wilkins 84f7fc31cb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-06 12:01:50 +11:00
Greg Wilkins 9148678dad fixed annotation javadoc 2016-10-06 11:46:40 +11:00
Greg Wilkins baef7f09d4 removed debug 2016-10-06 10:50:19 +11:00
Greg Wilkins afb750515e Issue #963 Location based classpath pattern (#978) 
Issue #963 location based white/black classpath lists
- removed outdated annotations/ClassNameResolver
- implemented loadedFrom in TypeUtil
- created a growable Trie
- reimplemented classpathpattern
- simplified OSGi classloading
 2016-10-06 10:47:09 +11:00
Jesse McConnell 863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell b91cc8a4ea set for release 2016-09-30 18:01:20 +00:00
Joakim Erdfelt 6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt 8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Joakim Erdfelt fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt 7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Jan Bartel 656165619f Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-08-11 08:17:29 +10:00
Jan Bartel e5e3e3300e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-11 08:17:06 +10:00
Jan Bartel c033a3734b Issue #783 
Add loggable exception; remove unused code
 2016-08-11 08:15:45 +10:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt 0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Jan Bartel 52f0858485 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-08 13:23:33 +10:00
Jan Bartel 5b5c8c3791 Issue #282 2016-07-08 13:23:00 +10:00
Jan Bartel 1933948067 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-07 15:14:04 +10:00
Jan Bartel 15b5920349 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-07 15:13:27 +10:00
Jan Bartel 7afc36064b Issue #678 2016-07-07 15:12:32 +10:00
Jesse McConnell ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell 030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
Jesse McConnell e79c4d582b Merge branch 'jetty-9.4.x' 2016-06-07 11:57:39 -05:00
Jesse McConnell 20c1301203 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-07 11:56:27 -05:00
Jesse McConnell 39ef0ec7d6 fix bad test target dir usage 2016-06-07 11:55:48 -05:00
Jesse McConnell dc4574f380 [maven-release-plugin] prepare for next development iteration 2016-05-17 17:30:17 -05:00
Jesse McConnell 0bbebec1e0 [maven-release-plugin] prepare release jetty-9.3.9.v20160517 2016-05-17 17:30:13 -05:00
Jesse McConnell d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -05: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 c09f31a51d Bumping up master to version 10.0.0-SNAPSHOT 2016-04-29 11:47:15 -07:00
Joakim Erdfelt 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414" 
This reverts commit 29ae63855b.
 2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07:00
Greg Wilkins 6163ee7293 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-04-14 16:32:51 +10:00
Greg Wilkins e1b0967e59 removed needless warning 2016-04-14 16:32:26 +10:00
Joakim Erdfelt 6fb338e50d Updating to version 9.3.9-SNAPSHOT 2016-04-11 16:20:50 -07:00
Joakim Erdfelt bb4f3c4882 Updating to version 9.3.9.M1 2016-04-11 15:35:22 -07:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Joakim Erdfelt b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt 21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07: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
Simone Bordet 9aa6dc1e7d Merged branch 'jetty-9.3.x' into 'master'. 2015-12-08 13:02:55 +01:00
Simone Bordet 9c673e542d Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 13:02:20 +01:00
Jan Bartel 66e596511d 483620 Servlet annotation mapping to "/" should override webdefault.xml mapping 2015-12-04 15:58:07 +11:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Greg Wilkins ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +11:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Jan Bartel e1bade217f 479839 Regression when starting application with excessive scan times 2015-10-16 15:43:48 +11:00
Jan Bartel 27a41a4f77 479839 Regression when starting application with excessive scan times 2015-10-16 15:16:43 +11:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Joakim Erdfelt 9cf0e34a1d Updating to version 9.4.0-SNAPSHOT 2015-10-07 15:41:32 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Joakim Erdfelt f4133dfd35 javadoc fix 2015-10-01 15:56:26 -07:00
Jan Bartel 697b0cccf2 477895 Prevent leak of handles to deleted files after redeploy 2015-09-30 13:39:31 +10:00
Jan Bartel 03a601f2b2 477385 Make jetty osgi manifests only resolve jetty packages against a single distro version 2015-09-16 19:13:47 +10:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell 3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell f8734f23ce [maven-release-plugin] prepare for next development iteration 2015-08-25 14:10:01 -05:00
Jesse McConnell e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Jan Bartel 4743c19a8c 474961 Close input stream for classes in AnnotationParser after scanning 2015-08-19 11:12:40 +10:00
Jan Bartel 3de7fc77c7 474558 Debug log ServletContainerInitializer @HandlesTypes contents 2015-08-19 10:25:36 +10:00
Joakim Erdfelt a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt 798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt 4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt 6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Jesse McConnell 9b790c38ce [maven-release-plugin] prepare for next development iteration 2015-07-14 11:42:34 -05:00
Jesse McConnell b35d32f2b8 [maven-release-plugin] prepare release jetty-9.3.1.v20150714 2015-07-14 11:42:28 -05:00
Jesse McConnell 7204707902 [maven-release-plugin] prepare for next development iteration 2015-07-09 12:14:38 -05:00
Jesse McConnell 3b1533673e [maven-release-plugin] prepare release jetty-9.2.12.v20150709 2015-07-09 12:14:30 -05:00
Greg Wilkins 3e401a62e9 StringUtil.csvSplit(String) 2015-06-19 16:48:53 +10:00
Jesse McConnell 60e45a940e [maven-release-plugin] prepare for next development iteration 2015-06-15 15:34:11 -05:00
Jesse McConnell d3dec8d513 [maven-release-plugin] prepare release jetty-9.2.12.M0 2015-06-15 15:34:03 -05:00
Joakim Erdfelt cf6c4a914e Updating version to 9.3.1-SNAPSHOT 2015-06-15 10:25:49 -07:00
Joakim Erdfelt 1a9da9f9e4 Updating versions to 9.3.0.v20150612 2015-06-12 09:34:24 -07:00
Joakim Erdfelt c6ac82f50b Merge branch 'master' into release-9.3 2015-06-12 09:30:46 -07:00
Joakim Erdfelt 7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt 496b4dfc83 [maven-release-plugin] prepare for next development iteration 2015-06-11 15:08:36 -07:00
Joakim Erdfelt f53c5d8fac [maven-release-plugin] prepare release jetty-9.3.0.v20150611 2015-06-11 15:08:29 -07:00
Joakim Erdfelt 916efd6aa7 469860 - Add module metadata versioning to support backwards compat 
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
 2015-06-10 10:59:18 -07:00
Jesse McConnell bfe6c2638e [maven-release-plugin] prepare for next development iteration 2015-05-29 09:06:42 -05:00
Jesse McConnell 71e0f4d8ce [maven-release-plugin] prepare release jetty-9.2.11.v20150529 2015-05-29 09:06:36 -05:00
Jesse McConnell a7087cbfbf [maven-release-plugin] prepare for next development iteration 2015-05-28 10:06:51 -05:00
Jesse McConnell 913c63e597 [maven-release-plugin] prepare release jetty-9.2.11.v20150528 2015-05-28 10:03:44 -05:00
Greg Wilkins 435bed0c37 fixed import into eclipse IDE 2015-05-13 23:13:16 +10:00
Greg Wilkins 5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Joakim Erdfelt 77c02af49f Fixing javadoc visibility 2015-04-23 17:07:28 -07:00
Joakim Erdfelt cffeea3ed6 464727 - Update Javadoc for Java 8 DocLint 
+ Fixing javadoc in jetty-annotations
 2015-04-22 12:05:53 -07:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Jesse McConnell da4f95f3d3 [maven-release-plugin] prepare for next development iteration 2015-03-25 09:08:27 -05:00
Jesse McConnell e92fd438fd [maven-release-plugin] prepare release jetty-9.2.11.M0 2015-03-25 09:08:21 -05:00
Joakim Erdfelt e92bcccc84 Using new Decorator 2015-03-12 10:09:53 -07:00
Jesse McConnell e3fd0056cf [maven-release-plugin] prepare for next development iteration 2015-03-10 08:00:22 -05:00
Jesse McConnell 9d648f4000 [maven-release-plugin] prepare release jetty-9.2.10.v20150310 2015-03-10 08:00:14 -05:00
Jesse McConnell 1659d83978 [maven-release-plugin] prepare for next development iteration 2015-02-24 10:38:33 -06:00
Jesse McConnell dc0c3f4c52 [maven-release-plugin] prepare release jetty-9.2.9.v20150224 2015-02-24 10:38:28 -06:00
Jesse McConnell ce5db2ca55 [maven-release-plugin] prepare for next development iteration 2015-02-17 16:02:22 -06:00
Jesse McConnell 26b7597928 [maven-release-plugin] prepare release jetty-9.2.8.v20150217 2015-02-17 16:02:16 -06:00
Joakim Erdfelt 48e5157731 Merge branch 'jetty-9.2.x' 
Conflicts:
	VERSION.txt
	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-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/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/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/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-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-alpn-tests/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-npn-tests/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-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-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
 2015-01-21 11:00:54 -07:00
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Joakim Erdfelt aea4713d27 Minor test class cleanup while testing some annotation scanning behavior reported 2015-01-16 15:18:01 -07:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06: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
Simone Bordet 379f9f6c43 Merged branch 'jetty-9.2.x' into 'master'. 2015-01-06 17:30:43 +01:00
Jan Bartel 381227cd9d 456486 Jar containing ServiceContainerInitializer impl not found in TCCL in osgi 2015-01-01 17:25:10 +01:00
Jan Bartel bc22ba72dc [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00