5d837309c3
Issue #2941 - JDK 11: UnsupportedOperationException at AnnotationParser.scanClass.
...
Downgraded OSGi ASM version to 6.2.
Waiting for the SPI Fly library to support JDK 11.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-30 17:42:11 +01:00
44ac57040a
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2018-10-17 12:36:56 +02:00
813b526cb2
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
Removed references to ALPN API.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-12 09:45:23 +02:00
984eccfca4
Issue #2948 - Require JDK 11 for Jetty 10.x.
...
Removed OSGi test class that was using bootclasspath ALPN.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-10-10 10:36:39 +02: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
8213a95a7b
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-10-02 22:51:46 +02:00
a094dbaa69
fix osgi tests not running as paxexam is not junit5 ready ( #2945 )
...
* fix osgi tests not running as paxexam is not junit5 ready
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* upgrade pax exam to 4.12.0
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* cleanup comment, using transitive deps from pax-exam-junit4
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-10-02 16:44:24 +10:00
5e8a7403d1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-22 20:11:03 +10:00
71a1801433
Issue #2918 restore a TestTracker with junit5 ( #2927 )
...
* add TestTracker junit5 extension #2918
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-21 14:03:05 +10:00
a8e9a8a78b
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2018-09-11 14:21:49 +10:00
2dd5fec4f4
Issue #2740 Ensure OSGiWebappClassLoader uses bundleloader for all loadClass methods. ( #2804 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-09-11 12:04:31 +10: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
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
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
f15bd225b4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-08-21 14:47:19 +10:00
74e30605ed
should fix osgi test with missing dependencies ( #2809 )
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-15 22:10:26 +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
516d93c488
Updating to version 9.2.27-SNAPSHOT
2018-08-06 11:33:22 -05:00
8c637489ae
Updating to version 9.2.26.v20180806
2018-08-06 10:51:25 -05:00
0892ed8983
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2018-07-18 16:25:39 +02: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
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
30f6132117
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-07-03 10:55:22 -05:00
cd60da7a12
fix #2342 Upgrade Conscrypt to 1.1.4
...
Fixes https://github.com/google/conscrypt/issues/491
Signed-off-by: Carter Kozak <c4kofony@gmail.com>
2018-06-29 08:41:34 -04:00
80c311fb3d
Issue #2656 remove forced Import-Package statements in osgi test poms
2018-06-12 18:26:59 +02:00
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
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
a6532f7116
Fix osgi jetty-testrealm.xml file.
2018-06-08 10:52:15 +02:00
0e6c91b604
Updating to version 9.2.26-SNAPSHOT
2018-06-06 18:54:58 -05:00
4830fd15e9
Updating to version 9.2.25.v20180606
2018-06-06 16:42:54 -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
13640c297c
Bumping version to 9.3.25-SNAPSHOT
2018-06-05 11:58:37 -05:00
79935b92ae
Issue #2575 - Work around bad Bundle.getEntry() behavior with unescaped URLs ( #2590 )
...
* Adding test case to verify existing PathResource behavior
* Skipping Resource class usage in OSGi entirely
* Only using the URL class, and removing of conversions to
other more correct forms (File and URI)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-06-05 10:12:50 +02:00
1509d1c9aa
Issue #2586 update to asm6.2 ( #2588 )
...
Issue #2586 update to asm6.2
2018-05-30 11:29:18 +02:00
2bcc528920
expand spruious tabs in java sources
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-05-29 10:40:09 +02:00
9aa645cf98
Remove jdk-10 and alltests profiles for test-jetty-osgi
2018-05-10 15:43:54 +10: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
8763c6065d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-04-20 11:32:46 -05:00
c7e78ae896
update logging versions #2461 ( #2465 )
...
* update logging versions #2461
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-19 15:45:11 +10:00
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
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
5f2306c9cd
add a profile to run all tests even those disable with some jdks
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-14 13:03:50 +10:00
ffa270b6c8
disable failing tests for jdk11
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-13 21:49:02 +10:00
f6268ec919
add jdk10 profile to disable some tests
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-06 11:04:27 +10:00
09bfb77e5f
Issue #2409 Ensure no duplicate config classes in osgi ( #2416 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-04-06 09:18:47 +10:00
72404d15d6
Make mavenRepoPath system property optional for osgi tests
2018-04-05 14:02:38 +10:00
1c04f9838d
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x-fixed
2018-03-22 16:42:42 -05:00
a74a328024
Merge branch 'release-9.4.9' into jetty-9.4.x
2018-03-21 16:33:56 -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
16699214c6
fix using -DskipTests not skipping tests #2359
...
Signed-off-by: olivier lamy <olamy@webtide.com>
use -DskipTests
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-20 21:19:02 +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
2905d081b4
Merge pull request #2265 from eclipse/jetty-9.4.x-2262-sanitize-osgi-code
...
Jetty 9.4.x 2262 sanitize osgi code
2018-03-06 17:36:57 +11:00
c73ecae431
Jetty 9.4.x 2059 make osgi tests work jre9 ( #2264 )
...
* Issue #2059 WIP: make osgi tests work with jdk9
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-06 11:04:50 +11:00
ee61f381ba
add pax property with local maven repo used
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-03-02 20:26:17 +10:00
1ff2c691ba
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-2262-sanitize-osgi-code
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-01 17:35:24 +11:00
05e2527b5c
Issue #2262 Sanitize osgi code
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-01 17:31:39 +11:00
45472bf10b
Merge pull request #2263 from lachlan-roberts/jetty-9.4.x-2206-MissingOverride
...
Resolved errorprone MissingOverride warnings #2206
Built locally as CI is currently down.
2018-03-01 16:05:48 +11: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
8cf357a17d
Jetty 9.4.x 2247 2256 modernize osgi test code ( #2258 )
...
* Issue #2247 Ensure random unused ssl port for osgi tests
Signed-off-by: Jan Bartel <janb@webtide.com>
* Issue #2256 code cleanup of osgi tests
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-03-01 10:14:37 +11: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
0b89ffd055
Issue #2247 Ensure random unused ssl port for osgi tests
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-28 15:03:44 +11:00
e5817db14a
fix diplicate dependency
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-02-26 21:13:11 +10:00
d179bcf7ac
Resolves #2241 clean up javadoc warnings
2018-02-23 14:09:33 -06:00
1e8422935c
Issue #2164 Add test for javax.websocket in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
17f518ffb1
Issue #2164 Update websocket manifests for osgi and add test in osgi
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-02-20 16:28:39 +11:00
ab5fc29cca
Jetty 9.4.x 1803 proposal 0 - single ReservedThreadExecutor ( #2119 )
...
Issue #1803 - Review usage of scheduling strategies
Use a single ReservedThreadExecutor built into the QueuedThreadPool
via new interface TryExecutor.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-02-08 11:08:48 +01:00
3001c8af2f
Merge remote-tracking branch 'origin/release-9.2.24' into jetty-9.2.x
2018-02-07 15:35:04 -06:00
0a7725cac1
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2018-01-31 15:08:05 +01:00
8e55d0d6a7
Issue #2166 Update spifly to 1.0.10 ( #2167 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2018-01-31 15:06:56 +01:00
650b804142
Issue #2108 - Updating license headers for year 2018
2018-01-09 10:14:52 -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
21365234f8
Issue #2108 - Updating license headers for year 2018
2018-01-09 09:44:41 -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
5a323a01dd
more javadoc fixes #2056
...
Signed-off-by: olivier lamy <olamy@webtide.com>
2018-01-09 13:35:58 +11:00
bd01e1877a
Updating to version 9.2.25-SNAPSHOT
2018-01-05 11:35:42 -06:00
a617842695
Updating to version 9.2.24.v20180105
2018-01-05 10:11:08 -06:00
2dd970b055
Updating to version 9.2.24-SNAPSHOT
2017-12-18 10:43:47 -06:00
cdbe733684
Updating to version 9.2.23.v20171218
2017-12-18 09:06:48 -06:00
b177202675
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-14 10:12:42 +01:00
18cd1fb8df
Issue #2057 Add conscrypt test in osgi ( #2058 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-14 09:48:12 +01:00
84c016571d
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-13 11:10:31 +01:00
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
1da25bca58
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-12-13 11:03:08 +01:00
2df07f29e9
Jetty 9.4.x 2016 openjdk8 osgi headers ( #2026 )
...
* Issue #2016 Add osgi headers for openjdk8 alpn and add tests for http2 in osgi
Signed-off-by: Jan Bartel <janb@webtide.com>
2017-12-13 10:38:13 +01: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
4ec2a154fc
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-19 15:17:46 +11:00
3793f974d5
Issue #1909
2017-10-19 15:08:02 +11:00
92dbf5b7b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 17:23:43 +11:00
d5769c21a9
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 17:16:19 +11:00
da813488fb
Issue #1213
...
Ensure use asm5 for osgi tests
2017-10-18 17:07:00 +11:00
7d9645cb11
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 12:26:40 +11:00
c12ba01014
Issue #1797 use platform for MR jars
2017-10-18 12:24:26 +11:00
44a1f1e1a6
Issue #1797 use platform for MR jars
2017-10-18 12:19:33 +11:00
6a921b1180
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-18 11:44:07 +11:00
3cffbdf6be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-10-18 11:24:04 +11:00
37c51710b0
Issue #1213
2017-10-18 10:05:59 +11:00
6b51caa2af
Fix osgi servlet api schemas.
2017-10-06 11:00:56 +11:00
d52cba0d44
Issue #1868
...
Fix osgi tests.
2017-10-06 09:37:41 +11:00
e9d813552b
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-10-05 17:37:11 +11:00
0282232ca4
Issue #1868
2017-10-05 17:12:21 +11:00
562ab9eb80
Fix TestJettyOSGiWithAnnotations test.
2017-09-26 16:04:19 +10:00
1b7ebf5599
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-09-23 00:22:57 +10:00
d808094e82
Issue #1829
2017-09-19 14:32:34 +10:00
eee41174f2
Merge branch 'release-9.4.7' into jetty-9.4.x
2017-09-18 14:06:44 -07: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
7ad415b9b8
Issue #1819
2017-09-14 16:07:00 +10:00
b7c4e1c7dc
Issue #487 - JDK 9 build compatibility.
...
Made sure that when compiling with JDK 9 we actually use a JDK 8 runtime.
Updated the Maven Compiler Plugin to latest version, with support for
JDK 9 --release command line.
Removed unnecessary Maven Compiler Plugin declarations in POMs.
2017-08-16 12:37:44 +02:00
39cb278577
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-08-10 13:22:54 +10:00
67d93f9f74
Issue #1724
2017-08-10 13:05:50 +10: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
585f126b48
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x-clean
2017-08-08 09:24:41 -07:00
7c4f7b13f7
Issue #1682
2017-08-08 09:15:35 -07:00
77d96ff36d
Issue ##1597
...
Make osgi import of javax.mail optional
2017-08-08 09:13:18 -07:00
3fdbcffbbd
Updating to version 9.2.23-SNAPSHOT
2017-08-08 09:12:55 -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
f7302a13b4
Merged branch 'jetty-9.4.x' into 'master'.
2017-08-01 11:21:41 +02:00
8661a73a3f
Issue #1682
2017-07-28 11:55:57 +02:00
0acd68e0a4
Issue #1676 complete removal of completions
2017-07-19 09:42:58 +02:00
134dfd318d
Issue #1676 removed deprecated FileResource
2017-07-18 20:12:53 +02:00
79cafb37a0
Issue #1676 Removed deprecated module jetty-continuations
2017-07-18 15:42:14 +02: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
76ace004b6
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-06-09 09:17:43 -07:00
5ee1c7a533
Merge branch 'release-9.4.6' into jetty-9.4.x
2017-06-07 10:01:11 -07:00
4204061bd4
Issue ##1597
...
Make osgi import of javax.mail optional
2017-06-07 11:59:53 +02:00
4d2c299fe8
Updating to version 9.2.23-SNAPSHOT
2017-06-06 08:55:12 -07:00
0af30bce5a
Updating to version 9.2.22.v20170606
2017-06-06 07:03:05 -07: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
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
94c9fc548c
Merged branch 'jetty-9.4.x' into 'master'.
2017-05-18 21:12:50 +02:00
82c909acdc
Documentation updates
2017-05-18 12:12:32 -04: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
92ea5bda21
Updating to version 9.4.5-SNAPSHOT
2017-04-14 14:43:36 -07:00
3dc8f557c6
Updating to version 9.4.4.v20170414
2017-04-14 13:20:17 -07:00
9e2aeda052
Updating to version 9.3.19-SNAPSHOT
2017-04-06 07:47:53 -07:00
63273aa40b
Updating to version 9.3.18.v20170406
2017-04-06 06:31:02 -07:00
f315ec8b4c
Fixing imports
2017-04-05 07:07:43 -07:00
dd084b4e74
Merge remote-tracking branch 'origin/jetty-9.4.x'
2017-03-30 17:20:22 +11:00
1360b863dc
Updating to version 9.4.4-SNAPSHOT
2017-03-17 10:53:54 -07:00
95e94b49d8
Updating to version 9.4.3.v20170317
2017-03-17 09:54:58 -07:00
a6a0ab991f
Updating to version 9.3.18-SNAPSHOT
2017-03-17 09:48:19 -07:00
307d23975e
Updating to version 9.3.17.v20170317
2017-03-17 09:07:39 -07:00
92afe54c1d
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-10 13:22:32 -07:00
e25007cb79
Issue #1390 - Addressing new File(URL) use in Windows
...
+ Fixing HashLoginService to track its Config via File reference only
(dropping support for URL reference)
+ Adding new `this.web-inf.path` property that jetty-web.xml can use
2017-03-10 12:47:06 -07:00
5933f70ae6
Issue #1049
...
Ensure file paths for osgi config files are correct urls
2017-03-10 09:34:20 -07:00
cf507084fe
Cherry-pick Cleanup
2017-03-10 09:04:02 -07:00
7dc61365e4
Issue #1387
...
Upgraded paxexam and osgi container.
2017-03-10 09:02:40 -07:00
20c50424a3
Issue #1387
...
Upgraded paxexam and osgi container.
2017-03-10 17:28:42 +11:00
72fe2a88c2
Issue #1049
...
Ensure file paths for osgi config files are correct urls
2017-03-10 11:59:20 +11:00
01d539e2be
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2017-03-09 14:20:19 -07:00
e796063ace
Issue #1049 - Upgrading paxexam, downgrading surefire
2017-03-09 07:43:26 -07:00
76c6377ed7
Windows Test Issue
...
+ Adding slf4j-simple to test scope to attempt to capture reason
for the test setup failure:
"org.osgi.framework.BundleException: Error while renaming bundle file
to final location C:\"
2017-03-09 06:58:45 -07:00
523fab30bd
Updating to version 9.4.3-SNAPSHOT
2017-02-20 08:13:31 -07:00
4a674b9cc9
Updating to version 9.4.2.v20170220
2017-02-20 06:22:45 -07:00
4543c73052
Merge branch 'jetty-9.4.x'
2017-01-28 16:24:15 -06:00
700491f0da
Merge pull request #1289 from earldouglas/its
...
Replace contraction with possesive
2017-01-28 16:23:39 -06:00
9574ec2fa1
Merge branch 'jetty-9.4.x'
2017-01-27 17:16:24 -06:00
0b45f377bf
Issue #1290
2017-01-27 15:42:52 +11:00
590838f644
Replace contraction with possesive
2017-01-26 19:26:50 -07:00
e695fc80d6
Updating to version 9.2.22-SNAPSHOT
2017-01-20 12:32:51 -06:00
513b5e5f90
Updating to version 9.2.21.v20170120
2017-01-20 12:32:00 -06:00
d0c33ebe8b
Updating to version 9.4.2-SNAPSHOT
2017-01-20 10:49:06 -06:00
556ecbcdcf
Updating to version 9.4.1.v20170120
2017-01-20 09:47:53 -06:00
66b43ecda8
Updating to version 9.3.17-SNAPSHOT
2017-01-20 09:33:43 -06:00
df03355d00
Updating to version 9.3.16.v20170120
2017-01-20 09:06:48 -06: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
843192efea
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-17 11:41:25 +01:00
f8e3b1f9c2
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-17 11:38:45 +01:00
9e9ee03d7f
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
Fixed dependencies for modules that run tests that require ALPN.
2017-01-17 11:32:20 +01:00
b7b3dfdc77
Merged branch 'jetty-9.4.x' into 'master'.
2017-01-12 17:53:09 +01:00
e539d0b1fd
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2017-01-12 17:52:45 +01:00
11d669092a
Issue #1073 - JDK9 support in Jetty 9.3.x.
...
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
7494914ff6
Updating to version 9.3.16-SNAPSHOT
2016-12-20 13:09:32 -07:00
680ecd646b
Updating to version 9.3.15.v20161220
2016-12-20 12:31:58 -07:00
6b3b59df43
Updating to version 9.2.21-SNAPSHOT
2016-12-16 16:23:06 -07:00
bcbcee7f23
Updating to version 9.2.20.v20161216
2016-12-16 15:47:41 -07:00
b6c4e5b7c9
Merged branch 'jetty-9.4.x' into 'master'.
2016-12-14 11:53:48 +01:00
6a7e5dd4f5
Updating to version 9.4.1-SNAPSHOT
2016-12-08 09:41:50 -06:00
c54efb5929
Updating to version 9.4.0.v20161208
2016-12-08 08:56:45 -06:00
f8338b3f59
Updating to version 9.4.1-SNAPSHOT
2016-12-07 10:32:41 -06:00
dac1d17a2d
Updating to version 9.4.0.v20161207
2016-12-07 09:47:30 -06:00
fa6d9029fc
Merge branch 'jetty-9.4.x'
2016-11-15 14:30:19 -07:00
2c38511828
Updating to version 9.3.15-SNAPSHOT
2016-10-28 13:01:34 -07:00
14611d2f76
Updating to version 9.3.14.v20161028
2016-10-28 12:21:02 -07:00
458aebbd01
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-10-20 15:11:40 -07:00
76992139f8
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2016-10-20 15:11:25 -07:00
2d650512bf
Skipping jacoco collection on build/test/support/integration modules
2016-10-20 12:48:32 -07:00
ade14ba34b
Updating to version 9.3.14-SNAPSHOT
2016-10-14 11:33:51 -07:00
c3a78e70a8
Updating to version 9.3.13.v20161014
2016-10-14 10:39:37 -07:00
84f7fc31cb
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-10-06 12:01:50 +11:00
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
863913b64e
set for dev
2016-09-30 19:05:47 +00:00
b91cc8a4ea
set for release
2016-09-30 18:01:20 +00:00
6cf10172ca
Updating to version 9.3.13-SNAPSHOT
2016-09-15 07:34:52 -07:00
8b35fdc5a5
Updating to version 9.3.12.v20160915
2016-09-15 06:48:16 -07:00
fb7da26ad2
Updating to version 9.2.20-SNAPSHOT
2016-09-08 13:04:11 -07:00
7b94bc32f4
Updating to version 9.2.19.v20160908
2016-09-08 12:11:44 -07:00
b1fbcf033a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-08-12 14:07:04 +10:00
6c635e3263
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-12 14:06:36 +10:00
46cdeca543
Use dynamic ports for OSGi tests
2016-08-12 14:06:14 +10:00
e895508e8e
Issue #746 Update osgi manifests to servlet 4.0
2016-08-04 15:03:51 +10:00
3b2291e82f
Issue #746 Update osgi manifests to servlet 4.0
2016-08-04 14:41:39 +10:00
5232b933a4
Issue #746 Update osgi manifests to servlet 4.0
2016-08-04 14:20:43 +10:00
9c5331fe3f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-08-03 19:28:42 +10:00
8f058d2b09
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-08-03 18:56:36 +10:00
4b920622d5
Issue #797
2016-08-03 18:33:53 +10:00
7669ea0365
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-27 20:34:47 +10:00
37fa778ea0
Issue #213
2016-07-27 20:13:24 +10:00
1b3411b807
Fixing versions
2016-07-26 13:16:58 -07:00
968248fbcb
Merge branch 'jetty-9.4.x'
2016-07-26 13:10:13 -07:00
e8d7bb5884
Fixing version
2016-07-26 13:09:51 -07:00
6e1b1cdb36
Updating to version 9.3.12-SNAPSHOT
2016-07-21 19:07:19 -07:00
9fd6d4354e
Updating to version 9.3.11.v20160721
2016-07-21 18:37:09 -07:00
0b18340179
Updating to version 9.2.19-SNAPSHOT
2016-07-21 13:10:23 -07:00
d3ff3423f0
Updating to version 9.2.18.v20160721
2016-07-21 12:35:26 -07:00
75f4af1355
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-07-20 12:47:44 +10:00
Simone Bordet
Olivier Lamy
olivier lamy
Jan Bartel
Joakim Erdfelt
Jesse McConnell
Greg Wilkins
Kazuhiro Sera
lachan-roberts
Carter Kozak
olivier lamy
Christoph Dreis
WalkerWatch
James Earl Douglas
Joakim Erdfelt