Merge branch 'next' of https://github.com/eclipse/ice into next

org.eclipse.ice.archetypes/data-element-archetype/src/main/resources/archetype-resources/pom.xml

@@ -15,7 +15,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse.ice.dev</groupId>
+			<groupId>org.eclipse.ice</groupId>
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
@@ -52,7 +52,7 @@
 								<version>2.16</version>
 							</path>
 							<path>
-								<groupId>org.eclipse.ice.dev</groupId>
+								<groupId>org.eclipse.ice</groupId>
 								<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 								<version>3.0.0-SNAPSHOT</version>
 							</path>

org.eclipse.ice.archetypes/data-element-webform-archetype/src/main/resources/archetype-resources/pom.xml

@@ -64,7 +64,7 @@
 	
 	<dependencies>
 		<dependency>
-			<groupId>org.eclipse.ice.dev</groupId>
+			<groupId>org.eclipse.ice</groupId>
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
@@ -184,7 +184,7 @@
 								<version>2.16</version>
 							</path>
 							<path>
-								<groupId>org.eclipse.ice.dev</groupId>
+								<groupId>org.eclipse.ice</groupId>
 								<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 								<version>3.0.0-SNAPSHOT</version>
 							</path>

org.eclipse.ice.archetypes/target/.gitignore

-/classes/
-/test-classes/

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations.proxytest/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.eclipse.ice.dev</groupId>
+		<groupId>org.eclipse.ice</groupId>
 		<artifactId>org.eclipse.ice.dev</artifactId>
 		<version>3.0.0-SNAPSHOT</version>
 	</parent>
@@ -17,7 +17,7 @@
 					<release>11</release>
 					<annotationProcessorPaths>
 						<path>
-							<groupId>org.eclipse.ice.dev</groupId>
+							<groupId>org.eclipse.ice</groupId>
 							<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 							<version>3.0.0-SNAPSHOT</version>
 						</path>
@@ -76,7 +76,7 @@
 			<version>3.12.2</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.ice.dev</groupId>
+			<groupId>org.eclipse.ice</groupId>
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
@@ -87,4 +87,4 @@
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>

org.eclipse.ice.dev/org.eclipse.ice.dev.annotations/pom.xml

@@ -105,8 +105,8 @@
 	</dependencies>
 
 	<parent>
-		<groupId>org.eclipse.ice.dev</groupId>
+		<groupId>org.eclipse.ice</groupId>
 		<artifactId>org.eclipse.ice.dev</artifactId>
 		<version>3.0.0-SNAPSHOT</version>
 	</parent>
-</project>
\ No newline at end of file
+</project>

org.eclipse.ice.dev/org.eclipse.ice.dev.pojofromjson/pom.xml

@@ -92,7 +92,7 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.ice.dev</groupId>
+			<groupId>org.eclipse.ice</groupId>
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
 		</dependency>

org.eclipse.ice.dev/pom.xml

 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.ice.dev</groupId>
+  <groupId>org.eclipse.ice</groupId>
   <artifactId>org.eclipse.ice.dev</artifactId>
   <version>3.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -10,4 +10,4 @@
   	<module>org.eclipse.ice.dev.annotations.proxytest</module>
   	<module>org.eclipse.ice.dev.pojofromjson</module>
   </modules>
-</project>
\ No newline at end of file
+</project>

org.eclipse.ice.renderer/pom.xml

@@ -21,7 +21,7 @@
 					<release>11</release>
 					<annotationProcessorPaths>
 						<path>
-							<groupId>org.eclipse.ice.dev</groupId>
+							<groupId>org.eclipse.ice</groupId>
 							<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 							<version>3.0.0-SNAPSHOT</version>
 						</path>
@@ -62,7 +62,7 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.ice.dev</groupId>
+			<groupId>org.eclipse.ice</groupId>
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
 			<scope>provided</scope>
@@ -101,4 +101,4 @@
 			<version>3.12.2</version>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>

rse-renderer-client-test/pom.xml

@@ -149,7 +149,7 @@
 			<version>3.0.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
-			<groupId>org.eclipse.ice.dev</groupId>
+			<groupId>org.eclipse.ice</groupId>
 			<artifactId>org.eclipse.ice.dev.annotations</artifactId>
 			<version>3.0.0-SNAPSHOT</version>
 			<scope>provided</scope>