diff --git a/analytics/math3/pom.xml b/analytics/math3/pom.xml
index 552772c..badf730 100644
--- a/analytics/math3/pom.xml
+++ b/analytics/math3/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-analytics</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics-math3</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Math3</name>
+  <name>Apache Edgent (Java 8): Analytics: Math3</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -47,22 +47,22 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/analytics/pom.xml b/analytics/pom.xml
index 58c35f1..9fa5362 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics</name>
+  <name>Apache Edgent (Java 8): Analytics</name>
 
   <modules>
     <module>sensors</module>
diff --git a/analytics/sensors/pom.xml b/analytics/sensors/pom.xml
index 3707220..bf38ee0 100644
--- a/analytics/sensors/pom.xml
+++ b/analytics/sensors/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-analytics</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics-sensors</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Sensors</name>
+  <name>Apache Edgent (Java 8): Analytics: Sensors</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,28 +36,28 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/api/execution/pom.xml b/api/execution/pom.xml
index 74b27b0..f1009b5 100644
--- a/api/execution/pom.xml
+++ b/api/execution/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-execution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Execution</name>
+  <name>Apache Edgent (Java 8): API: Execution</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/api/function/pom.xml b/api/function/pom.xml
index 366bc3c..143e628 100644
--- a/api/function/pom.xml
+++ b/api/function/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-function</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Function</name>
+  <name>Apache Edgent (Java 8): API: Function</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
diff --git a/api/graph/pom.xml b/api/graph/pom.xml
index 3956fe5..7ed9fee 100644
--- a/api/graph/pom.xml
+++ b/api/graph/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Graph</name>
+  <name>Apache Edgent (Java 8): API: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/api/oplet/pom.xml b/api/oplet/pom.xml
index 08e48e8..a1b4da8 100644
--- a/api/oplet/pom.xml
+++ b/api/oplet/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-oplet</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Oplet</name>
+  <name>Apache Edgent (Java 8): API: Oplet</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,19 +36,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-window</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/api/pom.xml b/api/pom.xml
index 06517fe..de121ca 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API</name>
+  <name>Apache Edgent (Java 8): API</name>
 
   <modules>
     <module>execution</module>
diff --git a/api/topology/pom.xml b/api/topology/pom.xml
index eec89ee..7daa195 100644
--- a/api/topology/pom.xml
+++ b/api/topology/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Topology</name>
+  <name>Apache Edgent (Java 8): API: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,24 +36,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/api/window/pom.xml b/api/window/pom.xml
index f68ab67..b37b244 100644
--- a/api/window/pom.xml
+++ b/api/window/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-window</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Window</name>
+  <name>Apache Edgent (Java 8): API: Window</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/apps/iot/pom.xml b/apps/iot/pom.xml
index c921cb7..006cfb6 100644
--- a/apps/iot/pom.xml
+++ b/apps/iot/pom.xml
@@ -23,34 +23,34 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-apps</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: IoT</name>
+  <name>Apache Edgent (Java 8): Apps: IoT</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/apps/pom.xml b/apps/pom.xml
index 2319fa1..ca57997 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps</name>
+  <name>Apache Edgent (Java 8): Apps</name>
 
   <modules>
     <module>iot</module>
diff --git a/apps/runtime/pom.xml b/apps/runtime/pom.xml
index 001bfa6..9bc6d40 100644
--- a/apps/runtime/pom.xml
+++ b/apps/runtime/pom.xml
@@ -23,35 +23,35 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-apps</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps-runtime</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: Runtime</name>
+  <name>Apache Edgent (Java 8): Apps: Runtime</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/connectors/command/pom.xml b/connectors/command/pom.xml
index cf3ea4c..f8a1505 100644
--- a/connectors/command/pom.xml
+++ b/connectors/command/pom.xml
@@ -23,49 +23,49 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-command</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Command</name>
+  <name>Apache Edgent (Java 8): Connectors: Command</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/connectors/common/pom.xml b/connectors/common/pom.xml
index aaa96e0..ab576f3 100644
--- a/connectors/common/pom.xml
+++ b/connectors/common/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-common</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Common</name>
+  <name>Apache Edgent (Java 8): Connectors: Common</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,28 +36,28 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/connectors/csv/pom.xml b/connectors/csv/pom.xml
index ce620d4..cddee56 100644
--- a/connectors/csv/pom.xml
+++ b/connectors/csv/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-csv</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: CSV</name>
+  <name>Apache Edgent (Java 8): Connectors: CSV</name>
 
   <dependencies>
     <dependency>
@@ -38,22 +38,22 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
diff --git a/connectors/file/pom.xml b/connectors/file/pom.xml
index bf5d065..fc7f1a5 100644
--- a/connectors/file/pom.xml
+++ b/connectors/file/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-file</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: File</name>
+  <name>Apache Edgent (Java 8): Connectors: File</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,45 +36,45 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/connectors/http/pom.xml b/connectors/http/pom.xml
index 4866693..e9ffaa2 100644
--- a/connectors/http/pom.xml
+++ b/connectors/http/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-http</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: HTTP</name>
+  <name>Apache Edgent (Java 8): Connectors: HTTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -52,15 +52,15 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/connectors/iot/pom.xml b/connectors/iot/pom.xml
index fee160f..acc06d8 100644
--- a/connectors/iot/pom.xml
+++ b/connectors/iot/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoT</name>
+  <name>Apache Edgent (Java 8): Connectors: IoT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,14 +36,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/connectors/iotp/pom.xml b/connectors/iotp/pom.xml
index 5813c90..8bd6297 100644
--- a/connectors/iotp/pom.xml
+++ b/connectors/iotp/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-iotp</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoTP</name>
+  <name>Apache Edgent (Java 8): Connectors: IoTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,19 +36,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.messaging</groupId>
diff --git a/connectors/jdbc/pom.xml b/connectors/jdbc/pom.xml
index cdd2cf6..8430a86 100644
--- a/connectors/jdbc/pom.xml
+++ b/connectors/jdbc/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-jdbc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: JDBC</name>
+  <name>Apache Edgent (Java 8): Connectors: JDBC</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -62,40 +62,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/connectors/kafka/pom.xml b/connectors/kafka/pom.xml
index 9f7bd27..22bd524 100644
--- a/connectors/kafka/pom.xml
+++ b/connectors/kafka/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-kafka</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Kafka</name>
+  <name>Apache Edgent (Java 8): Connectors: Kafka</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -49,9 +49,9 @@
    -->
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
@@ -132,29 +132,29 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index 2af1c89..5b521ab 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-mqtt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: MQTT</name>
+  <name>Apache Edgent (Java 8): Connectors: MQTT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -65,19 +65,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.paho</groupId>
@@ -86,29 +86,29 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 32197e5..7bf1b74 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors</name>
+  <name>Apache Edgent (Java 8): Connectors</name>
 
   <modules>
     <module>command</module>
diff --git a/connectors/pubsub/pom.xml b/connectors/pubsub/pom.xml
index 138c562..668edb8 100644
--- a/connectors/pubsub/pom.xml
+++ b/connectors/pubsub/pom.xml
@@ -23,24 +23,24 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-pubsub</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: PubSub</name>
+  <name>Apache Edgent (Java 8): Connectors: PubSub</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/connectors/serial/pom.xml b/connectors/serial/pom.xml
index 2e0b0fc..b2bd5d4 100644
--- a/connectors/serial/pom.xml
+++ b/connectors/serial/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-serial</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Serial</name>
+  <name>Apache Edgent (Java 8): Connectors: Serial</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/connectors/websocket-base/pom.xml b/connectors/websocket-base/pom.xml
index 3e1b0a8..14e1435 100644
--- a/connectors/websocket-base/pom.xml
+++ b/connectors/websocket-base/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-base</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Base</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket: Base</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/connectors/websocket-jetty/pom.xml b/connectors/websocket-jetty/pom.xml
index 6bffee3..f570f31 100644
--- a/connectors/websocket-jetty/pom.xml
+++ b/connectors/websocket-jetty/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-jetty</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Jetty</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket: Jetty</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
diff --git a/connectors/websocket-misc/pom.xml b/connectors/websocket-misc/pom.xml
index bf3ff91..dd56b4d 100644
--- a/connectors/websocket-misc/pom.xml
+++ b/connectors/websocket-misc/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-misc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Misc</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket: Misc</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
diff --git a/connectors/websocket-server/pom.xml b/connectors/websocket-server/pom.xml
index e529418..3411b04 100644
--- a/connectors/websocket-server/pom.xml
+++ b/connectors/websocket-server/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Server</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket: Server</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
diff --git a/connectors/websocket/pom.xml b/connectors/websocket/pom.xml
index fb8eb3f..4a12c2d 100644
--- a/connectors/websocket/pom.xml
+++ b/connectors/websocket/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket</name>
+  <name>Apache Edgent (Java 8): Connectors: Websocket</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,19 +36,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.websocket</groupId>
@@ -81,36 +81,36 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/console/pom.xml b/console/pom.xml
index 2b79fc0..ea7f134 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-console</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console</name>
+  <name>Apache Edgent (Java 8): Console</name>
 
   <modules>
     <module>server</module>
