You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/11/23 15:22:16 UTC

[04/11] incubator-edgent git commit: - Replaced a lot of the structural variables with constants to eventually make releasing easier.

- Replaced a lot of the structural variables with constants to eventually make releasing easier.


Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/a4c77bf8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/a4c77bf8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/a4c77bf8

Branch: refs/heads/develop
Commit: a4c77bf83c6090fb9b29bb13adee2f34647085a6
Parents: f46dd81
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Sun Nov 12 22:35:30 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Sun Nov 12 22:35:30 2017 +0100

----------------------------------------------------------------------
 analytics/math3/pom.xml                         | 10 ++--
 analytics/pom.xml                               |  2 +-
 analytics/sensors/pom.xml                       | 10 ++--
 api/execution/pom.xml                           |  4 +-
 api/function/pom.xml                            |  2 +-
 api/graph/pom.xml                               |  4 +-
 api/oplet/pom.xml                               |  8 +--
 api/pom.xml                                     |  2 +-
 api/topology/pom.xml                            | 10 ++--
 api/window/pom.xml                              |  4 +-
 apps/iot/pom.xml                                | 10 ++--
 apps/pom.xml                                    |  2 +-
 apps/runtime/pom.xml                            | 10 ++--
 connectors/command/pom.xml                      | 14 ++---
 connectors/common/pom.xml                       | 10 ++--
 connectors/csv/pom.xml                          |  8 +--
 connectors/file/pom.xml                         | 16 +++---
 connectors/http/pom.xml                         |  8 +--
 connectors/iot/pom.xml                          |  6 +--
 connectors/iotp/pom.xml                         |  8 +--
 connectors/jdbc/pom.xml                         | 14 ++---
 connectors/kafka/pom.xml                        | 12 ++---
 connectors/mqtt/pom.xml                         | 16 +++---
 connectors/pom.xml                              |  2 +-
 connectors/pubsub/pom.xml                       |  6 +--
 connectors/serial/pom.xml                       |  4 +-
 connectors/websocket-base/pom.xml               |  4 +-
 connectors/websocket-jetty/pom.xml              |  4 +-
 connectors/websocket-misc/pom.xml               |  2 +-
 connectors/websocket-server/pom.xml             |  4 +-
 connectors/websocket/pom.xml                    | 18 +++----
 console/pom.xml                                 |  2 +-
 console/server/pom.xml                          |  6 +--
 console/servlets/pom.xml                        |  4 +-
 distribution/pom.xml                            | 46 ++++++++--------
 platforms/android/analytics/math3/pom.xml       |  6 +--
 platforms/android/analytics/pom.xml             |  2 +-
 platforms/android/analytics/sensors/pom.xml     |  6 +--
 platforms/android/android/hardware/pom.xml      |  4 +-
 platforms/android/android/pom.xml               |  2 +-
 platforms/android/android/topology/pom.xml      |  6 +--
 platforms/android/api/execution/pom.xml         |  6 +--
 platforms/android/api/function/pom.xml          |  4 +-
 platforms/android/api/graph/pom.xml             |  6 +--
 platforms/android/api/oplet/pom.xml             | 10 ++--
 platforms/android/api/pom.xml                   |  2 +-
 platforms/android/api/topology/pom.xml          | 12 ++---
 platforms/android/api/window/pom.xml            |  6 +--
 platforms/android/apps/iot/pom.xml              | 10 ++--
 platforms/android/apps/pom.xml                  |  2 +-
 platforms/android/apps/runtime/pom.xml          |  8 +--
 platforms/android/connectors/command/pom.xml    |  8 +--
 platforms/android/connectors/common/pom.xml     |  6 +--
 platforms/android/connectors/csv/pom.xml        |  4 +-
 platforms/android/connectors/file/pom.xml       | 10 ++--
 platforms/android/connectors/http/pom.xml       |  6 +--
 platforms/android/connectors/iot/pom.xml        |  8 +--
 platforms/android/connectors/iotp/pom.xml       | 10 ++--
 platforms/android/connectors/jdbc/pom.xml       |  8 +--
 platforms/android/connectors/kafka/pom.xml      |  6 +--
 platforms/android/connectors/mqtt/pom.xml       | 10 ++--
 platforms/android/connectors/pom.xml            |  2 +-
 platforms/android/connectors/pubsub/pom.xml     |  6 +--
 platforms/android/connectors/serial/pom.xml     |  6 +--
 .../android/connectors/websocket-base/pom.xml   |  6 +--
 .../android/connectors/websocket-jetty/pom.xml  |  6 +--
 .../android/connectors/websocket-misc/pom.xml   |  4 +-
 .../android/connectors/websocket-server/pom.xml |  6 +--
 platforms/android/connectors/websocket/pom.xml  | 10 ++--
 platforms/android/distribution/pom.xml          | 50 ++++++++---------
 platforms/android/pom.xml                       | 10 +---
 platforms/android/providers/direct/pom.xml      | 16 +++---
 platforms/android/providers/iot/pom.xml         | 18 +++----
 platforms/android/providers/pom.xml             |  2 +-
 platforms/android/runtime/appservice/pom.xml    |  8 +--
 platforms/android/runtime/etiao/pom.xml         | 10 ++--
 platforms/android/runtime/jobregistry/pom.xml   |  8 +--
 platforms/android/runtime/jsoncontrol/pom.xml   |  8 +--
 platforms/android/runtime/pom.xml               |  2 +-
 platforms/android/spi/graph/pom.xml             |  8 +--
 platforms/android/spi/pom.xml                   |  2 +-
 platforms/android/spi/topology/pom.xml          |  6 +--
 platforms/android/utils/metrics/pom.xml         |  6 +--
 platforms/android/utils/pom.xml                 |  2 +-
 platforms/android/utils/streamscope/pom.xml     |  6 +--
 platforms/java7/analytics/math3/pom.xml         | 25 ++++++---
 platforms/java7/analytics/pom.xml               |  2 +-
 platforms/java7/analytics/sensors/pom.xml       | 27 +++++++---
 platforms/java7/api/execution/pom.xml           | 19 +++++--
 platforms/java7/api/function/pom.xml            | 17 ++++--
 platforms/java7/api/graph/pom.xml               | 19 +++++--
 platforms/java7/api/oplet/pom.xml               | 23 +++++---
 platforms/java7/api/pom.xml                     |  2 +-
 platforms/java7/api/topology/pom.xml            | 25 ++++++---
 platforms/java7/api/window/pom.xml              | 19 +++++--
 platforms/java7/apps/iot/pom.xml                | 25 ++++++---
 platforms/java7/apps/pom.xml                    |  2 +-
 platforms/java7/apps/runtime/pom.xml            | 25 ++++++---
 platforms/java7/connectors/command/pom.xml      | 29 ++++++----
 platforms/java7/connectors/common/pom.xml       | 25 ++++++---
 platforms/java7/connectors/csv/pom.xml          | 23 +++++---
 platforms/java7/connectors/file/pom.xml         | 31 +++++++----
 platforms/java7/connectors/http/pom.xml         | 23 +++++---
 platforms/java7/connectors/iot/pom.xml          | 21 ++++++--
 platforms/java7/connectors/iotp/pom.xml         | 23 +++++---
 platforms/java7/connectors/jdbc/pom.xml         | 29 ++++++----
 platforms/java7/connectors/kafka/pom.xml        | 27 +++++++---
 platforms/java7/connectors/mqtt/pom.xml         | 31 +++++++----
 platforms/java7/connectors/pom.xml              |  2 +-
 platforms/java7/connectors/pubsub/pom.xml       | 21 ++++++--
 platforms/java7/connectors/serial/pom.xml       | 19 +++++--
 .../java7/connectors/websocket-base/pom.xml     | 19 +++++--
 .../java7/connectors/websocket-jetty/pom.xml    | 19 +++++--
 .../java7/connectors/websocket-misc/pom.xml     | 17 ++++--
 .../java7/connectors/websocket-server/pom.xml   | 19 +++++--
 platforms/java7/connectors/websocket/pom.xml    | 33 ++++++++----
 platforms/java7/console/pom.xml                 |  2 +-
 platforms/java7/console/server/pom.xml          | 57 ++++++++++++--------
 platforms/java7/console/servlets/pom.xml        | 19 +++++--
 platforms/java7/distribution/pom.xml            | 46 ++++++++--------
 platforms/java7/pom.xml                         |  7 +--
 platforms/java7/providers/development/pom.xml   | 31 +++++++----
 platforms/java7/providers/direct/pom.xml        | 37 ++++++++-----
 platforms/java7/providers/iot/pom.xml           | 31 +++++++----
 platforms/java7/providers/pom.xml               |  2 +-
 platforms/java7/runtime/appservice/pom.xml      | 23 +++++---
 platforms/java7/runtime/etiao/pom.xml           | 25 ++++++---
 platforms/java7/runtime/jmxcontrol/pom.xml      | 21 ++++++--
 platforms/java7/runtime/jobregistry/pom.xml     | 21 ++++++--
 platforms/java7/runtime/jsoncontrol/pom.xml     | 21 ++++++--
 platforms/java7/runtime/pom.xml                 |  2 +-
 platforms/java7/spi/graph/pom.xml               | 21 ++++++--
 platforms/java7/spi/pom.xml                     |  2 +-
 platforms/java7/spi/topology/pom.xml            | 19 +++++--
 .../java7/test/appservice-applications/pom.xml  | 19 +++++--
 platforms/java7/test/fvtiot/pom.xml             | 31 +++++++----
 platforms/java7/test/pom.xml                    |  2 +-
 platforms/java7/test/svt/pom.xml                | 25 ++++++---
 platforms/java7/utils/metrics/pom.xml           | 21 ++++++--
 platforms/java7/utils/pom.xml                   |  2 +-
 platforms/java7/utils/streamscope/pom.xml       | 21 ++++++--
 platforms/pom.xml                               |  2 +-
 pom.xml                                         | 41 +++++++++++---
 providers/development/pom.xml                   | 16 +++---
 providers/direct/pom.xml                        | 22 ++++----
 providers/iot/pom.xml                           | 16 +++---
 providers/pom.xml                               |  2 +-
 runtime/appservice/pom.xml                      |  8 +--
 runtime/etiao/pom.xml                           | 10 ++--
 runtime/jmxcontrol/pom.xml                      |  6 +--
 runtime/jobregistry/pom.xml                     |  6 +--
 runtime/jsoncontrol/pom.xml                     |  6 +--
 runtime/pom.xml                                 |  2 +-
 samples/apps/pom.xml                            | 12 ++---
 samples/connectors/pom.xml                      | 14 ++---
 samples/console/pom.xml                         |  4 +-
 samples/pom.xml                                 |  6 +--
 samples/scenarios/pom.xml                       |  4 +-
 samples/template/pom.xml                        | 30 +++++------
 samples/topology/pom.xml                        |  2 +-
 samples/utils/pom.xml                           |  6 +--
 spi/graph/pom.xml                               |  6 +--
 spi/pom.xml                                     |  2 +-
 spi/topology/pom.xml                            |  4 +-
 test/appservice-applications/pom.xml            |  4 +-
 test/fvtiot/pom.xml                             | 16 +++---
 test/pom.xml                                    |  2 +-
 test/svt/pom.xml                                | 10 ++--
 utils/metrics/pom.xml                           |  6 +--
 utils/pom.xml                                   |  2 +-
 utils/streamscope/pom.xml                       |  6 +--
 171 files changed, 1294 insertions(+), 796 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/analytics/math3/pom.xml
