[jetty-commit] r2391 - in eclipse/trunk: . jetty-features/javax.servlet.

[genie@xxxxxxxxxxx]

Author: hmalphett
Date: 2010-10-23 20:07:17 -0400 (Sat, 23 Oct 2010)
New Revision: 2391

Modified:
   eclipse/trunk/jetty-features/javax.servlet.jsp.glassfish.source/pom.xml
   eclipse/trunk/jetty-features/javax.servlet.jsp.glassfish/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.all.source/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.all.source/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.all/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.all/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.core.source/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.core.source/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.core/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.core/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.p2.extras/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.p2.extras/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.product/categories.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.product/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.sdk.support/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.sdk.support/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.sdk/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.sdk/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback.source/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback.source/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit.source/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit.source/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.tooling/feature.xml
   eclipse/trunk/jetty-features/org.eclipse.jetty.tooling/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.addon.source/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.addon/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.standalone.source/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.standalone/pom.xml
   eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime/pom.xml
   eclipse/trunk/org.eclipse.jetty.osgi.boot.jdt/META-INF/MANIFEST.MF
   eclipse/trunk/org.eclipse.jetty.osgi.boot.jdt/pom.xml
   eclipse/trunk/org.eclipse.jetty.osgi.pde.launch/META-INF/MANIFEST.MF
   eclipse/trunk/org.eclipse.jetty.osgi.pde.launch/pom.xml
   eclipse/trunk/org.eclipse.jetty.osgi.pde.templates/META-INF/MANIFEST.MF
   eclipse/trunk/org.eclipse.jetty.osgi.pde.templates/pom.xml
   eclipse/trunk/pom.xml
Log:
build of jetty-osgi 7.2.0 with equinox from 3.6.1. Removed jetty-annotations for now

Modified: eclipse/trunk/jetty-features/javax.servlet.jsp.glassfish/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/javax.servlet.jsp.glassfish/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/javax.servlet.jsp.glassfish/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>javax.servlet.jsp.glassfish</artifactId>

Modified: eclipse/trunk/jetty-features/javax.servlet.jsp.glassfish.source/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/javax.servlet.jsp.glassfish.source/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/javax.servlet.jsp.glassfish.source/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>javax.servlet.jsp.glassfish.source</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.all/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.all/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.all/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.all"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
@@ -52,12 +52,12 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
+   <!--plugin
          id="org.eclipse.jetty.annotations"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/-->
 
    <plugin
          id="org.eclipse.jetty.plus"

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.all/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.all/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.all/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <!--relativePath>../../../jetty-osgi</relativePath-->
     <relativePath>../../pom.xml</relativePath>
   </parent>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.all.source/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.all.source/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.all.source/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.all.source"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">
@@ -17,12 +17,12 @@
       %license
    </license>
    
-   <plugin
+   <!--plugin
          id="org.eclipse.jetty.annotations.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
-         unpack="false"/>
+         unpack="false"/-->
 
    <plugin
          id="org.eclipse.jetty.plus.source"

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.all.source/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.all.source/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.all.source/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <!--relativePath>../../../jetty-osgi</relativePath-->
     <relativePath>../../pom.xml</relativePath>
   </parent>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.core/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.core/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.core/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.core"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.core/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.core/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.core/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.jetty.core</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.core.source/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.core.source/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.core.source/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.core.source"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.core.source/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.core.source/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.core.source/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <!--relativePath>../../../jetty-osgi</relativePath-->
     <relativePath>../../pom.xml</relativePath>
   </parent>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.p2.extras/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.p2.extras/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.p2.extras/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.p2.extras"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.p2.extras/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.p2.extras/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.p2.extras/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.jetty.p2</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.product/categories.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.product/categories.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.product/categories.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site name="jetty site">
-   <feature url="features/org.eclipse.jetty.core_7.1.6.qualifier.jar" id="org.eclipse.jetty.core" version="7.1.6.qualifier">
+   <feature url="features/org.eclipse.jetty.core_7.2.0.qualifier.jar" id="org.eclipse.jetty.core" version="7.2.0.qualifier">
       <category name="EclipseRT Target Platform Components"/>
    </feature>