diff --git a/console/server/pom.xml b/console/server/pom.xml
index fbd0c53..8c664f6 100644
--- a/console/server/pom.xml
+++ b/console/server/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-console</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-console-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console: Server</name>
+  <name>Apache Edgent (Java 8): Console: Server</name>
 
   <build>
     <resources>
@@ -72,7 +72,7 @@
                -->
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>edgent-console-servlets</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
@@ -141,9 +141,9 @@
         prior to this module.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-console-servlets</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>war</type>
       <optional>true</optional>
     </dependency>
diff --git a/console/servlets/pom.xml b/console/servlets/pom.xml
index 50f14ba..afcbba2 100644
--- a/console/servlets/pom.xml
+++ b/console/servlets/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-console</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-console-servlets</artifactId>
   <packaging>war</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console: Servlets</name>
+  <name>Apache Edgent (Java 8): Console: Servlets</name>
 
   <build>
     <!-- Add the directory where all the external resources were unpacked to the build -->
@@ -162,9 +162,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a60e332..4a52eb2 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -25,12 +25,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-distribution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+  <name>Apache Edgent (Java 8): Distribution</name>
 
   <build>
     <plugins>
@@ -78,115 +78,115 @@
 
     <!-- Providers -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-development</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-command</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-file</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-http</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Include console-servlets.war to enable a user to run
@@ -196,9 +196,9 @@
          of the development provider.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-console-servlets</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
   </dependencies>
diff --git a/jqassistant/structural-rules.xml b/jqassistant/structural-rules.xml
new file mode 100644
index 0000000..f608f73
--- /dev/null
+++ b/jqassistant/structural-rules.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+<jqa:jqassistant-rules xmlns:jqa="http://www.buschmais.com/jqassistant/core/analysis/rules/schema/v1.0">
+
+  <constraint id="structural-rules:dependency-groupid-matches-artifact-groupid">
+    <description>The groupId of every Edgent dependency must match the groupId of the artifact.</description>
+    <cypher><![CDATA[
+            MATCH
+                (m:Maven:Pom:Xml)-[DESCRIBES]->(a:Maven:Artifact)
+            WHERE
+                a.group = "org.apache.edgent.java7"
+            RETURN m
+        ]]></cypher>
+  </constraint>
+
+  <group id="default">
+    <includeConstraint refId="structural-rules:dependency-groupid-matches-artifact-groupid" />
+  </group>
+
+</jqa:jqassistant-rules>
\ No newline at end of file
diff --git a/platforms/android/analytics/math3/pom.xml b/platforms/android/analytics/math3/pom.xml
index 484cba3..ddb43ca 100644
--- a/platforms/android/analytics/math3/pom.xml
+++ b/platforms/android/analytics/math3/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-analytics</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics-math3</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Math3</name>
+  <name>Apache Edgent (Android): Analytics: Math3</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
diff --git a/platforms/android/analytics/pom.xml b/platforms/android/analytics/pom.xml
index 3fd6c73..c6e9071 100644
--- a/platforms/android/analytics/pom.xml
+++ b/platforms/android/analytics/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics</name>
+  <name>Apache Edgent (Android): Analytics</name>
 
   <modules>
     <module>math3</module>
diff --git a/platforms/android/analytics/sensors/pom.xml b/platforms/android/analytics/sensors/pom.xml
index 1142079..9cd9ec9 100644
--- a/platforms/android/analytics/sensors/pom.xml
+++ b/platforms/android/analytics/sensors/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-analytics</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics-sensors</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Sensors</name>
+  <name>Apache Edgent (Android): Analytics: Sensors</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/android/hardware/pom.xml b/platforms/android/android/hardware/pom.xml
index 0da84c6..eac931e 100644
--- a/platforms/android/android/hardware/pom.xml
+++ b/platforms/android/android/hardware/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-android-hardware</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Android: Hardware</name>
+  <name>Apache Edgent (Android): Android: Hardware</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -37,9 +37,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>
diff --git a/platforms/android/android/pom.xml b/platforms/android/android/pom.xml
index 047cd2a..e31a20c 100644
--- a/platforms/android/android/pom.xml
+++ b/platforms/android/android/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-android</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Android</name>
+  <name>Apache Edgent (Android): Android</name>
 
   <modules>
     <module>hardware</module>
diff --git a/platforms/android/android/topology/pom.xml b/platforms/android/android/topology/pom.xml
index 29b7dd8..a1c7ac4 100644
--- a/platforms/android/android/topology/pom.xml
+++ b/platforms/android/android/topology/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-android-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Android: Topology</name>
+  <name>Apache Edgent (Android): Android: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -37,14 +37,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>
diff --git a/platforms/android/api/execution/pom.xml b/platforms/android/api/execution/pom.xml
index b63902d..64b8ed9 100644
--- a/platforms/android/api/execution/pom.xml
+++ b/platforms/android/api/execution/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-execution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Execution</name>
+  <name>Apache Edgent (Android): API: Execution</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/platforms/android/api/function/pom.xml b/platforms/android/api/function/pom.xml
index 7d1ef14..a6b15fe 100644
--- a/platforms/android/api/function/pom.xml
+++ b/platforms/android/api/function/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-function</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Function</name>
+  <name>Apache Edgent (Android): API: Function</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
diff --git a/platforms/android/api/graph/pom.xml b/platforms/android/api/graph/pom.xml
index 846cb39..162bca6 100644
--- a/platforms/android/api/graph/pom.xml
+++ b/platforms/android/api/graph/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Graph</name>
+  <name>Apache Edgent (Android): API: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/api/oplet/pom.xml b/platforms/android/api/oplet/pom.xml
index 95bf8fd..c22e33f 100644
--- a/platforms/android/api/oplet/pom.xml
+++ b/platforms/android/api/oplet/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-oplet</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Oplet</name>
+  <name>Apache Edgent (Android): API: Oplet</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,19 +66,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-window</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/api/pom.xml b/platforms/android/api/pom.xml
index c3a8f33..3f81d94 100644
--- a/platforms/android/api/pom.xml
+++ b/platforms/android/api/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API</name>
+  <name>Apache Edgent (Android): API</name>
 
   <modules>
     <module>execution</module>
diff --git a/platforms/android/api/topology/pom.xml b/platforms/android/api/topology/pom.xml
index 878f1fd..cd74d8f 100644
--- a/platforms/android/api/topology/pom.xml
+++ b/platforms/android/api/topology/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Topology</name>
+  <name>Apache Edgent (Android): API: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,24 +66,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/api/window/pom.xml b/platforms/android/api/window/pom.xml
index 2181691..71136f3 100644
--- a/platforms/android/api/window/pom.xml
+++ b/platforms/android/api/window/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-window</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Window</name>
+  <name>Apache Edgent (Android): API: Window</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/apps/iot/pom.xml b/platforms/android/apps/iot/pom.xml
index 1b44ca4..9a718aa 100644
--- a/platforms/android/apps/iot/pom.xml
+++ b/platforms/android/apps/iot/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-apps</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: IoT</name>
+  <name>Apache Edgent (Android): Apps: IoT</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,19 +62,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/apps/pom.xml b/platforms/android/apps/pom.xml
index 9117696..790af53 100644
--- a/platforms/android/apps/pom.xml
+++ b/platforms/android/apps/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps</name>
+  <name>Apache Edgent (Android): Apps</name>
 
   <modules>
     <module>iot</module>