----------------------------------------------------------------------
diff --git a/analytics/math3/pom.xml b/analytics/math3/pom.xml
index 552772c..93114bb 100644
--- a/analytics/math3/pom.xml
+++ b/analytics/math3/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -47,20 +47,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/analytics/pom.xml
----------------------------------------------------------------------
diff --git a/analytics/pom.xml b/analytics/pom.xml
index 58c35f1..a7fb779 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -29,7 +29,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/analytics/sensors/pom.xml
----------------------------------------------------------------------
diff --git a/analytics/sensors/pom.xml b/analytics/sensors/pom.xml
index 3707220..598e14c 100644
--- a/analytics/sensors/pom.xml
+++ b/analytics/sensors/pom.xml
@@ -28,7 +28,7 @@
 
   <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,26 +36,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/api/execution/pom.xml
----------------------------------------------------------------------
diff --git a/api/execution/pom.xml b/api/execution/pom.xml
index 74b27b0..c6219a7 100644
--- a/api/execution/pom.xml
+++ b/api/execution/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/api/function/pom.xml
----------------------------------------------------------------------
diff --git a/api/function/pom.xml b/api/function/pom.xml
index 366bc3c..9b277ff 100644
--- a/api/function/pom.xml
+++ b/api/function/pom.xml
@@ -28,7 +28,7 @@
 
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/api/graph/pom.xml
----------------------------------------------------------------------
diff --git a/api/graph/pom.xml b/api/graph/pom.xml
index 3956fe5..f6dd8f7 100644
--- a/api/graph/pom.xml
+++ b/api/graph/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/api/oplet/pom.xml
----------------------------------------------------------------------
diff --git a/api/oplet/pom.xml b/api/oplet/pom.xml
index 08e48e8..ec0d015 100644
--- a/api/oplet/pom.xml
+++ b/api/oplet/pom.xml
@@ -28,7 +28,7 @@
 
   <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,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-window</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 06517fe..f9f0e39 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -29,7 +29,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/api/topology/pom.xml