-   <feature url="features/org.eclipse.jetty.core.source_7.1.6.qualifier.jar" id="org.eclipse.jetty.core.source" version="7.1.6.qualifier">
+   <feature url="features/org.eclipse.jetty.core.source_7.2.0.qualifier.jar" id="org.eclipse.jetty.core.source" version="7.2.0.qualifier">
       <category name="EclipseRT Target Platform Components"/>
    </feature>
    <feature url="features/javax.servlet.jsp.glassfish_2.1.0.qualifier.jar" id="javax.servlet.jsp.glassfish" version="2.1.0.qualifier">
    </feature>
    <feature url="features/javax.servlet.jsp.glassfish.source_2.1.0.qualifier.jar" id="javax.servlet.jsp.glassfish.source" version="2.1.0.qualifier">
    </feature>
-   <feature url="features/org.eclipse.jetty.slf4jlogback_7.1.6.qualifier.jar" id="org.eclipse.jetty.slf4jlogback" version="7.1.6.qualifier">
+   <feature url="features/org.eclipse.jetty.slf4jlogback_7.2.0.qualifier.jar" id="org.eclipse.jetty.slf4jlogback" version="7.2.0.qualifier">
    </feature>
-   <feature url="features/org.eclipse.jetty.slf4jlogback.source_7.1.6.qualifier.jar" id="org.eclipse.jetty.slf4jlogback.source" version="7.1.6.qualifier">
+   <feature url="features/org.eclipse.jetty.slf4jlogback.source_7.2.0.qualifier.jar" id="org.eclipse.jetty.slf4jlogback.source" version="7.2.0.qualifier">
    </feature>
-   <feature url="features/org.eclipse.jetty.all_7.1.6.qualifier.jar" id="org.eclipse.jetty.all" version="7.1.6.qualifier">
+   <feature url="features/org.eclipse.jetty.all_7.2.0.qualifier.jar" id="org.eclipse.jetty.all" version="7.2.0.qualifier">
    </feature>
-   <feature url="features/org.eclipse.jetty.all.source_7.1.6.qualifier.jar" id="org.eclipse.jetty.all.source" version="7.1.6.qualifier">
+   <feature url="features/org.eclipse.jetty.all.source_7.2.0.qualifier.jar" id="org.eclipse.jetty.all.source" version="7.2.0.qualifier">
    </feature>
-   <feature url="features/org.eclipse.jetty.sdk_7.1.6.qualifier.jar" id="org.eclipse.jetty.sdk" version="7.1.6.qualifier">
+   <feature url="features/org.eclipse.jetty.sdk_7.2.0.qualifier.jar" id="org.eclipse.jetty.sdk" version="7.2.0.qualifier">
       <category name="EclipseRT Target Platform Components"/>
    </feature>
-   <feature url="features/org.eclipse.jetty.sdk.support_7.1.6.qualifier.jar" id="org.eclipse.jetty.sdk.support" version="7.1.6.qualifier">
+   <feature url="features/org.eclipse.jetty.sdk.support_7.2.0.qualifier.jar" id="org.eclipse.jetty.sdk.support" version="7.2.0.qualifier">
    </feature>
+   
+   <!--
    <feature url="features/org.eclipse.pde.junit.runtime_1.0.0.qualifier.jar" id="org.eclipse.pde.junit.runtime" version="1.0.0.qualifier">
       <category name="EclipseRT Target Platform Components"/>
    </feature>
@@ -32,7 +34,9 @@
    <feature url="features/org.eclipse.pde.junit.runtime.addon_1.0.0.qualifier.jar" id="org.eclipse.pde.junit.runtime.addon" version="1.0.0.qualifier">
       <category name="EclipseRT Target Platform Components"/>
    </feature>
