Changes for 9.1 p2 builds.
diff --git a/README b/README
index 7e069a0..929f3dc 100644
--- a/README
+++ b/README
@@ -16,10 +16,10 @@
1. Update the version number
Use the set-version.sh script. This accepts an argument of the new version number, eg:
- > set-version.sh 9.0.3.v20130506
+ > set-version.sh 9.1.0.RC0
Alternatively, you can set the variable NEW_VERSION to be the new version number, eg:
- > export NEW_VERSION=9.0.3.v20130506
+ > export NEW_VERSION=9.1.0.RC0
> set-version.sh
You can set the variable OLD_VERSION to override the old version number. If you don't set it,
@@ -31,7 +31,7 @@
Here's an example with all options set:
- > mvn -DBRANCH_NAME=jetty-9 -Dset_pom_version=9.0.3.v20130506 -Djetty_release_version=9.0.3.v20130506 -Ddelete_tycho_meta=true -Dforce_context_qualifier= -Dpack_and_sign=true -Dmaven.repo.local=/tmp/jetty-builds/jetty7/localRepo -DforceContextQualifier= -Dpack-and-sign=true -Djetty-release-version=9.0.3.v20130506 clean verify -X -U
+ > mvn -DBRANCH_NAME=jetty-9 -Dset_pom_version=9.1.0.RC0 -Djetty_release_version=9.1.0.RC0 -Ddelete_tycho_meta=true -Dforce_context_qualifier= -Dpack_and_sign=true -Dmaven.repo.local=/tmp/jetty-builds/jetty7/localRepo -DforceContextQualifier= -Djetty-release-version=9.1.0.RC0 clean verify -X -U
3. Do the post build:
@@ -44,8 +44,10 @@
There are jobs set up on the Hudson instance on build.eclipse.org that will start a build:
- jetty-rt-bundles
- jetty-rt-bundles-8
+ jetty-rt-bundles-9.1 (for jetty-9.1)
+ jetty-rt-bundles (for jetty-9)
+ jetty-rt-bundles-8 (for jetty-8)
+ jetty-rt-bundles-7 (for jetty-7)
When using these jobs, you will need to manually start a build. You will be presented with a form asking you to fill in build parameters,
@@ -58,6 +60,6 @@
Generally, the values for both of these will be identical, ie the latest jetty release number. If you don't provide a value for the set_pom_version,
-then the p2 feature that is generated will default to the values contained in the pom.xml and feature.xml files that were last checked in. For jetty-9
-this is version 9.0.0. set_pom_version controls the version number of the p2 feature, whilst jetty_release_version controls the version number of
+then the p2 feature that is generated will default to the values contained in the pom.xml and feature.xml files that were last checked in. For jetty-9.1
+this is version 9.1.0. set_pom_version controls the version number of the p2 feature, whilst jetty_release_version controls the version number of
the jetty jars used.
diff --git a/jetty.bundles.f.source/feature.xml b/jetty.bundles.f.source/feature.xml
index 926a177..9ede298 100644
--- a/jetty.bundles.f.source/feature.xml
+++ b/jetty.bundles.f.source/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.bundles.f.source"
label="%featureName"
- version="9.0.0.qualifier"
+ version="9.1.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
diff --git a/jetty.bundles.f.source/pom.xml b/jetty.bundles.f.source/pom.xml
index bf89460..f2050d1 100644
--- a/jetty.bundles.f.source/pom.xml
+++ b/jetty.bundles.f.source/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.jetty.p2repo</groupId>
<artifactId>jetty-p2repo</artifactId>
- <version>9.0.0-SNAPSHOT</version>
+ <version>9.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jetty.bundles.f.source</artifactId>
<packaging>eclipse-feature</packaging>
diff --git a/jetty.bundles.f/feature.xml b/jetty.bundles.f/feature.xml
index e9f75be..3a1dc91 100644
--- a/jetty.bundles.f/feature.xml
+++ b/jetty.bundles.f/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jetty.bundles.f"
label="%featureName"
- version="9.0.0.qualifier"
+ version="9.1.0.qualifier"
provider-name="%providerName">
<description url="%descriptionURL">
@@ -66,6 +66,13 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.jetty.jaas"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
<!-- Required by jaspi but not present in Eclipse download -->
<plugin
id="javax.security.auth.message"
@@ -151,6 +158,14 @@
unpack="false"/>
<plugin
+ id="org.eclipse.jetty.proxy"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+
+ <plugin
id="org.eclipse.jetty.rewrite"
download-size="0"
install-size="0"
diff --git a/jetty.bundles.f/pom.xml b/jetty.bundles.f/pom.xml
index f3f5cde..59bf94b 100644
--- a/jetty.bundles.f/pom.xml
+++ b/jetty.bundles.f/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.eclipse.jetty.p2repo</groupId>
<artifactId>jetty-p2repo</artifactId>
- <version>9.0.0-SNAPSHOT</version>
+ <version>9.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jetty.bundles.f</artifactId>
<packaging>eclipse-feature</packaging>
diff --git a/jetty.bundles.repo/pom.xml b/jetty.bundles.repo/pom.xml
index 07bd636..dcf6bb4 100644
--- a/jetty.bundles.repo/pom.xml
+++ b/jetty.bundles.repo/pom.xml
@@ -20,23 +20,11 @@
<parent>
<groupId>org.eclipse.jetty.p2repo</groupId>
<artifactId>jetty-p2repo</artifactId>
- <version>9.0.0-SNAPSHOT</version>
+ <version>9.1.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.jetty.bundles.repo</artifactId>
<!--packaging>eclipse-repository</packaging-->
<packaging>eclipse-update-site</packaging>
- <pluginRepositories>
- <pluginRepository>
- <id>dash-plugins</id>
- <url>http://maven.eclipse.org/nexus/content/groups/public/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
<profiles>
<profile>
<id>packAndSign</id>
diff --git a/jetty.bundles.repo/site.xml b/jetty.bundles.repo/site.xml
index fc06682..54407d4 100644
--- a/jetty.bundles.repo/site.xml
+++ b/jetty.bundles.repo/site.xml
@@ -3,6 +3,6 @@
<description name="Jetty Bundle Repository">
This repository contains the bundles required to use Jetty within an OSGI environment.
</description>
- <feature url="org.eclipse.jetty.bundles.f_9.0.0.qualifier" id="org.eclipse.jetty.bundles.f" version="9.0.0.qualifier"/>
- <feature url="org.eclipse.jetty.bundles.f.source_9.0.0.qualifier" id="org.eclipse.jetty.bundles.f.source" version="9.0.0.qualifier"/>
+ <feature url="org.eclipse.jetty.bundles.f_9.1.0.qualifier" id="org.eclipse.jetty.bundles.f" version="9.1.0.qualifier"/>
+ <feature url="org.eclipse.jetty.bundles.f.source_9.1.0.qualifier" id="org.eclipse.jetty.bundles.f.source" version="9.1.0.qualifier"/>
</site>
diff --git a/pom.xml b/pom.xml
index 08f7f1f..ed77c7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.jetty.p2repo</groupId>
<artifactId>jetty-p2repo</artifactId>
- <version>9.0.0-SNAPSHOT</version>
+ <version>9.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -20,7 +20,7 @@
<tycho-version>0.15.0</tycho-version>
- <jetty-version>9.0.0-SNAPSHOT</jetty-version>
+ <jetty-version>9.1.0-SNAPSHOT</jetty-version>
<jetty-npn-api-version>1.1.0.v20120525</jetty-npn-api-version>
<p2-install-folder-name>development</p2-install-folder-name>
@@ -117,6 +117,11 @@
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jaas</artifactId>
+ <version>${jetty-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jaspi</artifactId>
<version>${jetty-version}</version>
</dependency>
@@ -160,12 +165,12 @@
<artifactId>jetty-policy</artifactId>
<version>${jetty-version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-proxy</artifactId>
<version>${jetty-version}</version>
</dependency>
- -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
@@ -520,10 +525,6 @@
</dependencies>
<repositories>
- <!--repository>
- <id>jetty-staging</id>
- <url>https://oss.sonatype.org/content/repositories/jetty-149/</url>
- </repository-->
<repository>
<id>equinox</id>
<layout>p2</layout>
