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
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
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
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
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
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
Jan Bartel
Joakim Erdfelt
Simone Bordet
Greg Wilkins
Olivier Lamy
olivier lamy
olivier lamy
Lachlan Roberts
Jesse McConnell