Merge branch '1.3_maintenance'
diff --git a/org.eclipse.epp.mpc-parent/bundle/pom.xml b/org.eclipse.epp.mpc-parent/bundle/pom.xml
index 89382ae..510a35d 100644
--- a/org.eclipse.epp.mpc-parent/bundle/pom.xml
+++ b/org.eclipse.epp.mpc-parent/bundle/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/org.eclipse.epp.mpc-parent/feature/pom.xml b/org.eclipse.epp.mpc-parent/feature/pom.xml
index 5e51343..40b3257 100644
--- a/org.eclipse.epp.mpc-parent/feature/pom.xml
+++ b/org.eclipse.epp.mpc-parent/feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/org.eclipse.epp.mpc-parent/pom.xml b/org.eclipse.epp.mpc-parent/pom.xml
index 7915d60..696c5b7 100644
--- a/org.eclipse.epp.mpc-parent/pom.xml
+++ b/org.eclipse.epp.mpc-parent/pom.xml
@@ -9,12 +9,12 @@
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<mpc-version>${project.version}</mpc-version>
- <target-platform>luna</target-platform>
+ <target-platform>staging</target-platform>
<java-version>1.5</java-version>
<java-jdk>SYSTEM</java-jdk>
@@ -89,9 +89,9 @@
<profiles>
<!-- target platform profiles -->
<profile>
- <id>kepler</id>
+ <id>mars</id>
<properties>
- <target-platform>kepler</target-platform>
+ <target-platform>mars</target-platform>
</properties>
</profile>
<profile>
@@ -102,12 +102,15 @@
</profile>
<profile>
<id>luna</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
+ <properties>
+ <target-platform>luna</target-platform>
+ </properties>
</profile>
<profile>
<id>staging</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
<target-platform>staging</target-platform>
</properties>
diff --git a/org.eclipse.epp.mpc-target/mars.target b/org.eclipse.epp.mpc-target/mars.target
index 2b04a76..26ab10e 100644
--- a/org.eclipse.epp.mpc-target/mars.target
+++ b/org.eclipse.epp.mpc-target/mars.target
@@ -10,9 +10,9 @@
<repository location="http://download.eclipse.org/releases/mars"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20140917154621/repository/"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.3.6.v201411290715"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.3.3.v201411290715"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20141129202728/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.epp.mpc-target/pom.xml b/org.eclipse.epp.mpc-target/pom.xml
index 8e25d65..bf66e97 100644
--- a/org.eclipse.epp.mpc-target/pom.xml
+++ b/org.eclipse.epp.mpc-target/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc-target</artifactId>
@@ -30,9 +30,9 @@
<classifier>luna</classifier>
</artifact>
<artifact>
- <file>kepler.target</file>
+ <file>mars.target</file>
<type>target</type>
- <classifier>kepler</classifier>
+ <classifier>mars</classifier>
</artifact>
<artifact>
<file>staging.target</file>
diff --git a/org.eclipse.epp.mpc-target/staging.target b/org.eclipse.epp.mpc-target/staging.target
index 492d933..6fcedff 100644
--- a/org.eclipse.epp.mpc-target/staging.target
+++ b/org.eclipse.epp.mpc-target/staging.target
@@ -10,9 +10,9 @@
<repository location="http://download.eclipse.org/releases/staging"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/>
-<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20140917154621/repository/"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.3.6.v201411290715"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.3.3.v201411290715"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20141129202728/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
diff --git a/org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
index bfa8b46..5dab441 100644
--- a/org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.epp.mpc.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.core;singleton:=true
-Bundle-Version: 1.3.2.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
diff --git a/org.eclipse.epp.mpc.core/pom.xml b/org.eclipse.epp.mpc.core/pom.xml
index 47acae4..a37f138 100644
--- a/org.eclipse.epp.mpc.core/pom.xml
+++ b/org.eclipse.epp.mpc.core/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.core</artifactId>
diff --git a/org.eclipse.epp.mpc.feature/feature.xml b/org.eclipse.epp.mpc.feature/feature.xml
index d25bd39..86809f9 100644
--- a/org.eclipse.epp.mpc.feature/feature.xml
+++ b/org.eclipse.epp.mpc.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.epp.mpc"
label="%featureName"
- version="1.3.2.qualifier"
+ version="1.4.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.epp.mpc.ui"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.epp.mpc.feature/pom.xml b/org.eclipse.epp.mpc.feature/pom.xml
index a063596..037ac3a 100644
--- a/org.eclipse.epp.mpc.feature/pom.xml
+++ b/org.eclipse.epp.mpc.feature/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-feature</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/feature</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc</artifactId>
diff --git a/org.eclipse.epp.mpc.help.ui/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.help.ui/META-INF/MANIFEST.MF
index 03971d6..07d2d67 100644
--- a/org.eclipse.epp.mpc.help.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.epp.mpc.help.ui/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.help.ui;singleton:=true
-Bundle-Version: 1.3.2.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.help;bundle-version="3.5.0"
diff --git a/org.eclipse.epp.mpc.help.ui/pom.xml b/org.eclipse.epp.mpc.help.ui/pom.xml
index 6bf153b..8607cc3 100644
--- a/org.eclipse.epp.mpc.help.ui/pom.xml
+++ b/org.eclipse.epp.mpc.help.ui/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.help.ui</artifactId>
diff --git a/org.eclipse.epp.mpc.site/pom.xml b/org.eclipse.epp.mpc.site/pom.xml
index 5171646..2aadada 100644
--- a/org.eclipse.epp.mpc.site/pom.xml
+++ b/org.eclipse.epp.mpc.site/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.site</artifactId>
diff --git a/org.eclipse.epp.mpc.tests.catalog/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.tests.catalog/META-INF/MANIFEST.MF
index b2c5de1..fc3bf27 100644
--- a/org.eclipse.epp.mpc.tests.catalog/META-INF/MANIFEST.MF
+++ b/org.eclipse.epp.mpc.tests.catalog/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: Marketplace Client Test Catalog
Bundle-SymbolicName: org.eclipse.epp.mpc.tests.catalog;singleton:=true
-Bundle-Version: 1.3.2.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: Eclipse Marketplace Client
Require-Bundle: org.eclipse.epp.mpc.ui;bundle-version="1.0.0"
diff --git a/org.eclipse.epp.mpc.tests.catalog/pom.xml b/org.eclipse.epp.mpc.tests.catalog/pom.xml
index f970631..579ae8b 100644
--- a/org.eclipse.epp.mpc.tests.catalog/pom.xml
+++ b/org.eclipse.epp.mpc.tests.catalog/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.tests.catalog</artifactId>
diff --git a/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF
index c795c32..f6a497b 100644
--- a/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.epp.mpc.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Marketplace Client Tests
Bundle-SymbolicName: org.eclipse.epp.mpc.tests
-Bundle-Version: 1.3.2.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: Eclipse Marketplace Client
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0",
diff --git a/org.eclipse.epp.mpc.tests/pom.xml b/org.eclipse.epp.mpc.tests/pom.xml
index 6473058..1ed9a1f 100644
--- a/org.eclipse.epp.mpc.tests/pom.xml
+++ b/org.eclipse.epp.mpc.tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.tests</artifactId>
diff --git a/org.eclipse.epp.mpc.ui/META-INF/MANIFEST.MF b/org.eclipse.epp.mpc.ui/META-INF/MANIFEST.MF
index be79c59..984c1c7 100644
--- a/org.eclipse.epp.mpc.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.epp.mpc.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.epp.mpc.ui;singleton:=true
-Bundle-Version: 1.3.2.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
diff --git a/org.eclipse.epp.mpc.ui/pom.xml b/org.eclipse.epp.mpc.ui/pom.xml
index f2f385d..8cc57af 100644
--- a/org.eclipse.epp.mpc.ui/pom.xml
+++ b/org.eclipse.epp.mpc.ui/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.epp.mpc</groupId>
<artifactId>org.eclipse.epp.mpc-bundle</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>../org.eclipse.epp.mpc-parent/bundle</relativePath>
</parent>
<artifactId>org.eclipse.epp.mpc.ui</artifactId>
diff --git a/pom.xml b/pom.xml
index b7941b5..263e110 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.epp.mpc-parent</artifactId>
<groupId>org.eclipse.epp.mpc</groupId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath>org.eclipse.epp.mpc-parent</relativePath>
</parent>
