Bump version to 1.7.0 and build on top of Mars
diff --git a/features/org.eclipse.amalgam.discovery-feature/feature.xml b/features/org.eclipse.amalgam.discovery-feature/feature.xml
index af054d3..5e1e1d3 100644
--- a/features/org.eclipse.amalgam.discovery-feature/feature.xml
+++ b/features/org.eclipse.amalgam.discovery-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.amalgam.discovery"
label="Extra Modeling Components Installer"
- version="1.6.0.qualifier"
+ version="1.7.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.amalgam.discovery-feature/pom.xml b/features/org.eclipse.amalgam.discovery-feature/pom.xml
index fe89abf..5beb542 100644
--- a/features/org.eclipse.amalgam.discovery-feature/pom.xml
+++ b/features/org.eclipse.amalgam.discovery-feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.amalgam.releng</relativePath>
</parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.discovery</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.amalgam.update/category.xml b/features/org.eclipse.amalgam.update/category.xml
index d024609..eb791dd 100644
--- a/features/org.eclipse.amalgam.update/category.xml
+++ b/features/org.eclipse.amalgam.update/category.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature id="org.eclipse.amalgam.discovery" version="1.6.0.qualifier">
+ <feature id="org.eclipse.amalgam.discovery" version="1.7.0.qualifier">
<category name="amalgam"/>
</feature>
<category-def name="amalgam" label="Modeling Amalgamation">
diff --git a/features/org.eclipse.amalgam.update/pom.xml b/features/org.eclipse.amalgam.update/pom.xml
index 53ed992..fc765d1 100644
--- a/features/org.eclipse.amalgam.update/pom.xml
+++ b/features/org.eclipse.amalgam.update/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.amalgam.releng</relativePath>
</parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.update</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
diff --git a/plugins/org.eclipse.amalgam.discovery.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.amalgam.discovery.core/META-INF/MANIFEST.MF
index 1b40dfe..0d09647 100644
--- a/plugins/org.eclipse.amalgam.discovery.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.amalgam.discovery.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.amalgam.discovery.core;singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.amalgam.discovery.core/pom.xml b/plugins/org.eclipse.amalgam.discovery.core/pom.xml
index 77542ff..e4fc3b6 100644
--- a/plugins/org.eclipse.amalgam.discovery.core/pom.xml
+++ b/plugins/org.eclipse.amalgam.discovery.core/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.amalgam.releng</relativePath>
</parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.discovery.core</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
diff --git a/plugins/org.eclipse.amalgam.discovery.modeling.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.amalgam.discovery.modeling.tests/META-INF/MANIFEST.MF
index 656457b..5bf1d78 100644
--- a/plugins/org.eclipse.amalgam.discovery.modeling.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.amalgam.discovery.modeling.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Amalgam Modeling Discovery UI
Bundle-SymbolicName: org.eclipse.amalgam.discovery.modeling.tests;singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.7.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
diff --git a/plugins/org.eclipse.amalgam.discovery.modeling.tests/pom.xml b/plugins/org.eclipse.amalgam.discovery.modeling.tests/pom.xml
index 62d96dd..68b110f 100644
--- a/plugins/org.eclipse.amalgam.discovery.modeling.tests/pom.xml
+++ b/plugins/org.eclipse.amalgam.discovery.modeling.tests/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.amalgam.releng</relativePath>
</parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.discovery.modeling.tests</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/plugins/org.eclipse.amalgam.discovery.modeling/META-INF/MANIFEST.MF b/plugins/org.eclipse.amalgam.discovery.modeling/META-INF/MANIFEST.MF
index c4ad7ab..c2e8183 100644
--- a/plugins/org.eclipse.amalgam.discovery.modeling/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.amalgam.discovery.modeling/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Amalgam Modeling Discovery UI
Bundle-SymbolicName: org.eclipse.amalgam.discovery.modeling;singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.7.0.qualifier
Bundle-Activator: org.eclipse.amalgam.discovery.modeling.Activator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.amalgam.discovery.modeling/pom.xml b/plugins/org.eclipse.amalgam.discovery.modeling/pom.xml
index aac79d2..3bde951 100644
--- a/plugins/org.eclipse.amalgam.discovery.modeling/pom.xml
+++ b/plugins/org.eclipse.amalgam.discovery.modeling/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.amalgam.releng</relativePath>
</parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.discovery.modeling</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
diff --git a/plugins/org.eclipse.amalgam.discovery.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.amalgam.discovery.ui/META-INF/MANIFEST.MF
index fea64ef..60054d7 100644
--- a/plugins/org.eclipse.amalgam.discovery.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.amalgam.discovery.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.amalgam.discovery.ui;singleton:=true
-Bundle-Version: 1.6.0.qualifier
+Bundle-Version: 1.7.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.amalgam.discovery.DiscoveryUIPlugin
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.amalgam.discovery.ui/pom.xml b/plugins/org.eclipse.amalgam.discovery.ui/pom.xml
index e2540fa..dd7d13d 100644
--- a/plugins/org.eclipse.amalgam.discovery.ui/pom.xml
+++ b/plugins/org.eclipse.amalgam.discovery.ui/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.amalgam.releng</relativePath>
</parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.discovery.ui</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
diff --git a/releng/org.eclipse.amalgam.releng/pom.xml b/releng/org.eclipse.amalgam.releng/pom.xml
index d27e893..631675a 100644
--- a/releng/org.eclipse.amalgam.releng/pom.xml
+++ b/releng/org.eclipse.amalgam.releng/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.6.0-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
@@ -37,7 +37,7 @@
</licenses>
<properties>
- <tycho-version>0.20.0</tycho-version>
+ <tycho-version>0.21.0</tycho-version>
</properties>
@@ -75,8 +75,8 @@
<artifact>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.6.0-SNAPSHOT</version>
- <classifier>target_platforms/luna</classifier>
+ <version>1.7.0-SNAPSHOT</version>
+ <classifier>target_platforms/mars</classifier>
</artifact>
</target>
<environments>
@@ -272,7 +272,7 @@
<plugin>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pack200b-plugin</artifactId>
- <version>0.18.1</version>
+ <version>${tycho-version}</version>
<executions>
<execution>
<id>pack200-pack</id>
diff --git a/releng/org.eclipse.amalgam.releng/target_platforms/mars.target b/releng/org.eclipse.amalgam.releng/target_platforms/mars.target
new file mode 100644
index 0000000..6ffde27
--- /dev/null
+++ b/releng/org.eclipse.amalgam.releng/target_platforms/mars.target
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde?>
+<!-- generated with https://github.com/mbarbero/fr.obeo.releng.targetplatform -->
+<target name="mars" sequenceNumber="1435909851">
+ <locations>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.11.0.v20150601-0402"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.5.0.v20150603-2358"/>
+ <unit id="org.junit" version="4.12.0.v201504281640"/>
+ <repository location="http://download.eclipse.org/releases/mars"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+ <repository location="http://download.eclipse.org/cbi/updates/license"/>
+ </location>
+ </locations>
+</target>
diff --git a/releng/org.eclipse.amalgam.releng/target_platforms/mars.targetplatform b/releng/org.eclipse.amalgam.releng/target_platforms/mars.targetplatform
new file mode 100644
index 0000000..837bc43
--- /dev/null
+++ b/releng/org.eclipse.amalgam.releng/target_platforms/mars.targetplatform
@@ -0,0 +1,12 @@
+target "mars"
+
+with source, requirements
+location "http://download.eclipse.org/releases/mars" {
+ org.eclipse.emf.sdk.feature.group
+ org.eclipse.platform.feature.group
+ org.junit
+}
+
+location "http://download.eclipse.org/cbi/updates/license" {
+ org.eclipse.license.feature.group
+}
\ No newline at end of file
