Jesse McConnell
cdcc0922c3
[maven-release-plugin] prepare for next development iteration
2012-04-12 09:49:52 -05:00
Jesse McConnell
5966c86571
[maven-release-plugin] prepare release jetty-7.6.3.v20120412
2012-04-12 09:49:46 -05:00
Greg Wilkins
d8b1d80e4e
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
Jesse McConnell
b3ac9235f7
add spdy to the distribution and make npn-boot test dependency pull from internal to build as opposed to out of a local repository
2012-03-16 12:46:47 -05:00
Jesse McConnell
b4985ad0d5
[maven-release-plugin] prepare for next development iteration
2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe
[maven-release-plugin] prepare release jetty-8.1.2.v20120308
2012-03-08 23:53:42 -06:00
Jesse McConnell
246e3ed756
[maven-release-plugin] prepare for next development iteration
2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e
[maven-release-plugin] prepare release jetty-7.6.2.v20120308
2012-03-08 21:09:37 -06:00
Jesse McConnell
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
Jesse McConnell
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
Jesse McConnell
ac79497dee
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:29:36 -06:00
Jesse McConnell
3705b424c8
[maven-release-plugin] prepare release jetty-8.1.1.v20120215
2012-02-15 14:29:28 -06:00
Jesse McConnell
efb6883cf0
[maven-release-plugin] prepare for next development iteration
2012-02-15 14:22:19 -06:00
Jesse McConnell
baf2b94f77
[maven-release-plugin] prepare release jetty-7.6.1.v20120215
2012-02-15 14:22:12 -06:00
Jesse McConnell
91c526cc48
Merge branch 'master' into jetty-8
2012-02-02 16:44:24 -06:00
Jan Bartel
33a73c69fd
370386 Remove META-INF from jetty distro
2012-02-02 16:24:08 +11:00
Joakim Erdfelt
2fa2eb929a
Bug 370384 - jetty-distribution is dependent on jetty-all aggregate?
...
+ Setting exclusion on jetty-all artifactId.
2012-02-01 18:34:54 -07:00
Jesse McConnell
0797e8a23d
merge from master
2012-02-01 17:25:11 -06:00
Jesse McConnell
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
Joakim Erdfelt
228ff32ab0
Cleaning up jetty-jsp dependencies to only arrive via jetty-jsp
2012-02-01 08:59:00 -07:00
Jan Bartel
2bb0248e44
Use jetty-jsp for jetty-distribution
2012-02-01 19:30:55 +11:00
Joakim Erdfelt
46cd49323c
Fixing distribution using of orbit deps
2012-01-31 15:54:26 -07:00
Joakim Erdfelt
c4cf25f51b
Raising new orbit deps to top level dependencyManagement, and wiring up jetty-osgi with new deps
2012-01-31 14:00:47 -07:00
Joakim Erdfelt
154f4e7ed7
Merge branch 'central-orbit-repo'
2012-01-31 12:23:02 -07:00
Jesse McConnell
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
Jesse McConnell
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
Jesse McConnell
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
Jesse McConnell
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
Jesse McConnell
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
Jesse McConnell
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
Jesse McConnell
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
Jesse McConnell
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
Jesse McConnell
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
Jesse McConnell
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
Joakim Erdfelt
151ae1954a
Final sweep of the orbit deps in jetty-distribution
2012-01-23 09:12:48 -07:00
Joakim Erdfelt
1ae3a6bcff
Conversion of old /home/joakim/.m2/eclipse-orbit to using central repo's org.eclipse.jetty.orbit deps
2012-01-20 14:59:33 -07:00
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
16833ca8c9
[maven-release-plugin] prepare for next development iteration
2012-01-20 10:50:24 -06:00
Jesse McConnell
dd80d7e868
[maven-release-plugin] prepare release jetty-7.6.0.RC5
2012-01-20 10:50:14 -06:00
Greg Wilkins
e1b12a633b
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-distribution/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
Jesse McConnell
ec7eb3348a
Revert "Get rid of javax.activation."
...
this was not appropriate for jetty7 which needs to support java 1.5 which is not universally bundling javax.activation as previously understood. The original commit should stand for jetty 8 though which will be handled during that merge
This reverts commit fae4f3fda93cbe2b0fe6dec42c1dec54a491c69a.
2012-01-18 15:16:34 -06:00
Jesse McConnell
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06:00
Alexander Kurtakov
fae4f3fda9
Get rid of javax.activation.
...
Java activation framework (JAF) or javax.activation:activation(maven) is an API that is integral part of
every Java 5 level virtual machine. As such there is no point in still referencing/downloading/including or making any other operation
with it. Simply removing references to it in build scripts makes it use the JVM provided one.
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2012-01-13 16:09:08 -06:00
Jesse McConnell
45cf0552fc
[maven-release-plugin] prepare for next development iteration
2012-01-13 08:37:25 -06:00
Jesse McConnell
ec589eed33
[maven-release-plugin] prepare release jetty-7.6.0.RC4
2012-01-13 08:37:19 -06:00
