6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
379f9f6c43
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-06 17:30:43 +01:00
b59782acf8
452201 Set the container classloader for osgi during webbundle undeploy
2015-01-01 15:53:33 +01:00
e8c88cfd9c
Merged branch 'jetty-9.2.x' into 'master'.
2014-12-22 21:32:09 +01:00
89a9aa2472
455330 Multiple Jetty-ContextFilePath entries separated by commas doesn't work
2014-12-17 12:22:34 +01:00
2dd4e9b09e
Update version of jetty-osgi-servlet-api artifact for testing.
2014-12-12 15:59:03 +01:00
8fa2c8ca60
454955 OSGi AnnotationParser should skip resources that are not in the classpath and close the class inputstream when done scanning it
2014-12-12 15:32:17 +01:00
32c27d146c
454954 Jetty osgi should skip fragment and required bundles that are in the uninstalled state
2014-12-12 14:56:33 +01:00
0db02049ad
440506 Jetty OSGi boot bundle does not support OSGi framework Eclipse Concierge
2014-12-10 14:57:48 +01:00
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
a04a576c45
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-12-04 14:17:47 +01:00
dd6ab36867
453801 Jetty does not check for already registered services when bootstrapping
2014-12-04 10:05:54 +01:00
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
1159111c52
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/SelectChannelEndPoint.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2014-11-27 13:34:45 +11:00
16737804c8
452261 - Multiple servlets map to path *.jsp when using jsp-property-group
2014-11-26 15:36:36 +11:00
ab2e9c357f
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
2014-11-20 16:34:30 +11:00
9792cec6db
451529 Change sentinel class for finding jstl on classpath to org.apache.taglibs.standard.tag.rt.core.WhenTag
2014-11-19 17:20:55 +11:00
aeccef2154
Merge remote-tracking branch 'origin/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-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
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
2014-11-19 13:37:48 +11:00
07d3a30ff7
Upgrade version of pax-exam and equinox for jetty-osgi testing.
2014-11-13 19:16:52 +11:00
dc2b9b18a9
383207 Use BundleFileLocatorHelperFactory to obtain BundleFileLocatorHelper
2014-11-13 18:57:13 +11:00
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
8694d9265d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipDefaultTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
2014-11-07 14:10:47 +11:00
244f97a9d1
Added extra debug to jetty osgi; added proper manifest to test-webapp-fragment
2014-11-07 11:43:23 +11:00
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
7d5c8f2a96
Merge remote-tracking branch 'origin/jetty-9.2.x'
2014-10-24 12:51:01 +11:00
1ab6d7398c
447979 Refactor to make MetaData responsible for progressively ordering web-inf jars
2014-10-24 12:48:15 +11:00
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
2755746def
Merge branch 'jetty-http2'
2014-09-11 05:56:55 -07:00
09e22c042c
443661 Rename manifest and service constants for jetty osgi resource fragment code
2014-09-10 16:28:29 +10:00
5011993ddf
Merge remote-tracking branch 'origin/master' into jetty-http2
...
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-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-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
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-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
2014-09-10 14:38:18 +10:00
88b19abf52
[maven-release-plugin] prepare for next development iteration
2014-09-05 09:19:30 -05:00
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00
d9f285f5f5
Update versions of apache-jsp and servlet-api for osgi
2014-09-05 20:19:45 +10:00
7c882d76c5
Make annotations and JNDI wortk with OSGi
2014-09-05 18:35:15 +10:00
7199c6ceca
Switch to apache-jsp for jetty-osgi
2014-09-05 18:35:15 +10:00
b47f9ef605
cleaned up OSGi manifest creation
2014-08-15 19:35:49 +10:00
a14d843382
ignored osgi-spdy tests
2014-08-14 15:18:28 +10:00
f81bb4c000
update OSGi for ssl home and base
2014-08-14 11:21:08 +10:00
fa9b60c77e
Merge remote-tracking branch 'origin/jetty-http2' into pathresource
2014-08-01 10:17:42 +10:00
252933891c
Merge branch 'master' into pathresource
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2014-07-31 14:05:26 +10:00
66980f2449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
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
examples/quickstart/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-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-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-dispatch-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
2014-07-25 17:37:53 +10:00
f8bf40107a
436862 Update jetty-osgi to asm-5 and spifly-1.0.1
2014-07-25 15:32:41 +10:00
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00
8ec4e56681
Fixing compile error
2014-07-22 11:57:52 -07:00
706fe1eba3
Merge remote-tracking branch 'origin/master' into jetty-http2
2014-07-03 16:01:37 +10:00
839485797b
437419 Allow scanning of META-INF for resources,fragments,tlds for unpacked jars
2014-07-01 10:40:58 +10:00
9f844383cd
Making PathResource the default for "file://" resources
...
+ Making ResourceTest a proper @Parameterized test case
+ Moving jar tests out of ResourceTest into JarResourceTest
+ Moving classpath tests out of ResourceTest into ClassPathResourceTest
+ Making more improvements to PathResource to satisfy expecations in
the rest of the codebase.
+ Requests for resource subpaths that use "//" in their strings will
now work correctly (it used to result in null requests in
FileResource)
2014-06-25 14:11:44 -07:00
334db9fe72
Updated version to 9.3.0-SNAPSHOT.
2014-06-16 21:33:03 +02:00
c3ee0711ca
[maven-release-plugin] prepare for next development iteration
2014-06-09 13:37:54 -05:00
06b494eeac
[maven-release-plugin] prepare release jetty-9.2.1.v20140609
2014-06-09 13:37:49 -05:00
8f4aeeeb8d
updated version to 10.0.0-SNAPSHOT
2014-06-04 15:08:54 +02:00
2e859e4ae2
[maven-release-plugin] prepare for next development iteration
2014-05-26 12:04:15 -05:00
71ad2114c5
[maven-release-plugin] prepare release jetty-9.2.0.v20140526
2014-05-26 12:04:08 -05:00
d59dbe936b
[maven-release-plugin] prepare for next development iteration
2014-05-23 09:59:19 -05:00
edc7646a4c
[maven-release-plugin] prepare release jetty-9.2.0.v20140523
2014-05-23 09:59:13 -05:00
1386f20cf5
435217 Remove deprecated TagLibConfiguration
2014-05-19 18:20:52 +02:00
800a6639a3
Ensure annotation-related code is optional for tests with jdk8
2014-04-29 20:55:49 +02:00
609945fe7c
433656 Change to Opcode.ASM5 breaks jetty-osgi
2014-04-28 15:36:36 +02:00
31043d2570
432483 make osgi.serviceloader support for javax.servlet.ServletContainerInitializer optional
2014-04-12 09:12:25 +10:00
f2f5353a29
432483 jetty-annotations bundle does not start if there are no bundles that provide a service javax.servlet.ServletContainerInitializer
2014-04-11 17:25:08 +10:00
02994483dc
Only test osgi with annotations in jdk < 1.8
2014-04-10 12:11:07 +10:00
a5bd46fd57
409105 Upgrade jetty-osgi build/test to use more recent pax junit test framework
2014-04-10 11:23:13 +10:00
2897027f53
Merged branch 'master' into 'jetty-9.2.x'.
2014-04-07 17:51:23 +02:00
90f387bc34
431892 DefaultFileLocatorHelper.getBundleInstallLocation fails for equinox 3.10
2014-04-07 20:59:17 +10:00
64e11bc8e8
reverted version to 9.1.x pending merge of 9.2 branch
2014-04-07 12:52:43 +10:00
c62500c63d
Fix alpn-related poms for osgi and osgi test cases.
2014-04-03 16:41:24 +11:00
dbb938ac71
[maven-release-plugin] prepare for next development iteration
2014-04-02 10:55:29 -05:00
c616ece6c7
[maven-release-plugin] prepare release jetty-9.1.4.v20140401
2014-04-02 10:55:21 -05:00
c5e1e249e7
set version for 9.2.x
2014-03-31 11:35:06 +11:00
b198234d5b
Ensure that jetty-annotations manifest uses 4.1 or above for asm, and that the jetty osgi spdy tests use only 4.1.
2014-03-27 17:08:57 +11:00
1444ffadb8
Reverting <modules> in parent pom in favor of spdy and osgi specifics
2014-03-26 14:06:23 -07:00
4f051fecf3
More work to make alpn & npn builds sane
2014-03-25 15:47:15 -07:00
aea74ea2da
Attempting to fix OSGi build for Java 8
2014-03-25 09:01:11 -07:00
529dde5ea4
Cleaned up wrong or unused configuration, and replaced NPN with ALPN.
2014-03-21 12:22:06 +01:00
919e41114c
Updated POMs to use ALPN. TestJettyOSGiBootSpdy still not working.
2014-03-20 12:09:54 +01:00
84fa579ec7
429616 Use UTF-8 encoding for XML
2014-03-10 15:23:08 +11:00
eacdaf7073
Make ServiceLoader.load work with jetty-osgi-boot to support annotations.
2014-03-10 13:42:06 +11:00
0ec0d452e9
[maven-release-plugin] prepare for next development iteration
2014-03-07 09:10:08 -06:00
1e555567a9
[maven-release-plugin] prepare release jetty-9.1.3.v20140225
2014-03-07 09:10:08 -06:00
eb0aea46ce
set versions.txt file to new version and fix mistaken developmentVersion
2014-02-10 13:48:29 -06:00
f3d38dfb15
[maven-release-plugin] prepare for next development iteration
2014-02-10 11:17:14 -06:00
8f6cbc9111
[maven-release-plugin] prepare release jetty-9.1.2.v20140210
2014-02-10 11:17:07 -06:00
1e2e3fc7f2
425837 Upgrade to jstl 1.2.2
2014-01-17 14:36:08 +11:00
a8b74ea9af
425275 org.eclipse.jetty.osgi.annotations.AnnotationConfiguration.BundleParserTask.getStatistic() returns null when debug is enabled.
2014-01-13 19:50:41 +11:00
b82ec6e668
[maven-release-plugin] prepare for next development iteration
2014-01-08 16:47:09 -06:00
b99623a21d
[maven-release-plugin] prepare release jetty-9.1.1.v20140108
2014-01-08 16:47:01 -06:00
a12fd9ea03
Happy New Year - 2014!
2014-01-02 14:50:14 -07:00
9172d6115b
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:58:44 -07:00
6feeab6ec3
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:58:36 -07:00
7bbc0ff4df
[maven-release-plugin] rollback the release of jetty-9.1.0.v20131115
2013-11-15 16:33:52 -07:00
1126e68971
[maven-release-plugin] prepare for next development iteration
2013-11-15 16:03:28 -07:00
d6418c73d4
[maven-release-plugin] prepare release jetty-9.1.0.v20131115
2013-11-15 16:03:20 -07:00
6c372b9440
Reverting <version> to 9.1.0-SNAPSHOT
2013-11-15 15:36:26 -07:00
b5345caed1
[maven-release-plugin] prepare for next development iteration
2013-11-14 15:27:52 -06:00
1582aa196d
[maven-release-plugin] prepare release jetty-9.1.0.v20131114
2013-11-14 15:27:37 -06:00
278e5cb91a
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-11-11 17:47:49 +11:00
8d2d598a72
421362 When using the jetty.osgi.boot ContextHandler service feature the wrong ContextHandler can be undeployed
2013-11-11 17:44:39 +11:00
d505350a9f
418596 Faults in JARs during class scanning should report the jar that caused the problem
2013-10-04 11:02:06 +10:00
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
0400289826
417561 Refactor annotation related code - make annotation phase able to be multithreaded
2013-09-30 13:27:05 +10:00
cf9f007fbd
417340 Upgrade JDT compiler to one that supports source/target of Java 1.7
2013-09-20 15:36:55 +10:00
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
d4c035a06f
417561 Refactor annotation related code to remove some deadwood
2013-09-19 15:43:38 +10:00
f44787075a
417382 - Upgrade to asm 4.1 and refactor annotation parsing
2013-09-17 13:12:54 +10:00
b24928db81
Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi)
2013-09-12 11:55:21 +10:00
be2ecca599
Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi)
2013-09-12 10:06:01 +10:00
070ce9dd22
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
a98bbc31e0
Make jsp 2.3.2 work for jetty-9.1, bring osgi tests back into the build.
2013-09-02 17:14:17 +10:00
280000e88a
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
VERSION.txt
aggregates/jetty-all/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-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/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-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-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/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-server/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/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-loginservice/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-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-jetty-webapp/src/main/config/demo/webapps/test.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
2013-08-29 12:59:32 +10:00
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00
307fdced91
Merge branch 'master' into jetty-9.1
2013-08-20 14:02:45 -05:00
a69deacc4c
[Bug 411069] update minimum jdk versions in pom.xml's
2013-08-20 12:40:33 -05:00
70e7a69d19
squash test osgi jars on deploy
2013-08-16 06:44:08 -05:00
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
e4716e05e1
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/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-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/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-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-plus/pom.xml
jetty-proxy/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-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/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/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-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/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-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
2013-06-27 09:12:28 +10:00
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
298b46a96f
set for re-reelease
2013-06-21 15:35:58 -05:00
8927c18840
reset versions for release
2013-06-21 15:28:26 -05:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
918632d408
411340 SpdyConnection make executeOnFillable configurable and default to true
2013-06-21 14:45:16 +02:00
4f6732a7e9
Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization.
2013-06-21 18:41:35 +10:00
3ded04813d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java
2013-06-21 11:22:58 +10:00
Joakim Erdfelt
Simone Bordet
Jan Bartel
Greg Wilkins
Jesse McConnell
Mikhail Mazursky
Thomas Becker