diff --git a/platforms/android/apps/runtime/pom.xml b/platforms/android/apps/runtime/pom.xml
index 216c8fa..5d6f505 100644
--- a/platforms/android/apps/runtime/pom.xml
+++ b/platforms/android/apps/runtime/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-apps</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps-runtime</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: Runtime</name>
+  <name>Apache Edgent (Android): Apps: Runtime</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,14 +62,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/connectors/command/pom.xml b/platforms/android/connectors/command/pom.xml
index 8493a21..9c0ba54 100644
--- a/platforms/android/connectors/command/pom.xml
+++ b/platforms/android/connectors/command/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-command</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Command</name>
+  <name>Apache Edgent (Android): Connectors: Command</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,14 +62,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/connectors/common/pom.xml b/platforms/android/connectors/common/pom.xml
index bdb407b..9ef95e0 100644
--- a/platforms/android/connectors/common/pom.xml
+++ b/platforms/android/connectors/common/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-common</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Common</name>
+  <name>Apache Edgent (Android): Connectors: Common</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/connectors/csv/pom.xml b/platforms/android/connectors/csv/pom.xml
index cfbc439..af39e9e 100644
--- a/platforms/android/connectors/csv/pom.xml
+++ b/platforms/android/connectors/csv/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-csv</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: CSV</name>
+  <name>Apache Edgent (Android): Connectors: CSV</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
diff --git a/platforms/android/connectors/file/pom.xml b/platforms/android/connectors/file/pom.xml
index d87fd74..cb8be1e 100644
--- a/platforms/android/connectors/file/pom.xml
+++ b/platforms/android/connectors/file/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-file</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: File</name>
+  <name>Apache Edgent (Android): Connectors: File</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,19 +66,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/platforms/android/connectors/http/pom.xml b/platforms/android/connectors/http/pom.xml
index d3c8fe4..63b2daa 100644
--- a/platforms/android/connectors/http/pom.xml
+++ b/platforms/android/connectors/http/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-http</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: HTTP</name>
+  <name>Apache Edgent (Android): Connectors: HTTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
diff --git a/platforms/android/connectors/iot/pom.xml b/platforms/android/connectors/iot/pom.xml
index b21ca48..74dd370 100644
--- a/platforms/android/connectors/iot/pom.xml
+++ b/platforms/android/connectors/iot/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoT</name>
+  <name>Apache Edgent (Android): Connectors: IoT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,14 +66,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/platforms/android/connectors/iotp/pom.xml b/platforms/android/connectors/iotp/pom.xml
index c674167..13a7264 100644
--- a/platforms/android/connectors/iotp/pom.xml
+++ b/platforms/android/connectors/iotp/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-iotp</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoTP</name>
+  <name>Apache Edgent (Android): Connectors: IoTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,19 +66,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.messaging</groupId>
diff --git a/platforms/android/connectors/jdbc/pom.xml b/platforms/android/connectors/jdbc/pom.xml
index fff2af4..ad7e1c0 100644
--- a/platforms/android/connectors/jdbc/pom.xml
+++ b/platforms/android/connectors/jdbc/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-jdbc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: JDBC</name>
+  <name>Apache Edgent (Android): Connectors: JDBC</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,14 +66,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/connectors/kafka/pom.xml b/platforms/android/connectors/kafka/pom.xml
index 6c8d6f3..8fdf04e 100644
--- a/platforms/android/connectors/kafka/pom.xml
+++ b/platforms/android/connectors/kafka/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-kafka</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Kafka</name>
+  <name>Apache Edgent (Android): Connectors: Kafka</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -80,9 +80,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
diff --git a/platforms/android/connectors/mqtt/pom.xml b/platforms/android/connectors/mqtt/pom.xml
index cbeb953..985d392 100644
--- a/platforms/android/connectors/mqtt/pom.xml
+++ b/platforms/android/connectors/mqtt/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-mqtt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: MQTT</name>
+  <name>Apache Edgent (Android): Connectors: MQTT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,19 +66,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.paho</groupId>
diff --git a/platforms/android/connectors/pom.xml b/platforms/android/connectors/pom.xml
index b3417d9..6f62bef 100644
--- a/platforms/android/connectors/pom.xml
+++ b/platforms/android/connectors/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors</name>
+  <name>Apache Edgent (Android): Connectors</name>
 
   <modules>
     <module>command</module>
diff --git a/platforms/android/connectors/pubsub/pom.xml b/platforms/android/connectors/pubsub/pom.xml
index 37041ca..20fb920 100644
--- a/platforms/android/connectors/pubsub/pom.xml
+++ b/platforms/android/connectors/pubsub/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-pubsub</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: PubSub</name>
+  <name>Apache Edgent (Android): Connectors: PubSub</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,9 +62,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/connectors/serial/pom.xml b/platforms/android/connectors/serial/pom.xml
index 08d7261..9272d20 100644
--- a/platforms/android/connectors/serial/pom.xml
+++ b/platforms/android/connectors/serial/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-serial</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Serial</name>
+  <name>Apache Edgent (Android): Connectors: Serial</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/connectors/websocket-base/pom.xml b/platforms/android/connectors/websocket-base/pom.xml
index 4ab3273..cd9b0b7 100644
--- a/platforms/android/connectors/websocket-base/pom.xml
+++ b/platforms/android/connectors/websocket-base/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-base</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Base</name>
+  <name>Apache Edgent (Android): Connectors: Websocket: Base</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/connectors/websocket-jetty/pom.xml b/platforms/android/connectors/websocket-jetty/pom.xml
index 4f87c5f..7b51ca9 100644
--- a/platforms/android/connectors/websocket-jetty/pom.xml
+++ b/platforms/android/connectors/websocket-jetty/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-jetty</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Jetty</name>
+  <name>Apache Edgent (Android): Connectors: Websocket: Jetty</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
diff --git a/platforms/android/connectors/websocket-misc/pom.xml b/platforms/android/connectors/websocket-misc/pom.xml
index 7b64013..203efd8 100644
--- a/platforms/android/connectors/websocket-misc/pom.xml
+++ b/platforms/android/connectors/websocket-misc/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-misc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Misc</name>
+  <name>Apache Edgent (Android): Connectors: Websocket: Misc</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
diff --git a/platforms/android/connectors/websocket-server/pom.xml b/platforms/android/connectors/websocket-server/pom.xml
index 206780e..17d2f15 100644
--- a/platforms/android/connectors/websocket-server/pom.xml
+++ b/platforms/android/connectors/websocket-server/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Server</name>
+  <name>Apache Edgent (Android): Connectors: Websocket: Server</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml
index 88405fa..1555304 100644
--- a/platforms/android/connectors/websocket/pom.xml
+++ b/platforms/android/connectors/websocket/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket</name>
+  <name>Apache Edgent (Android): Connectors: Websocket</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,19 +66,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.websocket</groupId>
diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml
index 8e259b0..4157744 100644
--- a/platforms/android/distribution/pom.xml
+++ b/platforms/android/distribution/pom.xml
@@ -25,12 +25,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-distribution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+  <name>Apache Edgent (Android): Distribution</name>
 
   <build>
     <plugins>
@@ -78,127 +78,127 @@
 
     <!-- Providers -->
     <!-- Not on android <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency-->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-providers-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Android platform speficic -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-android-hardware</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-android-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-command</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-file</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-http</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Include console-servlets.war to enable a user to run
@@ -208,7 +208,7 @@
          of the development provider.
     -->
     <!-- Not on android <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>
diff --git a/platforms/android/pom.xml b/platforms/android/pom.xml
index 07874ab..904e797 100644
--- a/platforms/android/pom.xml
+++ b/platforms/android/pom.xml
@@ -24,22 +24,14 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-platforms</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.edgent.android</groupId>
   <artifactId>edgent-platforms-android</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Platforms: Android</name>
-
-  <properties>
-    <edgent.projname.platform>(Android)</edgent.projname.platform>
-    <edgent.runtime.groupId>org.apache.edgent.android</edgent.runtime.groupId>
-
-    <!-- Edgent groupId of jars the retrolambda processing will use -->
-    <edgent.retrolambda.srcArtifactGroupId>org.apache.edgent.java7</edgent.retrolambda.srcArtifactGroupId>
-  </properties>
+  <name>Apache Edgent (Android): Platforms: Android</name>
 
   <modules>
     <!-- Real modules -->
diff --git a/platforms/android/providers/direct/pom.xml b/platforms/android/providers/direct/pom.xml
index 4266634..d847204 100644
--- a/platforms/android/providers/direct/pom.xml
+++ b/platforms/android/providers/direct/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-providers</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers-direct</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Direct</name>
+  <name>Apache Edgent (Android): Providers: Direct</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,34 +66,34 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-spi-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-spi-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/providers/iot/pom.xml b/platforms/android/providers/iot/pom.xml
index ce19fca..02c41f3 100644
--- a/platforms/android/providers/iot/pom.xml
+++ b/platforms/android/providers/iot/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-providers</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: IoT</name>
+  <name>Apache Edgent (Android): Providers: IoT</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,39 +62,39 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-apps-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/providers/pom.xml b/platforms/android/providers/pom.xml
index e289a9e..68b71b2 100644
--- a/platforms/android/providers/pom.xml
+++ b/platforms/android/providers/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers</name>
+  <name>Apache Edgent (Android): Providers</name>
 
   <modules>
     <module>direct</module>
