Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 08:28:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,841 Commits 55 Branches 466 Tags
Commit Graph

582 Commits

Author SHA1 Message Date
Joakim Erdfelt
2057c4c17b Upgrading Junit + Hamcrest 2013-08-02 14:25:53 -07:00
Jesse McConnell
20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell
49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell
6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell
1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Jesse McConnell
650e8e93ae [maven-release-plugin] prepare for next development iteration 2013-07-26 10:57:33 -05:00
Jesse McConnell
e7e2fce56e [maven-release-plugin] prepare release jetty-7.6.12.v20130726 2013-07-26 10:57:26 -05:00
Simone Bordet
5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Jan Bartel
e6974dadab Harmonize with jetty-9 apis 2013-07-26 18:01:37 +10:00
Jesse McConnell
49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell
9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05:00
Jesse McConnell
de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell
3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 2013-07-25 12:52:07 -05:00
Jesse McConnell
bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell
39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jesse McConnell
e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell
99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -05:00
Jesse McConnell
767dbe6778 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:48:09 -05:00
Jesse McConnell
cfa6076c4f [maven-release-plugin] prepare release jetty-7.6.11.v20130725 2013-07-25 07:48:02 -05:00
Jan Bartel
50a67eac6a Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
	jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
 2013-07-25 13:22:14 +10:00
Jan Bartel
72b077921d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-07-25 11:26:35 +10:00
Joakim Erdfelt
ab7268e516 413684 - Trailing slash shows JSP source 
+ Adding testcase to replicate issue.
 2013-07-24 16:43:02 -07:00
Jesse McConnell
eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Jan Bartel
af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Jesse McConnell
725dc261c8 Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00
Jesse McConnell
a1a6f0e5f2 Merge branch 'release-7' into jetty-7 2013-05-22 10:39:24 -05:00
Jesse McConnell
742f6a063d [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:16:39 -05:00
Jesse McConnell
bdbd92dbc9 [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:10:07 -05:00
Jesse McConnell
0858e69cb1 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:19:34 -05:00
Jesse McConnell
d469b77663 [maven-release-plugin] prepare release jetty-8.1.11.v20130520 2013-05-20 07:19:25 -05:00
Jesse McConnell
497c2f7819 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:15:00 -05:00
Jesse McConnell
b32d0260c9 [maven-release-plugin] prepare release jetty-7.6.11.v20130520 2013-05-20 07:14:52 -05:00
Jesse McConnell
acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell
d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell
0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell
852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Jan Bartel
246088c2ee Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-jndi/src/main/java/org/eclipse/jetty/jndi/ContextFactory.java
	jetty-jndi/src/test/java/org/eclipse/jetty/jndi/java/TestJNDI.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/JettyContextHandlerServiceTracker.java
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/JettyOSGiBootContextAsService.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWebAppAsService.java
	jetty-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/boot/TestJettyOSGiBootWithJsp.java
 2013-02-14 20:08:37 +11:00
Joakim Erdfelt
a9f6f30242 Merge branch 'jetty-7' into jetty-8 2013-02-05 18:08:15 -07:00
Joakim Erdfelt
65c2112964 Making Jsp tests work on JDK's less than 7 2013-02-05 18:00:58 -07:00
Simone Bordet
209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Jesse McConnell
5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell
ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell
a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell
b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Greg Wilkins
46e13b305b Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
 2013-01-17 11:00:20 +11:00
Greg Wilkins
9cf08249e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-17 09:16:40 +11:00
Greg Wilkins
c4e77feefa unit test uses fake JSP 2013-01-15 15:53:54 +11:00
Jesse McConnell
e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell
863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00