Merge tag '2.2.1' into next

Signed-off-by: Jay Jay Billings <billingsjj@ornl.gov>
eclipse · May 31, 2017 · 430d154 · 430d154
2 parents 62513ec + b26399e
commit 430d154
Show file tree

Hide file tree

Showing 107 changed files with 361 additions and 356 deletions.
diff --git a/org.eclipse.ice.aggregator.swtbot/pom.xml b/org.eclipse.ice.aggregator.swtbot/pom.xml
@@ -7,7 +7,7 @@
   <description>Aggregator Bundle for running the SWTBot UI tests for Eclipse ICE</description>
   <parent>
   	<groupId>org.eclipse.ice</groupId>
-  	<artifactId>org.eclipse.ice.build</artifactId>
+  	<artifactId>org.eclipse.ice.parent</artifactId>
   	<version>2.2.0-SNAPSHOT</version>
   	<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
   </parent>

diff --git a/org.eclipse.ice.aggregator/pom.xml b/org.eclipse.ice.aggregator/pom.xml
@@ -7,11 +7,12 @@
   <description>Aggregator Bundle for building Eclipse ICE</description>
   <parent>
   	<groupId>org.eclipse.ice</groupId>
-  	<artifactId>org.eclipse.ice.build</artifactId>
-  	<version>2.2.0-SNAPSHOT</version>
+  	<artifactId>org.eclipse.ice.parent</artifactId>
+  	<version>2.2.1-SNAPSHOT</version>
   	<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
   </parent>
   <modules>
+  	<module>../org.eclipse.ice.parent</module>
   	<module>../org.eclipse.ice.caebat.batml</module>
   	<module>../org.eclipse.ice.tests.caebat.batml</module>
   	<module>../org.eclipse.ice.client</module>
@@ -42,7 +43,6 @@
   	<module>../org.eclipse.ice.tests.mesh</module>
   	<module>../org.eclipse.ice.nek5000</module>
   	<module>../org.eclipse.ice.tests.nek5000</module>
-  	<module>../org.eclipse.ice.parent</module>
   	<module>../org.eclipse.ice.persistence.xml</module>
   	<module>../org.eclipse.ice.tests.persistence.xml</module>
   	<module>../org.eclipse.ice.projectgeneration</module>
@@ -61,4 +61,4 @@
   	<module>../org.eclipse.ice.repository</module>    	
   	<module>../org.eclipse.ice.product</module>  		  	
   </modules>
-</project>
+</project>
diff --git a/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF b/org.eclipse.ice.caebat.batml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BatteryML
 Bundle-SymbolicName: org.eclipse.ice.caebat.batml;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Service-Component: OSGI-INF/xsdcomponent.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.eclipse.core.filesystem,

diff --git a/org.eclipse.ice.caebat.batml/pom.xml b/org.eclipse.ice.caebat.batml/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.caebat.batml</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF b/org.eclipse.ice.client.compatibility/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICE Compability Bundle for Eclipse RCP/RAP
 Bundle-SymbolicName: org.eclipse.ice.client.compatibility
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.eclipse.jface.action,
  org.eclipse.jface.databinding.swt,

diff --git a/org.eclipse.ice.client.compatibility/pom.xml b/org.eclipse.ice.client.compatibility/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF b/org.eclipse.ice.client.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICE
 Bundle-SymbolicName: org.eclipse.ice.client.rcp;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: com.sun.jersey.api.client,
  com.sun.jersey.api.client.filter,

diff --git a/org.eclipse.ice.client.rcp/pom.xml b/org.eclipse.ice.client.rcp/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF b/org.eclipse.ice.client.widgets.moose/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICE Moose Widgets
 Bundle-SymbolicName: org.eclipse.ice.client.widgets.moose;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Import-Package: org.apache.commons.io,
  org.eclipse.cdt.core.model,

diff --git a/org.eclipse.ice.client.widgets.moose/pom.xml b/org.eclipse.ice.client.widgets.moose/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF b/org.eclipse.ice.client.widgets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICEEclipseWidgets
 Bundle-SymbolicName: org.eclipse.ice.client.widgets;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ice.datastructures,
  org.eclipse.ice.client.compatibility,

diff --git a/org.eclipse.ice.client.widgets/pom.xml b/org.eclipse.ice.client.widgets/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/org.eclipse.ice.client/META-INF/MANIFEST.MF b/org.eclipse.ice.client/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Client
 Bundle-SymbolicName: org.eclipse.ice.client;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.ice.client.common,
  org.eclipse.ice.client.common.internal,

diff --git a/org.eclipse.ice.client/pom.xml b/org.eclipse.ice.client/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/org.eclipse.ice.core/META-INF/MANIFEST.MF b/org.eclipse.ice.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Core
 Bundle-SymbolicName: org.eclipse.ice.core;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: org.eclipse.ice.core.iCore,
  org.eclipse.ice.core.launcher

diff --git a/org.eclipse.ice.core/pom.xml b/org.eclipse.ice.core/pom.xml
@@ -5,8 +5,8 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>

diff --git a/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF b/org.eclipse.ice.datastructures/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICEDataStructures
 Bundle-SymbolicName: org.eclipse.ice.datastructures;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Service-Component: OSGI-INF/*.xml
 Meta-Persistence: META-INF/persistence.xml

diff --git a/org.eclipse.ice.datastructures/pom.xml b/org.eclipse.ice.datastructures/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.datastructures</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF b/org.eclipse.ice.developer.moose/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: MOOSE Developer
 Bundle-SymbolicName: org.eclipse.ice.developer.moose;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-Vendor: Oak Ridge National Laboratory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: org.eclipse.cdt.core.settings.model,

diff --git a/org.eclipse.ice.developer.moose/pom.xml b/org.eclipse.ice.developer.moose/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.developer.moose</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.ice.developer/META-INF/MANIFEST.MF b/org.eclipse.ice.developer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ICE Developer
 Bundle-SymbolicName: org.eclipse.ice.developer;singleton:=true
-Bundle-Version: 2.2.0.qualifier
+Bundle-Version: 2.2.1.qualifier
 Bundle-Vendor: Oak Ridge National Laboratory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.11.0",

diff --git a/org.eclipse.ice.developer/pom.xml b/org.eclipse.ice.developer/pom.xml
@@ -5,12 +5,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.eclipse.ice</groupId>
-		<artifactId>org.eclipse.ice.build</artifactId>
-		<version>2.2.0-SNAPSHOT</version>
+		<artifactId>org.eclipse.ice.parent</artifactId>
+		<version>2.2.1-SNAPSHOT</version>
 		<relativePath>../org.eclipse.ice.parent/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.ice</groupId>
 	<artifactId>org.eclipse.ice.developer</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
+	<version>2.2.1-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>