Jesse McConnell
ac42188458
[maven-release-plugin] prepare release jetty-8.1.0.RC2
2011-12-22 13:55:23 -06:00
Jesse McConnell
9c4d49f3c4
[maven-release-plugin] rollback the release of jetty-8.1.0.RC2
2011-12-22 13:07:39 -06:00
Jan Bartel
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
Joakim Erdfelt
6d2ad43cc4
365932 - Produce jetty-websocket aggregate jar for android use
...
+ revert last change using maven-shade-plugin as it didn't address
the now redundant transitive dependencies present in the
jetty-websocket pom.
+ made a formal jetty-aggregate/jetty-websocket build instead.
2011-12-07 12:13:57 -07:00
hmalphettes
89afbdf31d
360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6
2011-12-02 17:27:26 +08: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
Jesse McConnell
94124f7412
merge from master
2011-10-26 15:26:49 -05: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
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
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
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
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
Jan Bartel
20cce2069d
358784 JSP broken on Java 1.5
2011-09-27 12:37:38 +10:00
Joakim Erdfelt
d39ceb21a7
357959 - Include javadoc in distribution
...
+ Enabling javadoc:jar on jetty-all (aggregate)
+ Using jetty-all-${version}-javadoc.jar as source for
distribution ${jetty.home}/javadoc/ content.
2011-09-16 10:13:21 -07:00
Jesse McConnell
56269df419
remove extra groupId element
2011-09-09 16:08:15 -05:00
Jesse McConnell
d5304b2cbc
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:20:15 -05:00
Jesse McConnell
c33548d38a
[maven-release-plugin] prepare release jetty-8.0.1.v20110908
2011-09-08 12:19:24 -05:00
Jesse McConnell
ebdb89dc23
[maven-release-plugin] prepare for next development iteration
2011-09-08 12:00:16 -05:00
Jesse McConnell
932245a114
[maven-release-plugin] prepare release jetty-7.5.1.v20110908
2011-09-08 12:00:10 -05:00
Jesse McConnell
721c8ab682
updating version.txt and resetting pom version to 8.0.1-SNAPSHOT
2011-09-08 11:54:53 -05:00
Jesse McConnell
37d0f53b0a
updating version.txt and resetting pom versions to 7.5.1-SNAPSHOT
2011-09-08 11:40:37 -05:00
Jesse McConnell
4e47d6a7fa
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:16:58 -05:00
Jesse McConnell
d77a12962b
[maven-release-plugin] prepare release jetty-8.0.1.v20110907
2011-09-07 18:16:50 -05:00
Jesse McConnell
6b614a54f0
[maven-release-plugin] prepare for next development iteration
2011-09-07 18:12:16 -05:00
Jesse McConnell
ce55c8c601
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 18:12:09 -05:00
Jesse McConnell
1744b5bce1
reset from release
2011-09-07 11:09:46 -05:00
Jesse McConnell
ae86ad6d4e
[maven-release-plugin] prepare for next development iteration
2011-09-07 10:03:16 -05:00
Jesse McConnell
86383afbd2
[maven-release-plugin] prepare release jetty-7.5.1.v20110907
2011-09-07 10:03:10 -05:00
Jesse McConnell
40dcb10ed8
[maven-release-plugin] prepare for next development iteration
2011-09-01 12:24:32 -05:00
Jesse McConnell
db14b194fa
[maven-release-plugin] prepare release jetty-8.0.0.v20110901
2011-09-01 12:24:24 -05:00
Jesse McConnell
a728021edf
[maven-release-plugin] prepare for next development iteration
2011-09-01 11:17:05 -05:00
Jesse McConnell
882308f781
[maven-release-plugin] prepare release jetty-7.5.0.c20110901
2011-09-01 11:16:58 -05:00
Jesse McConnell
57e9045635
[maven-release-plugin] prepare for next development iteration
2011-08-31 14:17:32 -05:00
Jesse McConnell
317491a4d7
[maven-release-plugin] prepare release jetty-7.5.0.v20110901
2011-08-31 14:17:25 -05:00