----------------------------------------------------------------------
diff --git a/api/topology/pom.xml b/api/topology/pom.xml
index eec89ee..c3e8376 100644
--- a/api/topology/pom.xml
+++ b/api/topology/pom.xml
@@ -28,7 +28,7 @@
 
   <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,22 +36,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/api/window/pom.xml
----------------------------------------------------------------------
diff --git a/api/window/pom.xml b/api/window/pom.xml
index f68ab67..6c41d3e 100644
--- a/api/window/pom.xml
+++ b/api/window/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/apps/iot/pom.xml
----------------------------------------------------------------------
diff --git a/apps/iot/pom.xml b/apps/iot/pom.xml
index c921cb7..d852884 100644
--- a/apps/iot/pom.xml
+++ b/apps/iot/pom.xml
@@ -28,27 +28,27 @@
 
   <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>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 2319fa1..54f794b 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -29,7 +29,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/apps/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/apps/runtime/pom.xml b/apps/runtime/pom.xml
index 001bfa6..363a38d 100644
--- a/apps/runtime/pom.xml
+++ b/apps/runtime/pom.xml
@@ -28,28 +28,28 @@
 
   <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>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/command/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/command/pom.xml b/connectors/command/pom.xml
index cf3ea4c..90d7803 100644
--- a/connectors/command/pom.xml
+++ b/connectors/command/pom.xml
@@ -28,42 +28,42 @@
 
   <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>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/common/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/common/pom.xml b/connectors/common/pom.xml