diff --git a/platforms/android/runtime/appservice/pom.xml b/platforms/android/runtime/appservice/pom.xml
index a48a232..8b0e872 100644
--- a/platforms/android/runtime/appservice/pom.xml
+++ b/platforms/android/runtime/appservice/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-appservice</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: AppService</name>
+  <name>Apache Edgent (Android): Runtime: AppService</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,14 +62,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/runtime/etiao/pom.xml b/platforms/android/runtime/etiao/pom.xml
index e0fbdae..623baf4 100644
--- a/platforms/android/runtime/etiao/pom.xml
+++ b/platforms/android/runtime/etiao/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-etiao</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: Etiao</name>
+  <name>Apache Edgent (Android): Runtime: Etiao</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,19 +66,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-spi-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/runtime/jobregistry/pom.xml b/platforms/android/runtime/jobregistry/pom.xml
index 74e2192..6dba1d3 100644
--- a/platforms/android/runtime/jobregistry/pom.xml
+++ b/platforms/android/runtime/jobregistry/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-jobregistry</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JobRegistry</name>
+  <name>Apache Edgent (Android): Runtime: JobRegistry</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,14 +62,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/runtime/jsoncontrol/pom.xml b/platforms/android/runtime/jsoncontrol/pom.xml
index ccc376d..c835517 100644
--- a/platforms/android/runtime/jsoncontrol/pom.xml
+++ b/platforms/android/runtime/jsoncontrol/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-jsoncontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JSONControl</name>
+  <name>Apache Edgent (Android): Runtime: JSONControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,14 +66,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/runtime/pom.xml b/platforms/android/runtime/pom.xml
index e04966e..5bc2c2b 100644
--- a/platforms/android/runtime/pom.xml
+++ b/platforms/android/runtime/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtimes</name>
+  <name>Apache Edgent (Android): Runtimes</name>
 
   <modules>
     <module>appservice</module>
diff --git a/platforms/android/spi/graph/pom.xml b/platforms/android/spi/graph/pom.xml
index 2070eb5..d0a8579 100644
--- a/platforms/android/spi/graph/pom.xml
+++ b/platforms/android/spi/graph/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-spi</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Graph</name>
+  <name>Apache Edgent (Android): SPI: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,14 +66,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/spi/pom.xml b/platforms/android/spi/pom.xml
index 019befc..e1a423d 100644
--- a/platforms/android/spi/pom.xml
+++ b/platforms/android/spi/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI</name>
+  <name>Apache Edgent (Android): SPI</name>
 
   <modules>
     <module>graph</module>
diff --git a/platforms/android/spi/topology/pom.xml b/platforms/android/spi/topology/pom.xml
index 785ff32..89317dc 100644
--- a/platforms/android/spi/topology/pom.xml
+++ b/platforms/android/spi/topology/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-spi</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Topology</name>
+  <name>Apache Edgent (Android): SPI: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/utils/metrics/pom.xml b/platforms/android/utils/metrics/pom.xml
index 85644fc..bb6b33f 100644
--- a/platforms/android/utils/metrics/pom.xml
+++ b/platforms/android/utils/metrics/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-utils</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils-metrics</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Metrics</name>
+  <name>Apache Edgent (Android): Utils: Metrics</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,9 +66,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/android/utils/pom.xml b/platforms/android/utils/pom.xml
index 9d60d54..51f053d 100644
--- a/platforms/android/utils/pom.xml
+++ b/platforms/android/utils/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-platforms-android</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils</name>
+  <name>Apache Edgent (Android): Utils</name>
 
   <modules>
     <module>metrics</module>
diff --git a/platforms/android/utils/streamscope/pom.xml b/platforms/android/utils/streamscope/pom.xml
index 7857569..4ff6645 100644
--- a/platforms/android/utils/streamscope/pom.xml
+++ b/platforms/android/utils/streamscope/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.android</groupId>
     <artifactId>edgent-utils</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils-streamscope</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Streamscope</name>
+  <name>Apache Edgent (Android): Utils: Streamscope</name>
 
   <build>
     <plugins>
@@ -46,7 +46,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,9 +62,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/analytics/math3/pom.xml b/platforms/java7/analytics/math3/pom.xml
index db21f4f..34c2355 100644
--- a/platforms/java7/analytics/math3/pom.xml
+++ b/platforms/java7/analytics/math3/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-analytics</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics-math3</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Math3</name>
+  <name>Apache Edgent (Java 7): Analytics: Math3</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -85,22 +96,22 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/analytics/pom.xml b/platforms/java7/analytics/pom.xml
index 3fd5d29..aa3374f 100644
--- a/platforms/java7/analytics/pom.xml
+++ b/platforms/java7/analytics/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics</name>
+  <name>Apache Edgent (Java 7): Analytics</name>
 
   <modules>
     <module>math3</module>
diff --git a/platforms/java7/analytics/sensors/pom.xml b/platforms/java7/analytics/sensors/pom.xml
index fb83d28..033977a 100644
--- a/platforms/java7/analytics/sensors/pom.xml
+++ b/platforms/java7/analytics/sensors/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-analytics</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-analytics-sensors</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Analytics: Sensors</name>
+  <name>Apache Edgent (Java 7): Analytics: Sensors</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+              <artifactItem>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,28 +85,28 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/api/execution/pom.xml b/platforms/java7/api/execution/pom.xml
index e535f59..4c88c54 100644
--- a/platforms/java7/api/execution/pom.xml
+++ b/platforms/java7/api/execution/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-execution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Execution</name>
+  <name>Apache Edgent (Java 7): API: Execution</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/platforms/java7/api/function/pom.xml b/platforms/java7/api/function/pom.xml
index 854690b..6606615 100644
--- a/platforms/java7/api/function/pom.xml
+++ b/platforms/java7/api/function/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-function</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Function</name>
+  <name>Apache Edgent (Java 7): API: Function</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
diff --git a/platforms/java7/api/graph/pom.xml b/platforms/java7/api/graph/pom.xml
index a950f53..c2461a5 100644
--- a/platforms/java7/api/graph/pom.xml
+++ b/platforms/java7/api/graph/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Graph</name>
+  <name>Apache Edgent (Java 7): API: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/api/oplet/pom.xml b/platforms/java7/api/oplet/pom.xml
index 245bf4e..1bc6f79 100644
--- a/platforms/java7/api/oplet/pom.xml
+++ b/platforms/java7/api/oplet/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-oplet</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Oplet</name>
+  <name>Apache Edgent (Java 7): API: Oplet</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,19 +85,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-window</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/api/pom.xml b/platforms/java7/api/pom.xml
index 50466ff..bf73ade 100644
--- a/platforms/java7/api/pom.xml
+++ b/platforms/java7/api/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API</name>
+  <name>Apache Edgent (Java 7): API</name>
 
   <modules>
     <module>execution</module>
diff --git a/platforms/java7/api/topology/pom.xml b/platforms/java7/api/topology/pom.xml
index e9645d5..32454b1 100644
--- a/platforms/java7/api/topology/pom.xml
+++ b/platforms/java7/api/topology/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Topology</name>
+  <name>Apache Edgent (Java 7): API: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -114,24 +125,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/api/window/pom.xml b/platforms/java7/api/window/pom.xml
index 0b9932a..30e4481 100644
--- a/platforms/java7/api/window/pom.xml
+++ b/platforms/java7/api/window/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-api</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-api-window</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: API: Window</name>
+  <name>Apache Edgent (Java 7): API: Window</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/apps/iot/pom.xml b/platforms/java7/apps/iot/pom.xml
index c4b3cd2..d0fdc42 100644
--- a/platforms/java7/apps/iot/pom.xml
+++ b/platforms/java7/apps/iot/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-apps</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: IoT</name>
+  <name>Apache Edgent (Java 7): Apps: IoT</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,25 +81,25 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/platforms/java7/apps/pom.xml b/platforms/java7/apps/pom.xml
index fc1c331..fbd4ee5 100644
--- a/platforms/java7/apps/pom.xml
+++ b/platforms/java7/apps/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps</name>
+  <name>Apache Edgent (Java 7): Apps</name>
 
   <modules>
     <module>iot</module>
