Bump version number to 1.6.0
diff --git a/features/org.eclipse.amalgam.discovery-feature/feature.xml b/features/org.eclipse.amalgam.discovery-feature/feature.xml
index 2acfd6d..af054d3 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.5.0.qualifier"
+ version="1.6.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 a338210..fe89abf 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.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.amalgam.releng</relativePath>
</parent>
<groupId>org.eclipse.amalgam</groupId>
<artifactId>org.eclipse.amalgam.discovery</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
diff --git a/features/org.eclipse.amalgam.update/pom.xml b/features/org.eclipse.amalgam.update/pom.xml
index b0869ae..53ed992 100644
--- a/features/org.eclipse.amalgam.update/pom.xml
+++ b/features/org.eclipse.amalgam.update/pom.xml
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.amalgam</groupId>
- <artifactId>org.eclipse.amalgam.releng</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.amalgam.releng</relativePath>
- </parent>
- <groupId>org.eclipse.amalgam</groupId>
- <artifactId>org.eclipse.amalgam.update</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <packaging>eclipse-repository</packaging>
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-repository-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <createArtifactRepository>true</createArtifactRepository>
- <finalName>${project.artifactId}</finalName>
- <compress>true</compress>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/repository</outputDirectory>
- <resources>
- <resource>
- <directory>.</directory>
- <includes>
- <include>index.html</include>
- <include>web/*</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.amalgam</groupId>
+ <artifactId>org.eclipse.amalgam.releng</artifactId>
+ <version>1.6.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>
+ <packaging>eclipse-repository</packaging>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <createArtifactRepository>true</createArtifactRepository>
+ <finalName>${project.artifactId}</finalName>
+ <compress>true</compress>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/repository</outputDirectory>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>index.html</include>
+ <include>web/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
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 f61b70a..1b40dfe 100644
--- a/plugins/org.eclipse.amalgam.discovery.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.amalgam.discovery.core/META-INF/MANIFEST.MF
@@ -2,15 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.amalgam.discovery.core;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.6.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.amalgam.discovery,
- org.eclipse.amalgam.discovery.core,
- org.eclipse.amalgam.discovery.impl,
- org.eclipse.amalgam.discovery.util
+Export-Package: org.eclipse.amalgam.discovery,org.eclipse.amalgam.disc
+ overy.core,org.eclipse.amalgam.discovery.impl,org.eclipse.amalgam.dis
+ covery.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi,
diff --git a/plugins/org.eclipse.amalgam.discovery.core/pom.xml b/plugins/org.eclipse.amalgam.discovery.core/pom.xml
index db74f13..77542ff 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.5.0-SNAPSHOT</version>
+ <version>1.6.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.5.0-SNAPSHOT</version>
+ <version>1.6.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 39caebb..656457b 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.5.0.qualifier
+Bundle-Version: 1.6.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 46af1a6..62d96dd 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.5.0-SNAPSHOT</version>
+ <version>1.6.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.5.0-SNAPSHOT</version>
+ <version>1.6.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 c319f99..c4ad7ab 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.5.0.qualifier
+Bundle-Version: 1.6.0.qualifier
Bundle-Activator: org.eclipse.amalgam.discovery.modeling.Activator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.core.runtime,
@@ -11,5 +11,5 @@
org.eclipse.core.net;bundle-version="1.2.200"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.amalgam.discovery.modeling;x-internal:=true,
- org.eclipse.amalgam.discovery.modeling.handlers;x-internal:=true
+Export-Package: org.eclipse.amalgam.discovery.modeling;x-internal:=tru
+ e,org.eclipse.amalgam.discovery.modeling.handlers;x-internal:=true
diff --git a/plugins/org.eclipse.amalgam.discovery.modeling/pom.xml b/plugins/org.eclipse.amalgam.discovery.modeling/pom.xml
index 663f288..aac79d2 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.5.0-SNAPSHOT</version>
+ <version>1.6.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.5.0-SNAPSHOT</version>
+ <version>1.6.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 9e71a0c..fea64ef 100644
--- a/plugins/org.eclipse.amalgam.discovery.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.amalgam.discovery.ui/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.amalgam.discovery.ui;singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.6.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.amalgam.discovery.DiscoveryUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.amalgam.discovery.ui.common.internal;x-internal:=true,
- org.eclipse.amalgam.discovery.ui.viewer,
- org.eclipse.amalgam.discovery.ui.viewer.internal;x-internal:=true,
- org.eclipse.amalgam.discovery.ui.wizards
+Export-Package: org.eclipse.amalgam.discovery.ui.common.internal;x-int
+ ernal:=true,org.eclipse.amalgam.discovery.ui.viewer,org.eclipse.amalg
+ am.discovery.ui.viewer.internal;x-internal:=true,org.eclipse.amalgam.
+ discovery.ui.wizards
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;visibility:=reexport,
org.eclipse.amalgam.discovery.core;visibility:=reexport,
diff --git a/plugins/org.eclipse.amalgam.discovery.ui/pom.xml b/plugins/org.eclipse.amalgam.discovery.ui/pom.xml
index 51817e7..e2540fa 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.5.0-SNAPSHOT</version>
+ <version>1.6.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.5.0-SNAPSHOT</version>
+ <version>1.6.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 83c24ad..7c52e76 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.5.0-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
diff --git a/tests/org.eclipse.amalgam.pak.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.amalgam.pak.tests/META-INF/MANIFEST.MF
index 81d6143..b5a71ed 100644
--- a/tests/org.eclipse.amalgam.pak.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.amalgam.pak.tests/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit,
org.eclipse.emf.ecore;bundle-version="2.3.0",
- org.eclipse.core.runtime;bundle-version="3.9.0"
+ org.eclipse.core.runtime;bundle-version="3.8.0"
