Commit Graph

364 Commits

Author SHA1 Message Date
Jesse McConnell ec731e691d [maven-release-plugin] prepare for next development iteration 2012-01-20 12:28:31 -06:00
Jesse McConnell 6004fd4553 [maven-release-plugin] prepare release jetty-8.1.0.RC5 2012-01-20 12:28:24 -06:00
Jesse McConnell 8725172017 [maven-release-plugin] prepare for next development iteration 2012-01-13 09:45:25 -06:00
Jesse McConnell a2349abbcc [maven-release-plugin] prepare release jetty-8.1.0.RC4 2012-01-13 09:45:18 -06:00
Jesse McConnell 6fb729ea0d [maven-release-plugin] prepare for next development iteration 2011-12-22 13:55:28 -06:00
Jesse McConnell ac42188458 [maven-release-plugin] prepare release jetty-8.1.0.RC2 2011-12-22 13:55:23 -06:00
Greg Wilkins b36425b7aa Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
Jesse McConnell 8981176dda remove snapshot repo to see if that resolves issue with p2 snapshot build 2011-12-21 14:12:25 -06:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Greg Wilkins d2a91f40cd disable continuation 6 testing 2011-12-20 08:08:02 +11:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Jan Bartel b1d35ff549 Use org.apache.jasper.glassfish.2.1.0.v201110031002 from Orbit (equates to jsp-impl-2.1.3-b10) 2011-11-15 13:53:52 +11:00
Greg Wilkins 7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
Jesse McConnell d5320d95ba [maven-release-plugin] prepare for next development iteration 2011-10-24 15:02:30 -05:00
Jesse McConnell d02f74a50c [maven-release-plugin] prepare release jetty-8.0.4.v20111024 2011-10-24 15:02:23 -05:00
Jesse McConnell 1d86da8f68 [maven-release-plugin] prepare for next development iteration 2011-10-24 14:52:54 -05:00
Jesse McConnell 5f349ecc92 [maven-release-plugin] prepare release jetty-7.5.4.v20111024 2011-10-24 14:52:48 -05:00
Jesse McConnell e9ef517b38 pull latest merge from master 2011-10-24 14:38:54 -05:00
Jesse McConnell 261bb4a71f update jetty version maven plugin version 2011-10-24 13:55:02 -05:00
Greg Wilkins 5140a95144 refactored HttpConnection name 2011-10-20 15:12:19 +11:00
Jesse McConnell a38f2a9e68 [maven-release-plugin] prepare for next development iteration 2011-10-11 10:16:54 -05:00
Jesse McConnell 55a1be5435 [maven-release-plugin] prepare release jetty-8.0.3.v20111011 2011-10-11 10:16:47 -05:00
Jesse McConnell 925335dab2 merge from master 2011-10-11 09:43:27 -05:00
Jesse McConnell 7d10182034 [maven-release-plugin] prepare for next development iteration 2011-10-11 08:47:07 -05:00
Jesse McConnell b6ac542604 [maven-release-plugin] prepare release jetty-7.5.3.v20111011 2011-10-11 08:47:00 -05:00
Jesse McConnell 3ff03b0731 [Bug 348978] migrate jetty-http-spi 2011-10-07 11:37:33 -05:00
Jesse McConnell b55ec9bac1 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:59:52 -05:00
Jesse McConnell e32e8b1377 [maven-release-plugin] prepare release jetty-8.0.2.v20111006 2011-10-06 17:59:46 -05:00
Jesse McConnell 0cd4f2ec5c update update-version profile 2011-10-06 17:28:17 -05:00
Jesse McConnell f96bf09c64 add versions to reporting plugins, they don't seem to inherit from plugin management 2011-10-06 17:28:17 -05:00
Jesse McConnell 0c55c774d4 [maven-release-plugin] prepare for next development iteration 2011-10-06 17:25:38 -05:00
Jesse McConnell 4d822759de [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 17:25:32 -05:00
Jesse McConnell b58006b4a4 [maven-release-plugin] prepare for next development iteration 2011-10-06 09:43:37 -05:00
Jesse McConnell 7eca345e8d [maven-release-plugin] prepare release jetty-7.5.2.v20111006 2011-10-06 09:43:31 -05:00
Jesse McConnell decb4c7e8c update update-version profile 2011-10-06 09:20:57 -05:00
Jesse McConnell 8a077ff38e add versions to reporting plugins, they don't seem to inherit from plugin management 2011-10-06 08:24:58 -05:00
Jan Bartel 32dbb1bddb Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-deploy/src/main/config/etc/jetty-deploy.xml
	jetty-distribution/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/jetty-osgi-servletbridge/src/main/java/org/eclipse/jetty/osgi/servletbridge/FrameworkLauncherExtended.java
	jetty-osgi/jetty-osgi-servletbridge/src/main/webapp/WEB-INF/web.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/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-start/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-10-04 17:45:15 +11:00
Jesse McConnell b179883dfe blank commit testing serverside repack for webmaster 2011-09-30 15:41:03 -05:00
Jesse McConnell 8c1307e1c3 blank change 2011-09-30 09:56:13 -05:00
Thomas Becker 37845a1a4f 357687: Add ShutdownHandler + UnitTest 2011-09-30 07:58:39 -05:00
Jesse McConnell 90af3cc359 update jetty-version-maven-plugin version 2011-09-26 20:57:58 -05:00
Jesse McConnell bc86f5d154 update parent version 2011-09-20 14:08:30 -05:00
Jesse McConnell 3091739b70 remove plugin versions we get from parent and remove groupId 2011-09-20 11:47:17 -05:00
Jesse McConnell 2e7d84dec8 Update to new parent pom that lets us import into indigo and m2eclipse 2011-09-09 15:42:01 -05:00
Jesse McConnell 675464e82d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-09-08 12:46:56 -05:00
Joakim Erdfelt 03c0192cdb Making image files from src/main/javadoc actually show up in javadoc:aggregate and -javadoc.jar files 2011-09-08 10:29:27 -07:00
Jesse McConnell d5304b2cbc [maven-release-plugin] prepare for next development iteration 2011-09-08 12:20:15 -05:00