diff --git a/platforms/java7/apps/runtime/pom.xml b/platforms/java7/apps/runtime/pom.xml
index 9cdd3af..fe47704 100644
--- a/platforms/java7/apps/runtime/pom.xml
+++ b/platforms/java7/apps/runtime/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-apps</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-apps-runtime</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Apps: Runtime</name>
+  <name>Apache Edgent (Java 7): Apps: Runtime</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,26 +81,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/platforms/java7/connectors/command/pom.xml b/platforms/java7/connectors/command/pom.xml
index 78a5a04..c007f0e 100644
--- a/platforms/java7/connectors/command/pom.xml
+++ b/platforms/java7/connectors/command/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-command</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Command</name>
+  <name>Apache Edgent (Java 7): Connectors: Command</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,40 +81,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/connectors/common/pom.xml b/platforms/java7/connectors/common/pom.xml
index 3290378..d191f3d 100644
--- a/platforms/java7/connectors/common/pom.xml
+++ b/platforms/java7/connectors/common/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-common</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Common</name>
+  <name>Apache Edgent (Java 7): Connectors: Common</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,28 +85,28 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/connectors/csv/pom.xml b/platforms/java7/connectors/csv/pom.xml
index 0973c91..bdaff10 100644
--- a/platforms/java7/connectors/csv/pom.xml
+++ b/platforms/java7/connectors/csv/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-csv</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: CSV</name>
+  <name>Apache Edgent (Java 7): Connectors: CSV</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -76,22 +87,22 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
diff --git a/platforms/java7/connectors/file/pom.xml b/platforms/java7/connectors/file/pom.xml
index 6b9493a..996ce87 100644
--- a/platforms/java7/connectors/file/pom.xml
+++ b/platforms/java7/connectors/file/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-file</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: File</name>
+  <name>Apache Edgent (Java 7): Connectors: File</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,45 +85,45 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-oplet</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/connectors/http/pom.xml b/platforms/java7/connectors/http/pom.xml
index 33fcecc..1523796 100644
--- a/platforms/java7/connectors/http/pom.xml
+++ b/platforms/java7/connectors/http/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-http</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: HTTP</name>
+  <name>Apache Edgent (Java 7): Connectors: HTTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
@@ -90,15 +101,15 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/connectors/iot/pom.xml b/platforms/java7/connectors/iot/pom.xml
index ccb1c87..de12319 100644
--- a/platforms/java7/connectors/iot/pom.xml
+++ b/platforms/java7/connectors/iot/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoT</name>
+  <name>Apache Edgent (Java 7): Connectors: IoT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,14 +85,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/platforms/java7/connectors/iotp/pom.xml b/platforms/java7/connectors/iotp/pom.xml
index b330429..d44fdd0 100644
--- a/platforms/java7/connectors/iotp/pom.xml
+++ b/platforms/java7/connectors/iotp/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-iotp</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoTP</name>
+  <name>Apache Edgent (Java 7): Connectors: IoTP</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,19 +85,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.ibm.messaging</groupId>
diff --git a/platforms/java7/connectors/jdbc/pom.xml b/platforms/java7/connectors/jdbc/pom.xml
index 0841a89..382303e 100644
--- a/platforms/java7/connectors/jdbc/pom.xml
+++ b/platforms/java7/connectors/jdbc/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-jdbc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: JDBC</name>
+  <name>Apache Edgent (Java 7): Connectors: JDBC</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -71,14 +71,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -95,40 +106,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/connectors/kafka/pom.xml b/platforms/java7/connectors/kafka/pom.xml
index 1c73470..25a4052 100644
--- a/platforms/java7/connectors/kafka/pom.xml
+++ b/platforms/java7/connectors/kafka/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-kafka</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Kafka</name>
+  <name>Apache Edgent (Java 7): Connectors: Kafka</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -88,9 +99,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
@@ -171,29 +182,29 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/connectors/mqtt/pom.xml b/platforms/java7/connectors/mqtt/pom.xml
index 5ad801d..cc28cb9 100644
--- a/platforms/java7/connectors/mqtt/pom.xml
+++ b/platforms/java7/connectors/mqtt/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-mqtt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: MQTT</name>
+  <name>Apache Edgent (Java 7): Connectors: MQTT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,19 +85,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.paho</groupId>
@@ -95,29 +106,29 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/connectors/pom.xml b/platforms/java7/connectors/pom.xml
index 3a8eb4c..cec0499 100644
--- a/platforms/java7/connectors/pom.xml
+++ b/platforms/java7/connectors/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors</name>
+  <name>Apache Edgent (Java 7): Connectors</name>
 
   <modules>
     <module>command</module>