index aaa96e0..96f3cc5 100644
--- a/connectors/common/pom.xml
+++ b/connectors/common/pom.xml
@@ -28,7 +28,7 @@
 
   <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,26 +36,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/csv/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/csv/pom.xml b/connectors/csv/pom.xml
index ce620d4..2563a41 100644
--- a/connectors/csv/pom.xml
+++ b/connectors/csv/pom.xml
@@ -28,7 +28,7 @@
 
   <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,20 +38,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/file/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/file/pom.xml b/connectors/file/pom.xml
index bf5d065..a43c21c 100644
--- a/connectors/file/pom.xml
+++ b/connectors/file/pom.xml
@@ -28,7 +28,7 @@
 
   <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,43 +36,43 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/http/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/http/pom.xml b/connectors/http/pom.xml
index 4866693..ba8b77c 100644
--- a/connectors/http/pom.xml
+++ b/connectors/http/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -52,13 +52,13 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/iot/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/iot/pom.xml b/connectors/iot/pom.xml
index fee160f..fbb5d2d 100644
--- a/connectors/iot/pom.xml
+++ b/connectors/iot/pom.xml
@@ -28,7 +28,7 @@
 
   <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,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/iotp/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/iotp/pom.xml b/connectors/iotp/pom.xml
index 5813c90..72dedbf 100644
--- a/connectors/iotp/pom.xml
+++ b/connectors/iotp/pom.xml
@@ -28,7 +28,7 @@
 
   <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,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/jdbc/pom.xml b/connectors/jdbc/pom.xml
index cdd2cf6..c31d3d2 100644
--- a/connectors/jdbc/pom.xml
+++ b/connectors/jdbc/pom.xml
@@ -28,7 +28,7 @@
 
   <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,38 +62,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/kafka/pom.xml b/connectors/kafka/pom.xml
index 9f7bd27..52fd8f1 100644
--- a/connectors/kafka/pom.xml
+++ b/connectors/kafka/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +49,7 @@
    -->
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -132,27 +132,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index 2af1c89..253afef 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -28,7 +28,7 @@
 
   <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,17 +65,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -86,27 +86,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 32197e5..9190cfa 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -29,7 +29,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pubsub/pom.xml b/connectors/pubsub/pom.xml
index 138c562..308d656 100644
--- a/connectors/pubsub/pom.xml
+++ b/connectors/pubsub/pom.xml
@@ -28,17 +28,17 @@
 
   <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>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/serial/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/serial/pom.xml b/connectors/serial/pom.xml