-   <!--feature url="features/org.eclipse.jetty.tooling_7.1.6.qualifier.jar" id="org.eclipse.jetty.tooling" version="7.1.6.qualifier">
+   -->
+   
+   <!--feature url="features/org.eclipse.jetty.tooling_7.2.0.qualifier.jar" id="org.eclipse.jetty.tooling" version="7.2.0.qualifier">
       <category name="General Purpose Tools"/>
    </feature-->
    

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.product/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.product/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.product/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.jetty.product</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.sdk/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.sdk/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.sdk/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.sdk"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.sdk/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.sdk/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.sdk/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <!--relativePath>../../../jetty-osgi</relativePath-->
     <relativePath>../../pom.xml</relativePath>
   </parent>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.sdk.support/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.sdk.support/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.sdk.support/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.sdk.support"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.sdk.support/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.sdk.support/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.sdk.support/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.jetty.sdk.support</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.slf4jlogback"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.jetty.slf4jlogback</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback.source/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback.source/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback.source/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.slf4jlogback.source"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback.source/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback.source/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.slf4jlogback.source/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.jetty.slf4jlogback.source</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.starterkit"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <!--relativePath>../../../jetty-osgi</relativePath-->
     <relativePath>../../pom.xml</relativePath>
   </parent>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit.source/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit.source/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit.source/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jetty.starterkit.source"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit.source/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit.source/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.starterkit.source/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.jetty.starterkit.source</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.tooling/feature.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.tooling/feature.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.tooling/feature.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -18,7 +18,7 @@
 <feature
       id="org.eclipse.jetty.tooling"
       label="%featureName"
-      version="7.1.6.qualifier"
+      version="7.2.0.qualifier"
       provider-name="%providerName">
 
    <description url="%descriptionURL">

Modified: eclipse/trunk/jetty-features/org.eclipse.jetty.tooling/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.jetty.tooling/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.jetty.tooling/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <groupId>org.eclipse.jetty.osgi</groupId>

Modified: eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.junit.runtime</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.addon/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.addon/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.addon/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.junit.runtime.addon</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.addon.source/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.addon.source/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.addon.source/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.junit.runtime.addon.source</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.standalone/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.standalone/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.standalone/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.junit.runtime.standalone</artifactId>

Modified: eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.standalone.source/pom.xml
===================================================================
--- eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.standalone.source/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/jetty-features/org.eclipse.pde.junit.runtime.standalone.source/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>org.eclipse.pde.junit.runtime.standalone.source</artifactId>

Modified: eclipse/trunk/org.eclipse.jetty.osgi.boot.jdt/META-INF/MANIFEST.MF
===================================================================
--- eclipse/trunk/org.eclipse.jetty.osgi.boot.jdt/META-INF/MANIFEST.MF	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/org.eclipse.jetty.osgi.boot.jdt/META-INF/MANIFEST.MF	2010-10-24 00:07:17 UTC (rev 2391)
@@ -3,7 +3,7 @@
 Bundle-Name: Jetty-JDT-Project-Deployment-As-Webapp
 Bundle-Activator: org.eclipse.jetty.osgi.boot.jdt.JDTWebappDeploymentActivator
 Bundle-SymbolicName: org.eclipse.jetty.osgi.boot.jdt;singleton:=true
-Bundle-Version: 7.1.6.qualifier
+Bundle-Version: 7.2.0.qualifier
 Bundle-Vendor: Intalio Inc
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",

Modified: eclipse/trunk/org.eclipse.jetty.osgi.boot.jdt/pom.xml
===================================================================
--- eclipse/trunk/org.eclipse.jetty.osgi.boot.jdt/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/org.eclipse.jetty.osgi.boot.jdt/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
    <artifactId>jetty-osgi</artifactId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
     <groupId>org.eclipse.jetty.osgi</groupId>
   </parent>
   <artifactId>org.eclipse.jetty.osgi.boot.jdt</artifactId>

Modified: eclipse/trunk/org.eclipse.jetty.osgi.pde.launch/META-INF/MANIFEST.MF
===================================================================
--- eclipse/trunk/org.eclipse.jetty.osgi.pde.launch/META-INF/MANIFEST.MF	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/org.eclipse.jetty.osgi.pde.launch/META-INF/MANIFEST.MF	2010-10-24 00:07:17 UTC (rev 2391)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse PDE Run Configuration
 Bundle-SymbolicName: org.eclipse.jetty.osgi.pde.launch;singleton:=true
-Bundle-Version: 7.1.6.qualifier
+Bundle-Version: 7.2.0.qualifier
 Bundle-Vendor: Intalio Inc
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
  org.eclipse.core.runtime;bundle-version="3.5.0",

Modified: eclipse/trunk/org.eclipse.jetty.osgi.pde.launch/pom.xml
===================================================================
--- eclipse/trunk/org.eclipse.jetty.osgi.pde.launch/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/org.eclipse.jetty.osgi.pde.launch/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.jetty.osgi.pde.launch</artifactId>
   <packaging>eclipse-plugin</packaging>

