Commit Graph

836 Commits

Author SHA1 Message Date
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
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