index 2e0b0fc..25515a1 100644
--- a/connectors/serial/pom.xml
+++ b/connectors/serial/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/websocket-base/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/websocket-base/pom.xml b/connectors/websocket-base/pom.xml
index 3e1b0a8..b99767a 100644
--- a/connectors/websocket-base/pom.xml
+++ b/connectors/websocket-base/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/websocket-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/websocket-jetty/pom.xml b/connectors/websocket-jetty/pom.xml
index 6bffee3..517174a 100644
--- a/connectors/websocket-jetty/pom.xml
+++ b/connectors/websocket-jetty/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/websocket-misc/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/websocket-misc/pom.xml b/connectors/websocket-misc/pom.xml
index bf3ff91..d20b00c 100644
--- a/connectors/websocket-misc/pom.xml
+++ b/connectors/websocket-misc/pom.xml
@@ -28,7 +28,7 @@
 
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/websocket-server/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/websocket-server/pom.xml b/connectors/websocket-server/pom.xml
index e529418..b3a9a60 100644
--- a/connectors/websocket-server/pom.xml
+++ b/connectors/websocket-server/pom.xml
@@ -28,7 +28,7 @@
 
   <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,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/connectors/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/websocket/pom.xml b/connectors/websocket/pom.xml
index fb8eb3f..c018fd7 100644
--- a/connectors/websocket/pom.xml
+++ b/connectors/websocket/pom.xml
@@ -28,7 +28,7 @@
 
   <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,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -81,34 +81,34 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 2b79fc0..35f7c91 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -29,7 +29,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/console/server/pom.xml
----------------------------------------------------------------------
diff --git a/console/server/pom.xml b/console/server/pom.xml
index fbd0c53..eb9fb04 100644
--- a/console/server/pom.xml
+++ b/console/server/pom.xml
@@ -28,7 +28,7 @@
 
   <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>${project.groupId}</groupId>
                   <artifactId>edgent-console-servlets</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
@@ -141,7 +141,7 @@
         prior to this module.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/console/servlets/pom.xml
----------------------------------------------------------------------
diff --git a/console/servlets/pom.xml b/console/servlets/pom.xml
index 50f14ba..8061847 100644
--- a/console/servlets/pom.xml
+++ b/console/servlets/pom.xml
@@ -29,7 +29,7 @@
   <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,7 +162,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index a60e332..be94f0e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -30,7 +30,7 @@
 
   <artifactId>edgent-distribution</artifactId>
 
-  <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+  <name>Apache Edgent (Java 8): Distribution</name>
 
   <build>
     <plugins>
@@ -78,113 +78,113 @@
 
     <!-- Providers -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-command</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-http</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -196,7 +196,7 @@
          of the development provider.
     -->
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/analytics/math3/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/analytics/math3/pom.xml b/platforms/android/analytics/math3/pom.xml
index 484cba3..7e108db 100644
--- a/platforms/android/analytics/math3/pom.xml
+++ b/platforms/android/analytics/math3/pom.xml
@@ -29,7 +29,7 @@
 
   <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,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/analytics/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/analytics/pom.xml b/platforms/android/analytics/pom.xml
index 3fd6c73..eca01a5 100644
--- a/platforms/android/analytics/pom.xml
+++ b/platforms/android/analytics/pom.xml
@@ -30,7 +30,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/analytics/sensors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/analytics/sensors/pom.xml b/platforms/android/analytics/sensors/pom.xml
index 1142079..1bf0538 100644
--- a/platforms/android/analytics/sensors/pom.xml
+++ b/platforms/android/analytics/sensors/pom.xml
@@ -29,7 +29,7 @@
 
   <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,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/android/hardware/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/android/hardware/pom.xml b/platforms/android/android/hardware/pom.xml
index 0da84c6..a583dea 100644
--- a/platforms/android/android/hardware/pom.xml
+++ b/platforms/android/android/hardware/pom.xml
@@ -29,7 +29,7 @@
 
   <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,7 +37,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/android/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/android/pom.xml b/platforms/android/android/pom.xml