diff --git a/platforms/java7/connectors/pubsub/pom.xml b/platforms/java7/connectors/pubsub/pom.xml
index e81da8b..79e69ef 100644
--- a/platforms/java7/connectors/pubsub/pom.xml
+++ b/platforms/java7/connectors/pubsub/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-pubsub</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: PubSub</name>
+  <name>Apache Edgent (Java 7): Connectors: PubSub</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,15 +81,15 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/platforms/java7/connectors/serial/pom.xml b/platforms/java7/connectors/serial/pom.xml
index 88e562b..b7c46e1 100644
--- a/platforms/java7/connectors/serial/pom.xml
+++ b/platforms/java7/connectors/serial/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-serial</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Serial</name>
+  <name>Apache Edgent (Java 7): Connectors: Serial</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/connectors/websocket-base/pom.xml b/platforms/java7/connectors/websocket-base/pom.xml
index 00e1b91..cab3e3a 100644
--- a/platforms/java7/connectors/websocket-base/pom.xml
+++ b/platforms/java7/connectors/websocket-base/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-base</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Base</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket: Base</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/connectors/websocket-jetty/pom.xml b/platforms/java7/connectors/websocket-jetty/pom.xml
index 7942b5b..35a7a92 100644
--- a/platforms/java7/connectors/websocket-jetty/pom.xml
+++ b/platforms/java7/connectors/websocket-jetty/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-jetty</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Jetty</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket: Jetty</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/*,META-INF/maven/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -84,9 +95,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
diff --git a/platforms/java7/connectors/websocket-misc/pom.xml b/platforms/java7/connectors/websocket-misc/pom.xml
index 4357c3b..7cbb5f2 100644
--- a/platforms/java7/connectors/websocket-misc/pom.xml
+++ b/platforms/java7/connectors/websocket-misc/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-misc</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Misc</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket: Misc</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
diff --git a/platforms/java7/connectors/websocket-server/pom.xml b/platforms/java7/connectors/websocket-server/pom.xml
index 05f6b54..452f1e3 100644
--- a/platforms/java7/connectors/websocket-server/pom.xml
+++ b/platforms/java7/connectors/websocket-server/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Server</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket: Server</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
diff --git a/platforms/java7/connectors/websocket/pom.xml b/platforms/java7/connectors/websocket/pom.xml
index aa4eae6..3cb58a9 100644
--- a/platforms/java7/connectors/websocket/pom.xml
+++ b/platforms/java7/connectors/websocket/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-connectors</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-connectors-websocket</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket</name>
+  <name>Apache Edgent (Java 7): Connectors: Websocket</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,19 +85,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.websocket</groupId>
@@ -119,36 +130,36 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/platforms/java7/console/pom.xml b/platforms/java7/console/pom.xml
index 457f83f..7e06dc1 100644
--- a/platforms/java7/console/pom.xml
+++ b/platforms/java7/console/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-console</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console</name>
+  <name>Apache Edgent (Java 7): Console</name>
 
   <modules>
     <module>server</module>
diff --git a/platforms/java7/console/server/pom.xml b/platforms/java7/console/server/pom.xml
index 6d06223..fdded98 100644
--- a/platforms/java7/console/server/pom.xml
+++ b/platforms/java7/console/server/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-console</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-console-server</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console: Server</name>
+  <name>Apache Edgent (Java 7): Console: Server</name>
 
   <build>
     <resources>
@@ -47,32 +47,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
-          <execution>
-            <id>copy</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                  <excludes>META-INF/**,resources/**</excludes>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <version>${project.version}</version>
-                  <classifier>tests</classifier>
-                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
           <!--
            Copy the servlets.war into the build output so it is embedded as
            resource into the jar.
@@ -86,7 +60,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>edgent-console-servlets</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
@@ -96,6 +70,43 @@
               </artifactItems>
             </configuration>
           </execution>
+          <execution>
+            <id>copy</id>
+            <phase>compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.edgent</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
+                  <excludes>META-INF/**,resources/**</excludes>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.apache.edgent</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <classifier>tests</classifier>
+                  <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+                  <excludes>META-INF/**</excludes>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>
@@ -169,9 +180,9 @@
         prior to this module.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-console-servlets</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>war</type>
       <optional>true</optional>
     </dependency>
diff --git a/platforms/java7/console/servlets/pom.xml b/platforms/java7/console/servlets/pom.xml
index 866ccb5..7226409 100644
--- a/platforms/java7/console/servlets/pom.xml
+++ b/platforms/java7/console/servlets/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-console</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-console-servlets</artifactId>
   <packaging>war</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Console: Servlets</name>
+  <name>Apache Edgent (Java 7): Console: Servlets</name>
 
   <build>
     <resources>
@@ -60,15 +60,26 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
                   <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -112,9 +123,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/platforms/java7/distribution/pom.xml b/platforms/java7/distribution/pom.xml
index 6965afd..4b9dc4f 100644
--- a/platforms/java7/distribution/pom.xml
+++ b/platforms/java7/distribution/pom.xml
@@ -25,12 +25,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-distribution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+  <name>Apache Edgent (Java 7): Distribution</name>
 
   <build>
     <plugins>
@@ -78,115 +78,115 @@
 
     <!-- Providers -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-development</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-command</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-file</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-http</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Include console-servlets.war to enable a user to run
@@ -196,9 +196,9 @@
          of the development provider.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-console-servlets</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>war</type>
     </dependency>
   </dependencies>
diff --git a/platforms/java7/jqassistant/structural-rules.xml b/platforms/java7/jqassistant/structural-rules.xml
new file mode 100644
index 0000000..f3d15b1
--- /dev/null
+++ b/platforms/java7/jqassistant/structural-rules.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+-->
+<jqa:jqassistant-rules xmlns:jqa="http://www.buschmais.com/jqassistant/core/analysis/rules/schema/v1.0"
+                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                       xsi:schemaLocation="http://www.buschmais.com/jqassistant/core/analysis/rules/schema/v1.0 https://raw.githubusercontent.com/buschmais/jqassistant-examples/master/core/analysis/src/main/resources/META-INF/xsd/jqassistant-rules-1.0.xsd">
+
+  <constraint id="structural-rules:unpack-matching-artifacts">
+    <description>All Java 7 modules must use the matching Java 8 modules as source.</description>
+    <cypher><![CDATA[
+            MATCH
+                (m:Maven:Pom:Xml)-[DESCRIBES]->(a:Maven:Artifact)
+            WHERE
+                a.group = "org.apache.edgent.java7"
+            RETURN m
+        ]]></cypher>
+  </constraint>
+
+  <constraint id="structural-rules:matching-dependencies">
+    <description>All Java 7 modules must have the same dependencies as the matching Java 8 modules.</description>
+    <cypher><![CDATA[
+            MATCH
+                (t:Junit4:Test:Class)
+            WHERE NOT
+                t.name =~ ".*Test"
+            RETURN
+                t AS InvalidTestClass
+        ]]></cypher>
+  </constraint>
+
+  <group id="default">
+    <includeConstraint refId="structural-rules:unpack-matching-artifacts" />
+    <includeConstraint refId="structural-rules:matching-dependencies" />
+  </group>
+
+</jqa:jqassistant-rules>
\ No newline at end of file
diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml
index 832b6ad..9d48f06 100644
--- a/platforms/java7/pom.xml
+++ b/platforms/java7/pom.xml
@@ -24,23 +24,18 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-platforms</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.edgent.java7</groupId>
   <artifactId>edgent-platforms-java7</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Platforms: Java7</name>
+  <name>Apache Edgent (Java 7): Platforms: Java7</name>
 
   <properties>
     <!-- The 9.2 version is the last to support Java7 -->
     <jetty.version>9.2.21.v20170120</jetty.version>
-    <edgent.projname.platform>(Java 7)</edgent.projname.platform>
-    <edgent.runtime.groupId>org.apache.edgent.java7</edgent.runtime.groupId>
-    
-    <!-- Edgent groupId of jars the retrolambda processing will use -->
-    <edgent.retrolambda.srcArtifactGroupId>org.apache.edgent</edgent.retrolambda.srcArtifactGroupId>
   </properties>
 
   <modules>
diff --git a/platforms/java7/providers/development/pom.xml b/platforms/java7/providers/development/pom.xml
index 8cd2b71..878fae0 100644
--- a/platforms/java7/providers/development/pom.xml
+++ b/platforms/java7/providers/development/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-providers</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers-development</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Development</name>
+  <name>Apache Edgent (Java 7): Providers: Development</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,42 +85,42 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-console-server</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/providers/direct/pom.xml b/platforms/java7/providers/direct/pom.xml
index b00afd1..d140684 100644
--- a/platforms/java7/providers/direct/pom.xml
+++ b/platforms/java7/providers/direct/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-providers</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers-direct</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Direct</name>
+  <name>Apache Edgent (Java 7): Providers: Direct</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -76,7 +87,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>edgent-test-appservice-applications</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -92,53 +103,53 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-spi-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-spi-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/providers/iot/pom.xml b/platforms/java7/providers/iot/pom.xml
index 9f4dc81..b302d89 100644
--- a/platforms/java7/providers/iot/pom.xml
+++ b/platforms/java7/providers/iot/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-providers</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: IoT</name>
+  <name>Apache Edgent (Java 7): Providers: IoT</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,39 +81,39 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-apps-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/providers/pom.xml b/platforms/java7/providers/pom.xml
index 3e2cd07..6f4ce8d 100644
--- a/platforms/java7/providers/pom.xml
+++ b/platforms/java7/providers/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers</name>
+  <name>Apache Edgent (Java 7): Providers</name>
 
   <modules>
     <module>development</module>
diff --git a/platforms/java7/runtime/appservice/pom.xml b/platforms/java7/runtime/appservice/pom.xml
index fbf14aa..47187b7 100644
--- a/platforms/java7/runtime/appservice/pom.xml
+++ b/platforms/java7/runtime/appservice/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-appservice</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: AppService</name>
+  <name>Apache Edgent (Java 7): Runtime: AppService</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,21 +81,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Just needed to make sure it is scheduled before this module in the reactor -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-test-appservice-applications</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/platforms/java7/runtime/etiao/pom.xml b/platforms/java7/runtime/etiao/pom.xml
index 7044d30..12380bb 100644
--- a/platforms/java7/runtime/etiao/pom.xml
+++ b/platforms/java7/runtime/etiao/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-etiao</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: Etiao</name>
+  <name>Apache Edgent (Java 7): Runtime: Etiao</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,25 +85,25 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-spi-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/runtime/jmxcontrol/pom.xml b/platforms/java7/runtime/jmxcontrol/pom.xml
index fdfb532..eabf917 100644
--- a/platforms/java7/runtime/jmxcontrol/pom.xml
+++ b/platforms/java7/runtime/jmxcontrol/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-jmxcontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JMXControl</name>
+  <name>Apache Edgent (Java 7): Runtime: JMXControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,14 +85,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/runtime/jobregistry/pom.xml b/platforms/java7/runtime/jobregistry/pom.xml
index 78dbcb4..91ba528 100644
--- a/platforms/java7/runtime/jobregistry/pom.xml
+++ b/platforms/java7/runtime/jobregistry/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-jobregistry</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JobRegistry</name>
+  <name>Apache Edgent (Java 7): Runtime: JobRegistry</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,14 +81,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/runtime/jsoncontrol/pom.xml b/platforms/java7/runtime/jsoncontrol/pom.xml
index a065f8a..f279c79 100644
--- a/platforms/java7/runtime/jsoncontrol/pom.xml
+++ b/platforms/java7/runtime/jsoncontrol/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-jsoncontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JSONControl</name>
+  <name>Apache Edgent (Java 7): Runtime: JSONControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,14 +85,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/runtime/pom.xml b/platforms/java7/runtime/pom.xml
index f2ae3f5..8ccb626 100644
--- a/platforms/java7/runtime/pom.xml
+++ b/platforms/java7/runtime/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime</name>
+  <name>Apache Edgent (Java 7): Runtime</name>
 
   <modules>
     <module>appservice</module>
diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml
index d8ef618..16e83ef 100644
--- a/platforms/java7/spi/graph/pom.xml
+++ b/platforms/java7/spi/graph/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-spi</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Graph</name>
+  <name>Apache Edgent (Java 7): SPI: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,14 +85,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/spi/pom.xml b/platforms/java7/spi/pom.xml
index d074de7..e1f569f 100644
--- a/platforms/java7/spi/pom.xml
+++ b/platforms/java7/spi/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI</name>
+  <name>Apache Edgent (Java 7): SPI</name>
 
   <modules>
     <module>graph</module>
diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml
index 84fa3e4..889da9a 100644
--- a/platforms/java7/spi/topology/pom.xml
+++ b/platforms/java7/spi/topology/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-spi</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Topology</name>
+  <name>Apache Edgent (Java 7): SPI: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,9 +85,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/test/appservice-applications/pom.xml b/platforms/java7/test/appservice-applications/pom.xml
index 1c78e6b..92ed792 100644
--- a/platforms/java7/test/appservice-applications/pom.xml
+++ b/platforms/java7/test/appservice-applications/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-test</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-test-appservice-applications</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: AppService Applications</name>
+  <name>Apache Edgent (Java 7): Test: AppService Applications</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/*,META-INF/maven/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -80,9 +91,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/test/fvtiot/pom.xml b/platforms/java7/test/fvtiot/pom.xml
index 3048bd6..e5df8e8 100644
--- a/platforms/java7/test/fvtiot/pom.xml
+++ b/platforms/java7/test/fvtiot/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-test</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-test-fvtiot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: fvtiot</name>
+  <name>Apache Edgent (Java 7): Test: fvtiot</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -72,7 +83,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>edgent-test-appservice-applications</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -88,40 +99,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-apps-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-apps-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/platforms/java7/test/pom.xml b/platforms/java7/test/pom.xml
index c24bc4f..264ebd3 100644
--- a/platforms/java7/test/pom.xml
+++ b/platforms/java7/test/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-test</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test</name>
+  <name>Apache Edgent (Java 7): Test</name>
 
   <modules>
     <module>appservice-applications</module>
diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml
index 8a1713e..e12bcf6 100644
--- a/platforms/java7/test/svt/pom.xml
+++ b/platforms/java7/test/svt/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-test</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-test-svt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: SVT</name>
+  <name>Apache Edgent (Java 7): Test: SVT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,24 +85,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-console-server</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-development</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/platforms/java7/utils/metrics/pom.xml b/platforms/java7/utils/metrics/pom.xml
index b7bf1c8..4348459 100644
--- a/platforms/java7/utils/metrics/pom.xml
+++ b/platforms/java7/utils/metrics/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-utils</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils-metrics</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Metrics</name>
+  <name>Apache Edgent (Java 7): Utils: Metrics</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -74,16 +85,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/java7/utils/pom.xml b/platforms/java7/utils/pom.xml
index cda954d..a351180 100644
--- a/platforms/java7/utils/pom.xml
+++ b/platforms/java7/utils/pom.xml
@@ -24,13 +24,13 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-platforms-java7</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils</name>
+  <name>Apache Edgent (Java 7): Utils</name>
 
   <modules>
     <module>metrics</module>
diff --git a/platforms/java7/utils/streamscope/pom.xml b/platforms/java7/utils/streamscope/pom.xml
index 224bd70..4018456 100644
--- a/platforms/java7/utils/streamscope/pom.xml
+++ b/platforms/java7/utils/streamscope/pom.xml
@@ -24,12 +24,12 @@
   <parent>
     <groupId>org.apache.edgent.java7</groupId>
     <artifactId>edgent-utils</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils-streamscope</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Streamscope</name>
+  <name>Apache Edgent (Java 7): Utils: Streamscope</name>
 
   <build>
     <plugins>
@@ -46,14 +46,25 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/classes</outputDirectory>
                   <excludes>META-INF/**</excludes>
                 </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-test</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>${project.artifactId}</artifactId>
                   <version>${project.version}</version>
                   <classifier>tests</classifier>
@@ -70,16 +81,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/platforms/pom.xml b/platforms/pom.xml
index 1808912..fcea701 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-platforms</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Platforms</name>
+  <name>Apache Edgent (Java 8): Platforms</name>
 
   <build>
     <plugins>
diff --git a/pom.xml b/pom.xml
index 84d02bf..5686896 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.edgent</groupId>
   <artifactId>edgent-parent</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Edgent</name>
@@ -46,13 +46,6 @@
   </scm>
 
   <properties>
-    <!-- Up here and not in the java8 profile, so hopefully the maven-release-plugin will find it -->
-    <edgent.runtime.version>1.3.0-SNAPSHOT</edgent.runtime.version>
-
-    <!-- The next two are overriden by platforms/{java7,android}/pom -->
-    <edgent.projname.platform>(Java 8)</edgent.projname.platform>
-    <edgent.runtime.groupId>org.apache.edgent</edgent.runtime.groupId>
-
     <java.version>1.8</java.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding>
@@ -115,6 +108,12 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>com.buschmais.jqassistant</groupId>
+          <artifactId>jqassistant-maven-plugin</artifactId>
+          <version>1.3.0</version>
+        </plugin>
+
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <version>3.6.1</version>
@@ -359,6 +358,22 @@
         </configuration>
       </plugin>
 
+      <plugin>
+        <groupId>com.buschmais.jqassistant</groupId>
+        <artifactId>jqassistant-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>scan</goal>
+              <!--goal>analyze</goal-->
+            </goals>
+            <configuration>
+              <!--failOnSeverity>MAJOR</failOnSeverity-->
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
       <!--
         This plugin doesn't really do much, it makes sure the jacoco agent
         is downloaded and that the path to this is saved in an environment
@@ -613,6 +628,18 @@
 
   <reporting>
     <plugins>
+      <plugin>
+        <groupId>com.buschmais.jqassistant</groupId>
+        <artifactId>jqassistant-maven-plugin</artifactId>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
+      </plugin>
+
       <!-- Generates a changelog report from GIT commits -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/providers/development/pom.xml b/providers/development/pom.xml
index 8bf9af6..3165633 100644
--- a/providers/development/pom.xml
+++ b/providers/development/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-providers</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers-development</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Development</name>
+  <name>Apache Edgent (Java 8): Providers: Development</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,42 +36,42 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-console-server</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/providers/direct/pom.xml b/providers/direct/pom.xml
index eab588a..b920cbd 100644
--- a/providers/direct/pom.xml
+++ b/providers/direct/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-providers</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers-direct</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: Direct</name>
+  <name>Apache Edgent (Java 8): Providers: Direct</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -49,7 +49,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>edgent-test-appservice-applications</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -65,53 +65,53 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-spi-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-spi-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/providers/iot/pom.xml b/providers/iot/pom.xml
index f341f90..7634775 100644
--- a/providers/iot/pom.xml
+++ b/providers/iot/pom.xml
@@ -23,48 +23,48 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-providers</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers-iot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers: IoT</name>
+  <name>Apache Edgent (Java 8): Providers: IoT</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-apps-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/providers/pom.xml b/providers/pom.xml
index a1b35e0..9cbec69 100644
--- a/providers/pom.xml
+++ b/providers/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-providers</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Providers</name>
+  <name>Apache Edgent (Java 8): Providers</name>
 
   <modules>
     <module>development</module>
diff --git a/runtime/appservice/pom.xml b/runtime/appservice/pom.xml
index 4126b89..29bc096 100644
--- a/runtime/appservice/pom.xml
+++ b/runtime/appservice/pom.xml
@@ -23,30 +23,30 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-appservice</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: AppService</name>
+  <name>Apache Edgent (Java 8): Runtime: AppService</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Just needed to make sure it is scheduled before this module in the reactor -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-test-appservice-applications</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/runtime/etiao/pom.xml b/runtime/etiao/pom.xml
index 5c3c429..69d70b5 100644
--- a/runtime/etiao/pom.xml
+++ b/runtime/etiao/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-etiao</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: Etiao</name>
+  <name>Apache Edgent (Java 8): Runtime: Etiao</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,25 +36,25 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-spi-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/runtime/jmxcontrol/pom.xml b/runtime/jmxcontrol/pom.xml
index 99781d3..d45652c 100644
--- a/runtime/jmxcontrol/pom.xml
+++ b/runtime/jmxcontrol/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-jmxcontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JMXControl</name>
+  <name>Apache Edgent (Java 8): Runtime: JMXControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,14 +36,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/runtime/jobregistry/pom.xml b/runtime/jobregistry/pom.xml
index d8b8d06..e95d217 100644
--- a/runtime/jobregistry/pom.xml
+++ b/runtime/jobregistry/pom.xml
@@ -23,23 +23,23 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-jobregistry</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JobRegistry</name>
+  <name>Apache Edgent (Java 8): Runtime: JobRegistry</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/runtime/jsoncontrol/pom.xml b/runtime/jsoncontrol/pom.xml
index ae081fd..6d08c2f 100644
--- a/runtime/jsoncontrol/pom.xml
+++ b/runtime/jsoncontrol/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-runtime</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime-jsoncontrol</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime: JSONControl</name>
+  <name>Apache Edgent (Java 8): Runtime: JSONControl</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,14 +36,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/runtime/pom.xml b/runtime/pom.xml
index b6604f1..fdf7c17 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-runtime</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Runtime</name>
+  <name>Apache Edgent (Java 8): Runtime</name>
 
   <modules>
     <module>appservice</module>
diff --git a/samples/apps/pom.xml b/samples/apps/pom.xml
index 3423571..9695ad8 100644
--- a/samples/apps/pom.xml
+++ b/samples/apps/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.edgent</groupId>
+    <groupId>org.apache.edgent.samples</groupId>
     <artifactId>edgent-samples</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -66,9 +66,9 @@
     </dependency>
     
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.samples</groupId>
       <artifactId>edgent-samples-utils</artifactId>
-      <version>${project.version}</version>
+      <version>1.3.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/samples/connectors/pom.xml b/samples/connectors/pom.xml
index 1f7b3dd..a918f59 100644
--- a/samples/connectors/pom.xml
+++ b/samples/connectors/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.edgent</groupId>
+    <groupId>org.apache.edgent.samples</groupId>
     <artifactId>edgent-samples</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -71,9 +71,9 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.samples</groupId>
       <artifactId>edgent-samples-topology</artifactId>
-      <version>${project.version}</version>
+      <version>1.3.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/samples/console/pom.xml b/samples/console/pom.xml
index da45e56..ba9d3e2 100644
--- a/samples/console/pom.xml
+++ b/samples/console/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.edgent</groupId>
+    <groupId>org.apache.edgent.samples</groupId>
     <artifactId>edgent-samples</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/samples/pom.xml b/samples/pom.xml
index a3ca547..a10e91c 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -27,7 +27,7 @@
     <version>18</version>
   </parent>
 
-  <groupId>org.apache.edgent</groupId>
+  <groupId>org.apache.edgent.samples</groupId>
   <artifactId>edgent-samples</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
diff --git a/samples/scenarios/pom.xml b/samples/scenarios/pom.xml
index 2880387..1bfcbe5 100644
--- a/samples/scenarios/pom.xml
+++ b/samples/scenarios/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.edgent</groupId>
+    <groupId>org.apache.edgent.samples</groupId>
     <artifactId>edgent-samples</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -69,9 +69,9 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.samples</groupId>
       <artifactId>edgent-samples-connectors</artifactId>
-      <version>${project.version}</version>
+      <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/samples/template/pom.xml b/samples/template/pom.xml
index 72739d2..8d3f5cb 100644
--- a/samples/template/pom.xml
+++ b/samples/template/pom.xml
@@ -74,12 +74,12 @@
       <version>${edgent.runtime.version}</version>
     </dependency>
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
@@ -87,12 +87,12 @@
     <!-- declare Edgent Android dependencies
     -->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-android-hardware</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}.android</groupId>
+      <groupId>${project.groupId}.android</groupId>
       <artifactId>edgent-android-topology</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
@@ -100,12 +100,12 @@
     <!-- declare Edgent Analytics dependencies
     -->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
@@ -113,7 +113,7 @@
     <!-- declare Edgent Utils dependencies
     -->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
@@ -121,37 +121,37 @@
     <!-- declare Edgent Connector dependencies
     -->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
     <!--dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency-->
diff --git a/samples/topology/pom.xml b/samples/topology/pom.xml
index 8aa5274..1e4e653 100644
--- a/samples/topology/pom.xml
+++ b/samples/topology/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.edgent</groupId>
+    <groupId>org.apache.edgent.samples</groupId>
     <artifactId>edgent-samples</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
@@ -41,9 +41,9 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.samples</groupId>
       <artifactId>edgent-samples-utils</artifactId>
-      <version>${project.version}</version>
+      <version>1.3.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/samples/utils/pom.xml b/samples/utils/pom.xml
index 4eff56a..9e9fecc 100644
--- a/samples/utils/pom.xml
+++ b/samples/utils/pom.xml
@@ -22,7 +22,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.edgent</groupId>
+    <groupId>org.apache.edgent.samples</groupId>
     <artifactId>edgent-samples</artifactId>
     <version>1.3.0-SNAPSHOT</version>
   </parent>
diff --git a/spi/graph/pom.xml b/spi/graph/pom.xml
index b479b9a..e14eef4 100644
--- a/spi/graph/pom.xml
+++ b/spi/graph/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-spi</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi-graph</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Graph</name>
+  <name>Apache Edgent (Java 8): SPI: Graph</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,14 +36,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-graph</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/spi/pom.xml b/spi/pom.xml
index 10c2316..cfa532a 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI</name>
+  <name>Apache Edgent (Java 8): SPI</name>
 
   <modules>
     <module>graph</module>
diff --git a/spi/topology/pom.xml b/spi/topology/pom.xml
index ad413bb..4282018 100644
--- a/spi/topology/pom.xml
+++ b/spi/topology/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-spi</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-spi-topology</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: SPI: Topology</name>
+  <name>Apache Edgent (Java 8): SPI: Topology</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,9 +36,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/test/appservice-applications/pom.xml b/test/appservice-applications/pom.xml
index 87d8818..dcd4144 100644
--- a/test/appservice-applications/pom.xml
+++ b/test/appservice-applications/pom.xml
@@ -23,18 +23,18 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-test</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-test-appservice-applications</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: AppService Applications</name>
+  <name>Apache Edgent (Java 8): Test: AppService Applications</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/test/fvtiot/pom.xml b/test/fvtiot/pom.xml
index 7a11a04..6f780a0 100644
--- a/test/fvtiot/pom.xml
+++ b/test/fvtiot/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-test</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-test-fvtiot</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: fvtiot</name>
+  <name>Apache Edgent (Java 8): Test: fvtiot</name>
 
   <build>
     <plugins>
@@ -45,7 +45,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${edgent.runtime.groupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>edgent-test-appservice-applications</artifactId>
                   <version>${project.version}</version>
                   <outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -61,40 +61,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-apps-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-apps-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-iot</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/test/pom.xml b/test/pom.xml
index 03afcf1..0167864 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-test</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test</name>
+  <name>Apache Edgent (Java 8): Test</name>
 
   <modules>
     <module>appservice-applications</module>
diff --git a/test/svt/pom.xml b/test/svt/pom.xml
index fc5bc26..dfdf01c 100644
--- a/test/svt/pom.xml
+++ b/test/svt/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-test</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-test-svt</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Test: SVT</name>
+  <name>Apache Edgent (Java 8): Test: SVT</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,24 +36,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-console-server</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-development</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 
diff --git a/utils/metrics/pom.xml b/utils/metrics/pom.xml
index 2449243..8265e2a 100644
--- a/utils/metrics/pom.xml
+++ b/utils/metrics/pom.xml
@@ -23,12 +23,12 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-utils</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils-metrics</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Metrics</name>
+  <name>Apache Edgent (Java 8): Utils: Metrics</name>
 
   <properties>
     <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -36,16 +36,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/utils/pom.xml b/utils/pom.xml
index 06b154f..519298f 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils</artifactId>
   <packaging>pom</packaging>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils</name>
+  <name>Apache Edgent (Java 8): Utils</name>
 
   <modules>
     <module>metrics</module>
diff --git a/utils/streamscope/pom.xml b/utils/streamscope/pom.xml
index 819aae5..33cd110 100644
--- a/utils/streamscope/pom.xml
+++ b/utils/streamscope/pom.xml
@@ -23,25 +23,25 @@
   <parent>
     <groupId>org.apache.edgent</groupId>
     <artifactId>edgent-utils</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>edgent-utils-streamscope</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Utils: Streamscope</name>
+  <name>Apache Edgent (Java 8): Utils: Streamscope</name>
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
     </dependency>
 
     <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
+      <version>1.2.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>