Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-22 15:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,930 Commits 55 Branches 466 Tags
Commit Graph

413 Commits

Author SHA1 Message Date
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
Joakim Erdfelt
fdaad62b63 Migrating old javax.* deps to new org.eclipse.jetty.orbit deps 
+ Removed old deps in javax.*, geronimo, and asm in favor of
  new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
 2012-01-31 15:21:58 -07:00
Joakim Erdfelt
6e3bd75d99 Setting failing jetty osgi + jsp test to @Ignore till I can get help 2012-01-31 14:01:44 -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
b2b8cf5dd5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-30 09:11:11 -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
e9287677f0 Making paxexam a property in prep for upgrade 2012-01-20 14:17:51 -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
Jan Bartel
691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Jesse McConnell
49b3239aa6 clear up the last of the maven warnings I see 2012-01-10 13:45:39 -06:00
Jan Bartel
1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Jesse McConnell
e0f117f2a8 resolve another maven warning 2012-01-09 15:16:59 -06:00
Jesse McConnell
0fa4fa9b23 clean up some warnings from maven 2012-01-09 14:57:21 -06:00
hmalphettes
4f8cff8ccd bug 367548 the nested package must not be imported twice in jetty-osgi-boot 2011-12-27 07:59:13 +08:00
Jan Bartel
c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Jan Bartel
0b1becf58d 364936 use Resource for opening URL streams 2011-12-08 12:16:36 +11:00
Jesse McConnell
26b5d5e589 update versions of orbit dependencies and fix a naming issue in test-jetty-osgi 2011-12-06 14:20:10 -06:00
hmalphettes
96eb1a6f92 workaround to fix the test error. did not find why those packages that are imported in osgi-boot-jsp still can't be resolved by felix. 2011-12-06 20:49:31 +08:00
hmalphettes
f31f4150d8 workaround to fix the test error. did not find why those packages that are imported in osgi-boot-jsp still can't be resolved by felix. 2011-12-06 20:45:57 +08:00
hmalphettes
a08f58634e latest orbit libraries 2011-12-06 20:45:01 +08: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 9e72457941e98eb2ee1adf64f2bc53160b01e34d, reversing
changes made to df12605f0e3e549c07c96968eedfd382fd6f274e.
 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
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
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
7d10182034 [maven-release-plugin] prepare for next development iteration 2011-10-11 08:47:07 -05:00