index 047cd2a..772925a 100644
--- a/platforms/android/android/pom.xml
+++ b/platforms/android/android/pom.xml
@@ -30,7 +30,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/android/topology/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/android/topology/pom.xml b/platforms/android/android/topology/pom.xml
index 29b7dd8..2c36d13 100644
--- a/platforms/android/android/topology/pom.xml
+++ b/platforms/android/android/topology/pom.xml
@@ -29,7 +29,7 @@
 
   <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,12 +37,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/api/execution/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/api/execution/pom.xml b/platforms/android/api/execution/pom.xml
index b63902d..ca44dbc 100644
--- a/platforms/android/api/execution/pom.xml
+++ b/platforms/android/api/execution/pom.xml
@@ -29,7 +29,7 @@
 
   <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,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/api/function/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/api/function/pom.xml b/platforms/android/api/function/pom.xml
index 7d1ef14..95b0355 100644
--- a/platforms/android/api/function/pom.xml
+++ b/platforms/android/api/function/pom.xml
@@ -29,7 +29,7 @@
 
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/api/graph/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/api/graph/pom.xml b/platforms/android/api/graph/pom.xml
index 846cb39..a8a7610 100644
--- a/platforms/android/api/graph/pom.xml
+++ b/platforms/android/api/graph/pom.xml
@@ -29,7 +29,7 @@
 
   <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,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/api/oplet/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/api/oplet/pom.xml b/platforms/android/api/oplet/pom.xml
index 95bf8fd..b9ef08f 100644
--- a/platforms/android/api/oplet/pom.xml
+++ b/platforms/android/api/oplet/pom.xml
@@ -29,7 +29,7 @@
 
   <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,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-window</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/api/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/api/pom.xml b/platforms/android/api/pom.xml
index c3a8f33..3ca0ebd 100644
--- a/platforms/android/api/pom.xml
+++ b/platforms/android/api/pom.xml
@@ -30,7 +30,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/api/topology/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/api/topology/pom.xml b/platforms/android/api/topology/pom.xml
index 878f1fd..865f192 100644
--- a/platforms/android/api/topology/pom.xml
+++ b/platforms/android/api/topology/pom.xml
@@ -29,7 +29,7 @@
 
   <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,22 +66,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/api/window/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/api/window/pom.xml b/platforms/android/api/window/pom.xml
index 2181691..a2af80c 100644
--- a/platforms/android/api/window/pom.xml
+++ b/platforms/android/api/window/pom.xml
@@ -29,7 +29,7 @@
 
   <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,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/apps/iot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/apps/iot/pom.xml b/platforms/android/apps/iot/pom.xml
index 1b44ca4..d411cce 100644
--- a/platforms/android/apps/iot/pom.xml
+++ b/platforms/android/apps/iot/pom.xml
@@ -29,7 +29,7 @@
 
   <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,17 +62,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/apps/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/apps/pom.xml b/platforms/android/apps/pom.xml
index 9117696..b9c1de6 100644
--- a/platforms/android/apps/pom.xml
+++ b/platforms/android/apps/pom.xml
@@ -30,7 +30,7 @@
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/apps/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/apps/runtime/pom.xml b/platforms/android/apps/runtime/pom.xml
index 216c8fa..e3fdd30 100644
--- a/platforms/android/apps/runtime/pom.xml
+++ b/platforms/android/apps/runtime/pom.xml
@@ -29,7 +29,7 @@
 
   <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,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/command/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/command/pom.xml b/platforms/android/connectors/command/pom.xml
index 8493a21..d2ae21a 100644
--- a/platforms/android/connectors/command/pom.xml
+++ b/platforms/android/connectors/command/pom.xml
@@ -29,7 +29,7 @@
 
   <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,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/common/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/common/pom.xml b/platforms/android/connectors/common/pom.xml
index bdb407b..57292ef 100644
--- a/platforms/android/connectors/common/pom.xml
+++ b/platforms/android/connectors/common/pom.xml
@@ -29,7 +29,7 @@
 
   <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,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/csv/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/csv/pom.xml b/platforms/android/connectors/csv/pom.xml
index cfbc439..f2cb18b 100644
--- a/platforms/android/connectors/csv/pom.xml
+++ b/platforms/android/connectors/csv/pom.xml
@@ -29,7 +29,7 @@
 
   <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>

http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/file/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/file/pom.xml b/platforms/android/connectors/file/pom.xml
index d87fd74..b845f53 100644
--- a/platforms/android/connectors/file/pom.xml
+++ b/platforms/android/connectors/file/pom.xml
@@ -29,7 +29,7 @@
 
   <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,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${edgent.runtime.groupId}</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>