update to latest master version
diff --git a/jetty-features/javax.servlet.jsp.glassfish.source/pom.xml b/jetty-features/javax.servlet.jsp.glassfish.source/pom.xml
index 309df02..2be5ca5 100644
--- a/jetty-features/javax.servlet.jsp.glassfish.source/pom.xml
+++ b/jetty-features/javax.servlet.jsp.glassfish.source/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>javax.servlet.jsp.glassfish.source</artifactId>
diff --git a/jetty-features/javax.servlet.jsp.glassfish/pom.xml b/jetty-features/javax.servlet.jsp.glassfish/pom.xml
index d21315b..4be9692 100644
--- a/jetty-features/javax.servlet.jsp.glassfish/pom.xml
+++ b/jetty-features/javax.servlet.jsp.glassfish/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>javax.servlet.jsp.glassfish</artifactId>
diff --git a/jetty-features/org.eclipse.jetty.all.dependencies/feature.xml b/jetty-features/org.eclipse.jetty.all.dependencies/feature.xml
index 49b032e..27701c5 100644
--- a/jetty-features/org.eclipse.jetty.all.dependencies/feature.xml
+++ b/jetty-features/org.eclipse.jetty.all.dependencies/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.all.dependencies"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.all.dependencies/pom.xml b/jetty-features/org.eclipse.jetty.all.dependencies/pom.xml
index 70a5022..d1d36bb 100644
--- a/jetty-features/org.eclipse.jetty.all.dependencies/pom.xml
+++ b/jetty-features/org.eclipse.jetty.all.dependencies/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<!--relativePath>../../../jetty-osgi</relativePath-->
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/jetty-features/org.eclipse.jetty.all/feature.xml b/jetty-features/org.eclipse.jetty.all/feature.xml
index b76bea2..d77d0ca 100644
--- a/jetty-features/org.eclipse.jetty.all/feature.xml
+++ b/jetty-features/org.eclipse.jetty.all/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.all"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.all/pom.xml b/jetty-features/org.eclipse.jetty.all/pom.xml
index fdcb8b1..e0ca3af 100644
--- a/jetty-features/org.eclipse.jetty.all/pom.xml
+++ b/jetty-features/org.eclipse.jetty.all/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<!--relativePath>../../../jetty-osgi</relativePath-->
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/jetty-features/org.eclipse.jetty.bundles.f.source/feature.xml b/jetty-features/org.eclipse.jetty.bundles.f.source/feature.xml
index 92ce4b7..5a7cacd 100644
--- a/jetty-features/org.eclipse.jetty.bundles.f.source/feature.xml
+++ b/jetty-features/org.eclipse.jetty.bundles.f.source/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.bundles.f.source"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.bundles.f.source/pom.xml b/jetty-features/org.eclipse.jetty.bundles.f.source/pom.xml
index bcc20f7..55be1c9 100644
--- a/jetty-features/org.eclipse.jetty.bundles.f.source/pom.xml
+++ b/jetty-features/org.eclipse.jetty.bundles.f.source/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.jetty.bundles.f.source</artifactId>
diff --git a/jetty-features/org.eclipse.jetty.core/feature.xml b/jetty-features/org.eclipse.jetty.core/feature.xml
index 602c538..9bdef29 100644
--- a/jetty-features/org.eclipse.jetty.core/feature.xml
+++ b/jetty-features/org.eclipse.jetty.core/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.core"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.core/pom.xml b/jetty-features/org.eclipse.jetty.core/pom.xml
index 5de4d62..9e43f5c 100644
--- a/jetty-features/org.eclipse.jetty.core/pom.xml
+++ b/jetty-features/org.eclipse.jetty.core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.jetty.core</artifactId>
diff --git a/jetty-features/org.eclipse.jetty.product/categories.xml b/jetty-features/org.eclipse.jetty.product/categories.xml
index e95775c..a8662c5 100644
--- a/jetty-features/org.eclipse.jetty.product/categories.xml
+++ b/jetty-features/org.eclipse.jetty.product/categories.xml
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<site name="jetty site">
- <feature url="features/org.eclipse.jetty.core_7.5.2.qualifier.jar" id="org.eclipse.jetty.core" version="7.5.2.qualifier">
+ <feature url="features/org.eclipse.jetty.core_7.6.0.qualifier.jar" id="org.eclipse.jetty.core" version="7.6.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.5.2.qualifier.jar" id="org.eclipse.jetty.slf4jlogback" version="7.5.2.qualifier">
+ <feature url="features/org.eclipse.jetty.slf4jlogback_7.6.0.qualifier.jar" id="org.eclipse.jetty.slf4jlogback" version="7.6.0.qualifier">
</feature>
- <feature url="features/org.eclipse.jetty.slf4jlogback.source_7.5.2.qualifier.jar" id="org.eclipse.jetty.slf4jlogback.source" version="7.5.2.qualifier">
+ <feature url="features/org.eclipse.jetty.slf4jlogback.source_7.6.0.qualifier.jar" id="org.eclipse.jetty.slf4jlogback.source" version="7.6.0.qualifier">
</feature>
- <feature url="features/org.eclipse.jetty.all_7.5.2.qualifier.jar" id="org.eclipse.jetty.all" version="7.5.2.qualifier">
+ <feature url="features/org.eclipse.jetty.all_7.6.0.qualifier.jar" id="org.eclipse.jetty.all" version="7.6.0.qualifier">
</feature>
- <feature url="features/org.eclipse.jetty.all.dependencies_7.5.2.qualifier.jar" id="org.eclipse.jetty.all.dependencies" version="7.5.2.qualifier">
+ <feature url="features/org.eclipse.jetty.all.dependencies_7.6.0.qualifier.jar" id="org.eclipse.jetty.all.dependencies" version="7.6.0.qualifier">
</feature>
- <!--feature url="features/org.eclipse.jetty.bundles.f_7.5.2.qualifier.jar" id="org.eclipse.jetty.bundles.f" version="7.5.2.qualifier">
+ <!--feature url="features/org.eclipse.jetty.bundles.f_7.6.0.qualifier.jar" id="org.eclipse.jetty.bundles.f" version="7.6.0.qualifier">
</feature-->
- <feature url="features/org.eclipse.jetty.bundles.f.source_7.5.2.qualifier.jar" id="org.eclipse.jetty.bundles.f.source" version="7.5.2.qualifier">
+ <feature url="features/org.eclipse.jetty.bundles.f.source_7.6.0.qualifier.jar" id="org.eclipse.jetty.bundles.f.source" version="7.6.0.qualifier">
</feature>
- <feature url="features/org.eclipse.jetty.sdk_7.5.2.qualifier.jar" id="org.eclipse.jetty.sdk" version="7.5.2.qualifier">
+ <feature url="features/org.eclipse.jetty.sdk_7.6.0.qualifier.jar" id="org.eclipse.jetty.sdk" version="7.6.0.qualifier">
<category name="EclipseRT Target Platform Components"/>
</feature>
- <feature url="features/org.eclipse.jetty.sdk.support_7.5.2.qualifier.jar" id="org.eclipse.jetty.sdk.support" version="7.5.2.qualifier">
+ <feature url="features/org.eclipse.jetty.sdk.support_7.6.0.qualifier.jar" id="org.eclipse.jetty.sdk.support" version="7.6.0.qualifier">
</feature>
<!--
@@ -37,7 +37,7 @@
</feature>
-->
- <!--feature url="features/org.eclipse.jetty.tooling_7.5.2.qualifier.jar" id="org.eclipse.jetty.tooling" version="7.5.2.qualifier">
+ <!--feature url="features/org.eclipse.jetty.tooling_7.6.0.qualifier.jar" id="org.eclipse.jetty.tooling" version="7.6.0.qualifier">
<category name="General Purpose Tools"/>
</feature-->
diff --git a/jetty-features/org.eclipse.jetty.product/pom.xml b/jetty-features/org.eclipse.jetty.product/pom.xml
index 7b5c8e7..e846601 100644
--- a/jetty-features/org.eclipse.jetty.product/pom.xml
+++ b/jetty-features/org.eclipse.jetty.product/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.jetty.product</artifactId>
diff --git a/jetty-features/org.eclipse.jetty.sdk.support/feature.xml b/jetty-features/org.eclipse.jetty.sdk.support/feature.xml
index 67ef94b..834045b 100644
--- a/jetty-features/org.eclipse.jetty.sdk.support/feature.xml
+++ b/jetty-features/org.eclipse.jetty.sdk.support/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.sdk.support"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.sdk.support/pom.xml b/jetty-features/org.eclipse.jetty.sdk.support/pom.xml
index 9303b91..8335ff1 100644
--- a/jetty-features/org.eclipse.jetty.sdk.support/pom.xml
+++ b/jetty-features/org.eclipse.jetty.sdk.support/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.jetty.sdk.support</artifactId>
diff --git a/jetty-features/org.eclipse.jetty.sdk/feature.xml b/jetty-features/org.eclipse.jetty.sdk/feature.xml
index df8f1eb..161e863 100644
--- a/jetty-features/org.eclipse.jetty.sdk/feature.xml
+++ b/jetty-features/org.eclipse.jetty.sdk/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.sdk"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.sdk/pom.xml b/jetty-features/org.eclipse.jetty.sdk/pom.xml
index 554f4cb..35ca30d 100644
--- a/jetty-features/org.eclipse.jetty.sdk/pom.xml
+++ b/jetty-features/org.eclipse.jetty.sdk/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<!--relativePath>../../../jetty-osgi</relativePath-->
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/jetty-features/org.eclipse.jetty.slf4jlogback.source/feature.xml b/jetty-features/org.eclipse.jetty.slf4jlogback.source/feature.xml
index 361909c..5a319e4 100644
--- a/jetty-features/org.eclipse.jetty.slf4jlogback.source/feature.xml
+++ b/jetty-features/org.eclipse.jetty.slf4jlogback.source/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.slf4jlogback.source"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.slf4jlogback.source/pom.xml b/jetty-features/org.eclipse.jetty.slf4jlogback.source/pom.xml
index def3230..bd9953f 100644
--- a/jetty-features/org.eclipse.jetty.slf4jlogback.source/pom.xml
+++ b/jetty-features/org.eclipse.jetty.slf4jlogback.source/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.jetty.slf4jlogback.source</artifactId>
diff --git a/jetty-features/org.eclipse.jetty.slf4jlogback/feature.xml b/jetty-features/org.eclipse.jetty.slf4jlogback/feature.xml
index fdd7fb0..62a4f15 100644
--- a/jetty-features/org.eclipse.jetty.slf4jlogback/feature.xml
+++ b/jetty-features/org.eclipse.jetty.slf4jlogback/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.slf4jlogback"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.slf4jlogback/pom.xml b/jetty-features/org.eclipse.jetty.slf4jlogback/pom.xml
index 5a0f59a..b2b9c4b 100644
--- a/jetty-features/org.eclipse.jetty.slf4jlogback/pom.xml
+++ b/jetty-features/org.eclipse.jetty.slf4jlogback/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>org.eclipse.jetty.slf4jlogback</artifactId>
diff --git a/jetty-features/org.eclipse.jetty.starterkit/feature.xml b/jetty-features/org.eclipse.jetty.starterkit/feature.xml
index 842cabb..08cdc29 100644
--- a/jetty-features/org.eclipse.jetty.starterkit/feature.xml
+++ b/jetty-features/org.eclipse.jetty.starterkit/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.starterkit"
label="%featureName"
- version="7.5.2.qualifier"
+ version="7.6.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty-features/org.eclipse.jetty.starterkit/pom.xml b/jetty-features/org.eclipse.jetty.starterkit/pom.xml
index e806b22..bcc7c71 100644
--- a/jetty-features/org.eclipse.jetty.starterkit/pom.xml
+++ b/jetty-features/org.eclipse.jetty.starterkit/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<!--relativePath>../../../jetty-osgi</relativePath-->
<relativePath>../../pom.xml</relativePath>
</parent>
diff --git a/jetty-features/org.eclipse.jetty.tooling/pom.xml b/jetty-features/org.eclipse.jetty.tooling/pom.xml
index 911f6c5..8ff9450 100644
--- a/jetty-features/org.eclipse.jetty.tooling/pom.xml
+++ b/jetty-features/org.eclipse.jetty.tooling/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-osgi</artifactId>
<groupId>org.eclipse.jetty.osgi</groupId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.eclipse.jetty.osgi</groupId>
diff --git a/pom.xml b/pom.xml
index 327a275..cb0b923 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.osgi</groupId>
<artifactId>jetty-osgi</artifactId>
- <version>7.5.2-SNAPSHOT</version>
+ <version>7.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -33,7 +33,7 @@
<eclipse-mirror-url>http://download.eclipse.org</eclipse-mirror-url>
<pathToPack200ParentFolder>/usr/lib/jvm/java-5-sun/bin</pathToPack200ParentFolder>
- <!--pathToPack200ParentFolder>/home/hmalphettes/apps/jdk1.7.5.21/bin</pathToPack200ParentFolder-->
+ <!--pathToPack200ParentFolder>/home/hmalphettes/apps/jdk1.7.6.01/bin</pathToPack200ParentFolder-->
<p2-install-folder-name>development</p2-install-folder-name>
<p2-install-parent-folder-name>jetty-rt-3.7-N-builds</p2-install-parent-folder-name>
diff --git a/set-version.sh b/set-version.sh
index 7252db6..a9aa4c4 100755
--- a/set-version.sh
+++ b/set-version.sh
@@ -43,7 +43,7 @@
if [ "$2" != "quiet" ]; then
echo "Change the version from $OLD_VERSION to $NEW_VERSION and set the forceContextQualifier to $buildNumber ? (default yes)"
read quiet
- [ -n "$quiet" ] && exit 0
+# [ -n "$quiet" ] && exit 0
echo "Executing..."
else
echo "Changing the version from $OLD_VERSION to $NEW_VERSION and set the forceContextQualifier to $buildNumber."