Modified: eclipse/trunk/org.eclipse.jetty.osgi.pde.templates/META-INF/MANIFEST.MF
===================================================================
--- eclipse/trunk/org.eclipse.jetty.osgi.pde.templates/META-INF/MANIFEST.MF	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/org.eclipse.jetty.osgi.pde.templates/META-INF/MANIFEST.MF	2010-10-24 00:07:17 UTC (rev 2391)
@@ -3,7 +3,7 @@
 Bundle-Localization: plugin
 Bundle-Name: Projecttemplate
 Bundle-SymbolicName: org.eclipse.jetty.osgi.pde.templates;singleton:=true
-Bundle-Version: 7.1.6.qualifier
+Bundle-Version: 7.2.0.qualifier
 Bundle-Activator: org.eclipse.jetty.osgi.pde.templates.JettyProjectTemplateActivator
 Bundle-Vendor: Intalio Inc
 Require-Bundle: org.eclipse.ui,

Modified: eclipse/trunk/org.eclipse.jetty.osgi.pde.templates/pom.xml
===================================================================
--- eclipse/trunk/org.eclipse.jetty.osgi.pde.templates/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/org.eclipse.jetty.osgi.pde.templates/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>jetty-osgi</artifactId>
     <groupId>org.eclipse.jetty.osgi</groupId>
-    <version>7.1.6-SNAPSHOT</version>
+    <version>7.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>org.eclipse.jetty.osgi.pde.templates</artifactId>
   <packaging>eclipse-plugin</packaging>

Modified: eclipse/trunk/pom.xml
===================================================================
--- eclipse/trunk/pom.xml	2010-10-23 07:02:35 UTC (rev 2390)
+++ eclipse/trunk/pom.xml	2010-10-24 00:07:17 UTC (rev 2391)
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty.osgi</groupId>
   <artifactId>jetty-osgi</artifactId>
-  <version>7.1.6-SNAPSHOT</version>
+  <version>7.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     
@@ -73,7 +73,7 @@
 
   <properties>
     <!-- this becomes the forced context qualifier -->
-    <buildnumber>v20101022</buildnumber>
+    <buildnumber>v20101020</buildnumber>
     
     <!--eclipse-mirror-url>http://d2u376ub0heus3.cloudfront.net</eclipse-mirror-url-->
     <eclipse-mirror-url>http://download.eclipse.org</eclipse-mirror-url>
@@ -81,7 +81,7 @@
     <!--pathToPack200ParentFolder>/usr/lib/jvm/java-5-sun/bin</pathToPack200ParentFolder-->
     <pathToPack200ParentFolder>/home/hmalphettes/apps/jdk1.5.0_21/bin</pathToPack200ParentFolder>
     <!--forceContextQualifier>${buildnumber}</forceContextQualifier-->
-    <jetty-version>7.1.6.v20100715</jetty-version>
+    <jetty-version>7.2.0.v20101020</jetty-version>
     <tycho-version>0.9.1</tycho-version>
         
     <jetty-osgi-version>${jetty-version}</jetty-osgi-version>
@@ -558,10 +558,14 @@
 		<compress>true</compress>
 		<statsURI>http://download.eclipse.org/releases/stats/helios/</statsURI>
 	<statsTrackedArtifacts>javax.servlet.jsp.glassfish,org.eclipse.jetty.core,org.eclipse.jetty.starterkit,org.eclipse.jetty.starterkit.sdk,org.eclipse.jetty.sdk,org.eclipse.jetty.tooling,org.eclipse.pde.junit.runtime,org.eclipse.pde.junit.runtime.standalone,org.eclipse.pde.junit.runtime.addon</statsTrackedArtifacts>
-	      <environmentsToArchive>os=win32;ws=win32;arch=x86*
+<!--	      <environmentsToArchive>os=win32;ws=win32;arch=x86*
                         os=linux;ws=gtk;arch=x86*
                         os=macosx;ws=cocoa;arch=x86*
-	      </environmentsToArchive>
+                      </environmentsToArchive> -->
+                        <!-- mac fails at the moment? -->
+          <environmentsToArchive>os=win32;ws=win32;arch=x86*
+                        os=linux;ws=gtk;arch=x86*
+          </environmentsToArchive>
 	      <productsToArchive>*EclipseRT*</productsToArchive>
 	      </configuration>
 	</plugin>