diff --git a/analytics/math3/pom.xml b/analytics/math3/pom.xml
index 93114bb..b2a2b89 100644
--- a/analytics/math3/pom.xml
+++ b/analytics/math3/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -47,20 +47,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/analytics/sensors/pom.xml b/analytics/sensors/pom.xml
index 598e14c..51059be 100644
--- a/analytics/sensors/pom.xml
+++ b/analytics/sensors/pom.xml
@@ -36,26 +36,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/api/execution/pom.xml b/api/execution/pom.xml
index c6219a7..0502503 100644
--- a/api/execution/pom.xml
+++ b/api/execution/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/api/graph/pom.xml b/api/graph/pom.xml
index f6dd8f7..7b8aa0e 100644
--- a/api/graph/pom.xml
+++ b/api/graph/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/api/oplet/pom.xml b/api/oplet/pom.xml
index ec0d015..cbd42d6 100644
--- a/api/oplet/pom.xml
+++ b/api/oplet/pom.xml
@@ -36,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-window</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/api/topology/pom.xml b/api/topology/pom.xml
index c3e8376..16d5af9 100644
--- a/api/topology/pom.xml
+++ b/api/topology/pom.xml
@@ -36,22 +36,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/api/window/pom.xml b/api/window/pom.xml
index 6c41d3e..6e5c7ac 100644
--- a/api/window/pom.xml
+++ b/api/window/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/apps/iot/pom.xml b/apps/iot/pom.xml
index d852884..0763ee8 100644
--- a/apps/iot/pom.xml
+++ b/apps/iot/pom.xml
@@ -32,23 +32,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/apps/runtime/pom.xml b/apps/runtime/pom.xml
index 363a38d..d558903 100644
--- a/apps/runtime/pom.xml
+++ b/apps/runtime/pom.xml
@@ -32,24 +32,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/connectors/command/pom.xml b/connectors/command/pom.xml
index 90d7803..56a5ec1 100644
--- a/connectors/command/pom.xml
+++ b/connectors/command/pom.xml
@@ -32,38 +32,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/connectors/common/pom.xml b/connectors/common/pom.xml
index 96f3cc5..64f218f 100644
--- a/connectors/common/pom.xml
+++ b/connectors/common/pom.xml
@@ -36,26 +36,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/connectors/csv/pom.xml b/connectors/csv/pom.xml
index 2563a41..2723b5c 100644
--- a/connectors/csv/pom.xml
+++ b/connectors/csv/pom.xml
@@ -38,20 +38,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/connectors/file/pom.xml b/connectors/file/pom.xml
index a43c21c..59830a3 100644
--- a/connectors/file/pom.xml
+++ b/connectors/file/pom.xml
@@ -36,43 +36,43 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/connectors/http/pom.xml b/connectors/http/pom.xml
index ba8b77c..b841dfd 100644
--- a/connectors/http/pom.xml
+++ b/connectors/http/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -52,13 +52,13 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/connectors/iot/pom.xml b/connectors/iot/pom.xml
index fbb5d2d..82254df 100644
--- a/connectors/iot/pom.xml
+++ b/connectors/iot/pom.xml
@@ -36,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/connectors/iotp/pom.xml b/connectors/iotp/pom.xml
index 72dedbf..e730385 100644
--- a/connectors/iotp/pom.xml
+++ b/connectors/iotp/pom.xml
@@ -36,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/connectors/jdbc/pom.xml b/connectors/jdbc/pom.xml
index c31d3d2..5e7ca2b 100644
--- a/connectors/jdbc/pom.xml
+++ b/connectors/jdbc/pom.xml
@@ -62,38 +62,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/connectors/kafka/pom.xml b/connectors/kafka/pom.xml
index 52fd8f1..fc3404b 100644
--- a/connectors/kafka/pom.xml
+++ b/connectors/kafka/pom.xml
@@ -49,7 +49,7 @@
    -->
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -132,27 +132,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index 253afef..b5fda3d 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -65,17 +65,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -86,27 +86,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/connectors/pubsub/pom.xml b/connectors/pubsub/pom.xml
index 308d656..4374e76 100644
--- a/connectors/pubsub/pom.xml
+++ b/connectors/pubsub/pom.xml
@@ -32,13 +32,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/connectors/serial/pom.xml b/connectors/serial/pom.xml
index 25515a1..60f5b9a 100644
--- a/connectors/serial/pom.xml
+++ b/connectors/serial/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/connectors/websocket-base/pom.xml b/connectors/websocket-base/pom.xml
index b99767a..0a204cf 100644
--- a/connectors/websocket-base/pom.xml
+++ b/connectors/websocket-base/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/connectors/websocket-jetty/pom.xml b/connectors/websocket-jetty/pom.xml
index 517174a..eb3df35 100644
--- a/connectors/websocket-jetty/pom.xml
+++ b/connectors/websocket-jetty/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/connectors/websocket-server/pom.xml b/connectors/websocket-server/pom.xml
index b3a9a60..50f6e73 100644
--- a/connectors/websocket-server/pom.xml
+++ b/connectors/websocket-server/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/connectors/websocket/pom.xml b/connectors/websocket/pom.xml
index c018fd7..2bb2fe8 100644
--- a/connectors/websocket/pom.xml
+++ b/connectors/websocket/pom.xml
@@ -36,17 +36,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -81,34 +81,34 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/console/server/pom.xml b/console/server/pom.xml
index eb9fb04..7c5944c 100644
--- a/console/server/pom.xml
+++ b/console/server/pom.xml
@@ -72,7 +72,7 @@
                -->
               <artifactItems>
                 <artifactItem>
-                  <groupId>${project.groupId}</groupId>
+                  <groupId>org.apache.edgent</groupId>
                   <artifactId>edgent-console-servlets</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
@@ -141,7 +141,7 @@
         prior to this module.
     -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>
diff --git a/console/servlets/pom.xml b/console/servlets/pom.xml
index 8061847..afd4376 100644
--- a/console/servlets/pom.xml
+++ b/console/servlets/pom.xml
@@ -162,7 +162,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index be94f0e..ef6009d 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -78,113 +78,113 @@
 
     <!-- Providers -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-command</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-http</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -196,7 +196,7 @@
          of the development provider.
     -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>
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 7e108db..ac297e3 100644
--- a/platforms/android/analytics/math3/pom.xml
+++ b/platforms/android/analytics/math3/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/analytics/sensors/pom.xml b/platforms/android/analytics/sensors/pom.xml
index 1bf0538..aab9e9b 100644
--- a/platforms/android/analytics/sensors/pom.xml
+++ b/platforms/android/analytics/sensors/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/android/hardware/pom.xml b/platforms/android/android/hardware/pom.xml
index a583dea..4e9fd35 100644
--- a/platforms/android/android/hardware/pom.xml
+++ b/platforms/android/android/hardware/pom.xml
@@ -37,7 +37,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/android/topology/pom.xml b/platforms/android/android/topology/pom.xml
index 2c36d13..5c4ce7a 100644
--- a/platforms/android/android/topology/pom.xml
+++ b/platforms/android/android/topology/pom.xml
@@ -37,12 +37,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/api/execution/pom.xml b/platforms/android/api/execution/pom.xml
index ca44dbc..4937440 100644
--- a/platforms/android/api/execution/pom.xml
+++ b/platforms/android/api/execution/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/api/graph/pom.xml b/platforms/android/api/graph/pom.xml
index a8a7610..cd1aa5f 100644
--- a/platforms/android/api/graph/pom.xml
+++ b/platforms/android/api/graph/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/api/oplet/pom.xml b/platforms/android/api/oplet/pom.xml
index b9ef08f..717d97b 100644
--- a/platforms/android/api/oplet/pom.xml
+++ b/platforms/android/api/oplet/pom.xml
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-window</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/api/topology/pom.xml b/platforms/android/api/topology/pom.xml
index 865f192..34e418a 100644
--- a/platforms/android/api/topology/pom.xml
+++ b/platforms/android/api/topology/pom.xml
@@ -66,22 +66,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/api/window/pom.xml b/platforms/android/api/window/pom.xml
index a2af80c..d3703c2 100644
--- a/platforms/android/api/window/pom.xml
+++ b/platforms/android/api/window/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/apps/iot/pom.xml b/platforms/android/apps/iot/pom.xml
index d411cce..b72b7b5 100644
--- a/platforms/android/apps/iot/pom.xml
+++ b/platforms/android/apps/iot/pom.xml
@@ -62,17 +62,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/apps/runtime/pom.xml b/platforms/android/apps/runtime/pom.xml
index e3fdd30..220b7ec 100644
--- a/platforms/android/apps/runtime/pom.xml
+++ b/platforms/android/apps/runtime/pom.xml
@@ -62,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/command/pom.xml b/platforms/android/connectors/command/pom.xml
index d2ae21a..9ca4e4f 100644
--- a/platforms/android/connectors/command/pom.xml
+++ b/platforms/android/connectors/command/pom.xml
@@ -62,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/common/pom.xml b/platforms/android/connectors/common/pom.xml
index 57292ef..c1f9a4d 100644
--- a/platforms/android/connectors/common/pom.xml
+++ b/platforms/android/connectors/common/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/file/pom.xml b/platforms/android/connectors/file/pom.xml
index b845f53..f2845c3 100644
--- a/platforms/android/connectors/file/pom.xml
+++ b/platforms/android/connectors/file/pom.xml
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/http/pom.xml b/platforms/android/connectors/http/pom.xml
index d321de7..1c1b6e9 100644
--- a/platforms/android/connectors/http/pom.xml
+++ b/platforms/android/connectors/http/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/iot/pom.xml b/platforms/android/connectors/iot/pom.xml
index 1339eae..aa19bd2 100644
--- a/platforms/android/connectors/iot/pom.xml
+++ b/platforms/android/connectors/iot/pom.xml
@@ -66,12 +66,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/iotp/pom.xml b/platforms/android/connectors/iotp/pom.xml
index 2a65211..1038db9 100644
--- a/platforms/android/connectors/iotp/pom.xml
+++ b/platforms/android/connectors/iotp/pom.xml
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/jdbc/pom.xml b/platforms/android/connectors/jdbc/pom.xml
index eeb6207..8557c82 100644
--- a/platforms/android/connectors/jdbc/pom.xml
+++ b/platforms/android/connectors/jdbc/pom.xml
@@ -66,12 +66,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/kafka/pom.xml b/platforms/android/connectors/kafka/pom.xml
index 7ce9ee2..4e8f566 100644
--- a/platforms/android/connectors/kafka/pom.xml
+++ b/platforms/android/connectors/kafka/pom.xml
@@ -80,7 +80,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/mqtt/pom.xml b/platforms/android/connectors/mqtt/pom.xml
index d9eeddf..d603f98 100644
--- a/platforms/android/connectors/mqtt/pom.xml
+++ b/platforms/android/connectors/mqtt/pom.xml
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/pubsub/pom.xml b/platforms/android/connectors/pubsub/pom.xml
index 9abf32c..77ecc2a 100644
--- a/platforms/android/connectors/pubsub/pom.xml
+++ b/platforms/android/connectors/pubsub/pom.xml
@@ -62,7 +62,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/serial/pom.xml b/platforms/android/connectors/serial/pom.xml
index dc13a49..e339926 100644
--- a/platforms/android/connectors/serial/pom.xml
+++ b/platforms/android/connectors/serial/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/websocket-base/pom.xml b/platforms/android/connectors/websocket-base/pom.xml
index 0df1f47..1bf201c 100644
--- a/platforms/android/connectors/websocket-base/pom.xml
+++ b/platforms/android/connectors/websocket-base/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/websocket-jetty/pom.xml b/platforms/android/connectors/websocket-jetty/pom.xml
index 63bf264..a98179a 100644
--- a/platforms/android/connectors/websocket-jetty/pom.xml
+++ b/platforms/android/connectors/websocket-jetty/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/websocket-server/pom.xml b/platforms/android/connectors/websocket-server/pom.xml
index 7806705..e32ee20 100644
--- a/platforms/android/connectors/websocket-server/pom.xml
+++ b/platforms/android/connectors/websocket-server/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml
index c8cfce7..01a23a4 100644
--- a/platforms/android/connectors/websocket/pom.xml
+++ b/platforms/android/connectors/websocket/pom.xml
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml
index f8f61d0..422566e 100644
--- a/platforms/android/distribution/pom.xml
+++ b/platforms/android/distribution/pom.xml
@@ -78,125 +78,125 @@
 
     <!-- Providers -->
     <!-- Not on android <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency-->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Android platform speficic -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-android-hardware</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-android-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-command</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-http</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -208,7 +208,7 @@
          of the development provider.
     -->
     <!-- Not on android <dependency>
-      <groupId>${project.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/providers/direct/pom.xml b/platforms/android/providers/direct/pom.xml
index 57931ad..0e2e1fc 100644
--- a/platforms/android/providers/direct/pom.xml
+++ b/platforms/android/providers/direct/pom.xml
@@ -66,32 +66,32 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-spi-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/providers/iot/pom.xml b/platforms/android/providers/iot/pom.xml
index c9e787b..51c8ace 100644
--- a/platforms/android/providers/iot/pom.xml
+++ b/platforms/android/providers/iot/pom.xml
@@ -62,37 +62,37 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/runtime/appservice/pom.xml b/platforms/android/runtime/appservice/pom.xml
index f887246..860924f 100644
--- a/platforms/android/runtime/appservice/pom.xml
+++ b/platforms/android/runtime/appservice/pom.xml
@@ -62,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/runtime/etiao/pom.xml b/platforms/android/runtime/etiao/pom.xml
index 4f9695e..5486b1e 100644
--- a/platforms/android/runtime/etiao/pom.xml
+++ b/platforms/android/runtime/etiao/pom.xml
@@ -66,17 +66,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/runtime/jobregistry/pom.xml b/platforms/android/runtime/jobregistry/pom.xml
index 122138c..b53e05b 100644
--- a/platforms/android/runtime/jobregistry/pom.xml
+++ b/platforms/android/runtime/jobregistry/pom.xml
@@ -62,12 +62,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/runtime/jsoncontrol/pom.xml b/platforms/android/runtime/jsoncontrol/pom.xml
index d3351be..beee9fc 100644
--- a/platforms/android/runtime/jsoncontrol/pom.xml
+++ b/platforms/android/runtime/jsoncontrol/pom.xml
@@ -66,12 +66,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/spi/graph/pom.xml b/platforms/android/spi/graph/pom.xml
index 3cf71ad..e0242fe 100644
--- a/platforms/android/spi/graph/pom.xml
+++ b/platforms/android/spi/graph/pom.xml
@@ -66,12 +66,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/spi/topology/pom.xml b/platforms/android/spi/topology/pom.xml
index de29c6c..ab0785f 100644
--- a/platforms/android/spi/topology/pom.xml
+++ b/platforms/android/spi/topology/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/utils/metrics/pom.xml b/platforms/android/utils/metrics/pom.xml
index 2c1e19d..5618128 100644
--- a/platforms/android/utils/metrics/pom.xml
+++ b/platforms/android/utils/metrics/pom.xml
@@ -66,7 +66,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/android/utils/streamscope/pom.xml b/platforms/android/utils/streamscope/pom.xml
index f9e7957..006d047 100644
--- a/platforms/android/utils/streamscope/pom.xml
+++ b/platforms/android/utils/streamscope/pom.xml
@@ -62,7 +62,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.android</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/analytics/math3/pom.xml b/platforms/java7/analytics/math3/pom.xml
index d92ba35..5f593c3 100644
--- a/platforms/java7/analytics/math3/pom.xml
+++ b/platforms/java7/analytics/math3/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -96,20 +96,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/analytics/sensors/pom.xml b/platforms/java7/analytics/sensors/pom.xml
index be6c5c9..6045b37 100644
--- a/platforms/java7/analytics/sensors/pom.xml
+++ b/platforms/java7/analytics/sensors/pom.xml
@@ -85,26 +85,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/api/execution/pom.xml b/platforms/java7/api/execution/pom.xml
index e532819..a8861a6 100644
--- a/platforms/java7/api/execution/pom.xml
+++ b/platforms/java7/api/execution/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/api/graph/pom.xml b/platforms/java7/api/graph/pom.xml
index bdd09aa..57ff163 100644
--- a/platforms/java7/api/graph/pom.xml
+++ b/platforms/java7/api/graph/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/api/oplet/pom.xml b/platforms/java7/api/oplet/pom.xml
index b15b00e..cd24ed8 100644
--- a/platforms/java7/api/oplet/pom.xml
+++ b/platforms/java7/api/oplet/pom.xml
@@ -85,17 +85,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-window</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/api/topology/pom.xml b/platforms/java7/api/topology/pom.xml
index a3e0711..b5b5242 100644
--- a/platforms/java7/api/topology/pom.xml
+++ b/platforms/java7/api/topology/pom.xml
@@ -125,22 +125,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/api/window/pom.xml b/platforms/java7/api/window/pom.xml
index 572515b..21a093c 100644
--- a/platforms/java7/api/window/pom.xml
+++ b/platforms/java7/api/window/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/apps/iot/pom.xml b/platforms/java7/apps/iot/pom.xml
index 2fd7272..06b6b56 100644
--- a/platforms/java7/apps/iot/pom.xml
+++ b/platforms/java7/apps/iot/pom.xml
@@ -81,23 +81,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/platforms/java7/apps/runtime/pom.xml b/platforms/java7/apps/runtime/pom.xml
index 9ca129a..22567e4 100644
--- a/platforms/java7/apps/runtime/pom.xml
+++ b/platforms/java7/apps/runtime/pom.xml
@@ -81,24 +81,24 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jobregistry</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/platforms/java7/connectors/command/pom.xml b/platforms/java7/connectors/command/pom.xml
index 3590770..5a3e331 100644
--- a/platforms/java7/connectors/command/pom.xml
+++ b/platforms/java7/connectors/command/pom.xml
@@ -81,38 +81,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/connectors/common/pom.xml b/platforms/java7/connectors/common/pom.xml
index 32f7233..817aeed 100644
--- a/platforms/java7/connectors/common/pom.xml
+++ b/platforms/java7/connectors/common/pom.xml
@@ -85,26 +85,26 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/connectors/csv/pom.xml b/platforms/java7/connectors/csv/pom.xml
index 721955c..8cd7eea 100644
--- a/platforms/java7/connectors/csv/pom.xml
+++ b/platforms/java7/connectors/csv/pom.xml
@@ -87,20 +87,20 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/platforms/java7/connectors/file/pom.xml b/platforms/java7/connectors/file/pom.xml
index 5981306..d2de935 100644
--- a/platforms/java7/connectors/file/pom.xml
+++ b/platforms/java7/connectors/file/pom.xml
@@ -85,43 +85,43 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-oplet</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/connectors/http/pom.xml b/platforms/java7/connectors/http/pom.xml
index b1a422a..8d42352 100644
--- a/platforms/java7/connectors/http/pom.xml
+++ b/platforms/java7/connectors/http/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -101,13 +101,13 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/connectors/iot/pom.xml b/platforms/java7/connectors/iot/pom.xml
index 8ae7a33..76ad9fc 100644
--- a/platforms/java7/connectors/iot/pom.xml
+++ b/platforms/java7/connectors/iot/pom.xml
@@ -85,12 +85,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/connectors/iotp/pom.xml b/platforms/java7/connectors/iotp/pom.xml
index 205319f..b16a57a 100644
--- a/platforms/java7/connectors/iotp/pom.xml
+++ b/platforms/java7/connectors/iotp/pom.xml
@@ -85,17 +85,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/connectors/jdbc/pom.xml b/platforms/java7/connectors/jdbc/pom.xml
index 8fda586..894f89f 100644
--- a/platforms/java7/connectors/jdbc/pom.xml
+++ b/platforms/java7/connectors/jdbc/pom.xml
@@ -106,38 +106,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/connectors/kafka/pom.xml b/platforms/java7/connectors/kafka/pom.xml
index d446b2a..9511f15 100644
--- a/platforms/java7/connectors/kafka/pom.xml
+++ b/platforms/java7/connectors/kafka/pom.xml
@@ -99,7 +99,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -182,27 +182,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/connectors/mqtt/pom.xml b/platforms/java7/connectors/mqtt/pom.xml
index 4b77212..d98ad5c 100644
--- a/platforms/java7/connectors/mqtt/pom.xml
+++ b/platforms/java7/connectors/mqtt/pom.xml
@@ -85,17 +85,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -106,27 +106,27 @@
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/connectors/pubsub/pom.xml b/platforms/java7/connectors/pubsub/pom.xml
index 0a4ce67..18f0e71 100644
--- a/platforms/java7/connectors/pubsub/pom.xml
+++ b/platforms/java7/connectors/pubsub/pom.xml
@@ -81,13 +81,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/platforms/java7/connectors/serial/pom.xml b/platforms/java7/connectors/serial/pom.xml
index 14fd296..ca6545b 100644
--- a/platforms/java7/connectors/serial/pom.xml
+++ b/platforms/java7/connectors/serial/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/connectors/websocket-base/pom.xml b/platforms/java7/connectors/websocket-base/pom.xml
index 34b46a2..2d93812 100644
--- a/platforms/java7/connectors/websocket-base/pom.xml
+++ b/platforms/java7/connectors/websocket-base/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/connectors/websocket-jetty/pom.xml b/platforms/java7/connectors/websocket-jetty/pom.xml
index bb6e574..4143d3a 100644
--- a/platforms/java7/connectors/websocket-jetty/pom.xml
+++ b/platforms/java7/connectors/websocket-jetty/pom.xml
@@ -95,7 +95,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/connectors/websocket-server/pom.xml b/platforms/java7/connectors/websocket-server/pom.xml
index a7d0bfa..c78d851 100644
--- a/platforms/java7/connectors/websocket-server/pom.xml
+++ b/platforms/java7/connectors/websocket-server/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/connectors/websocket/pom.xml b/platforms/java7/connectors/websocket/pom.xml
index ac590c2..a879b23 100644
--- a/platforms/java7/connectors/websocket/pom.xml
+++ b/platforms/java7/connectors/websocket/pom.xml
@@ -85,17 +85,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-misc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-base</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -130,34 +130,34 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/platforms/java7/console/server/pom.xml b/platforms/java7/console/server/pom.xml
index 0710f5a..3b6e787 100644
--- a/platforms/java7/console/server/pom.xml
+++ b/platforms/java7/console/server/pom.xml
@@ -60,7 +60,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${project.groupId}</groupId>
+                  <groupId>org.apache.edgent.java7</groupId>
                   <artifactId>edgent-console-servlets</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
@@ -180,7 +180,7 @@
         prior to this module.
     -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>
diff --git a/platforms/java7/console/servlets/pom.xml b/platforms/java7/console/servlets/pom.xml
index 0b4a24b..a48cf9f 100644
--- a/platforms/java7/console/servlets/pom.xml
+++ b/platforms/java7/console/servlets/pom.xml
@@ -123,7 +123,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/distribution/pom.xml b/platforms/java7/distribution/pom.xml
index 2fcddeb..4122ac7 100644
--- a/platforms/java7/distribution/pom.xml
+++ b/platforms/java7/distribution/pom.xml
@@ -78,113 +78,113 @@
 
     <!-- Providers -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Analytics -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Utils -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Connectors -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-command</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-common</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-csv</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-http</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-websocket-jetty</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -196,7 +196,7 @@
          of the development provider.
     -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-console-servlets</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>war</type>
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/providers/development/pom.xml b/platforms/java7/providers/development/pom.xml
index 4bd3fd4..e9601bb 100644
--- a/platforms/java7/providers/development/pom.xml
+++ b/platforms/java7/providers/development/pom.xml
@@ -85,40 +85,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/providers/direct/pom.xml b/platforms/java7/providers/direct/pom.xml
index 8e23cce..1e18661 100644
--- a/platforms/java7/providers/direct/pom.xml
+++ b/platforms/java7/providers/direct/pom.xml
@@ -87,7 +87,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${project.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>
@@ -103,51 +103,51 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-spi-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/providers/iot/pom.xml b/platforms/java7/providers/iot/pom.xml
index 29653ff..e3d802b 100644
--- a/platforms/java7/providers/iot/pom.xml
+++ b/platforms/java7/providers/iot/pom.xml
@@ -81,37 +81,37 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/runtime/appservice/pom.xml b/platforms/java7/runtime/appservice/pom.xml
index a8ef363..f4aedf6 100644
--- a/platforms/java7/runtime/appservice/pom.xml
+++ b/platforms/java7/runtime/appservice/pom.xml
@@ -81,19 +81,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Just needed to make sure it is scheduled before this module in the reactor -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-test-appservice-applications</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/platforms/java7/runtime/etiao/pom.xml b/platforms/java7/runtime/etiao/pom.xml
index 95b1ac8..5052414 100644
--- a/platforms/java7/runtime/etiao/pom.xml
+++ b/platforms/java7/runtime/etiao/pom.xml
@@ -85,23 +85,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/runtime/jmxcontrol/pom.xml b/platforms/java7/runtime/jmxcontrol/pom.xml
index 36cda27..acf4287 100644
--- a/platforms/java7/runtime/jmxcontrol/pom.xml
+++ b/platforms/java7/runtime/jmxcontrol/pom.xml
@@ -85,12 +85,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/runtime/jobregistry/pom.xml b/platforms/java7/runtime/jobregistry/pom.xml
index 4ade1d9..c3be453 100644
--- a/platforms/java7/runtime/jobregistry/pom.xml
+++ b/platforms/java7/runtime/jobregistry/pom.xml
@@ -81,12 +81,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/runtime/jsoncontrol/pom.xml b/platforms/java7/runtime/jsoncontrol/pom.xml
index cfbadcf..602b0af 100644
--- a/platforms/java7/runtime/jsoncontrol/pom.xml
+++ b/platforms/java7/runtime/jsoncontrol/pom.xml
@@ -85,12 +85,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml
index 8fc3d3f..e707d14 100644
--- a/platforms/java7/spi/graph/pom.xml
+++ b/platforms/java7/spi/graph/pom.xml
@@ -85,12 +85,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml
index 81f72e4..fc1efdd 100644
--- a/platforms/java7/spi/topology/pom.xml
+++ b/platforms/java7/spi/topology/pom.xml
@@ -85,7 +85,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/test/appservice-applications/pom.xml b/platforms/java7/test/appservice-applications/pom.xml
index 56bcac4..7bd71c4 100644
--- a/platforms/java7/test/appservice-applications/pom.xml
+++ b/platforms/java7/test/appservice-applications/pom.xml
@@ -91,7 +91,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/test/fvtiot/pom.xml b/platforms/java7/test/fvtiot/pom.xml
index 274604f..912b202 100644
--- a/platforms/java7/test/fvtiot/pom.xml
+++ b/platforms/java7/test/fvtiot/pom.xml
@@ -83,7 +83,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${project.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>
@@ -99,38 +99,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml
index b1ffdae..1df2b8f 100644
--- a/platforms/java7/test/svt/pom.xml
+++ b/platforms/java7/test/svt/pom.xml
@@ -85,22 +85,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/platforms/java7/utils/metrics/pom.xml b/platforms/java7/utils/metrics/pom.xml
index b926536..3ec9225 100644
--- a/platforms/java7/utils/metrics/pom.xml
+++ b/platforms/java7/utils/metrics/pom.xml
@@ -85,14 +85,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.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>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/platforms/java7/utils/streamscope/pom.xml b/platforms/java7/utils/streamscope/pom.xml
index 6bcd4da..0517234 100644
--- a/platforms/java7/utils/streamscope/pom.xml
+++ b/platforms/java7/utils/streamscope/pom.xml
@@ -81,14 +81,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.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>${project.groupId}</groupId>
+      <groupId>org.apache.edgent.java7</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/pom.xml b/pom.xml
index b20ffa4..55f9ea3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,10 +365,10 @@
           <execution>
             <goals>
               <goal>scan</goal>
-              <goal>analyze</goal>
+              <!--goal>analyze</goal-->
             </goals>
             <configuration>
-              <failOnSeverity>MAJOR</failOnSeverity>
+              <!--failOnSeverity>MAJOR</failOnSeverity-->
             </configuration>
           </execution>
         </executions>
diff --git a/providers/development/pom.xml b/providers/development/pom.xml
index 1b82b41..692cf9e 100644
--- a/providers/development/pom.xml
+++ b/providers/development/pom.xml
@@ -36,40 +36,40 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jmxcontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-streamscope</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/providers/direct/pom.xml b/providers/direct/pom.xml
index 5e44f29..f09f530 100644
--- a/providers/direct/pom.xml
+++ b/providers/direct/pom.xml
@@ -49,7 +49,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${project.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,51 +65,51 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-spi-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-etiao</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/providers/iot/pom.xml b/providers/iot/pom.xml
index c5b7f8d..001276c 100644
--- a/providers/iot/pom.xml
+++ b/providers/iot/pom.xml
@@ -32,37 +32,37 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-appservice</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-apps-runtime</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/runtime/appservice/pom.xml b/runtime/appservice/pom.xml
index f8db481..5ca2c5e 100644
--- a/runtime/appservice/pom.xml
+++ b/runtime/appservice/pom.xml
@@ -32,19 +32,19 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Just needed to make sure it is scheduled before this module in the reactor -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-test-appservice-applications</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/runtime/etiao/pom.xml b/runtime/etiao/pom.xml
index 0351975..e7a51be 100644
--- a/runtime/etiao/pom.xml
+++ b/runtime/etiao/pom.xml
@@ -36,23 +36,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-spi-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/runtime/jmxcontrol/pom.xml b/runtime/jmxcontrol/pom.xml
index c09128c..3c6151c 100644
--- a/runtime/jmxcontrol/pom.xml
+++ b/runtime/jmxcontrol/pom.xml
@@ -36,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/runtime/jobregistry/pom.xml b/runtime/jobregistry/pom.xml
index b4e6ee9..3a32bb5 100644
--- a/runtime/jobregistry/pom.xml
+++ b/runtime/jobregistry/pom.xml
@@ -32,12 +32,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/runtime/jsoncontrol/pom.xml b/runtime/jsoncontrol/pom.xml
index a6f0bb2..5733ca1 100644
--- a/runtime/jsoncontrol/pom.xml
+++ b/runtime/jsoncontrol/pom.xml
@@ -36,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-function</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/samples/apps/pom.xml b/samples/apps/pom.xml
index bf0750a..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>
@@ -35,40 +35,40 @@
     <!-- parent pom has Platforms and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-iot</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>${edgent.runtime.version}</version>
     </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 cd14499..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>
@@ -35,45 +35,45 @@
     <!-- parent pom has Platforms and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-mqtt</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-kafka</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-jdbc</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-serial</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-file</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </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 335336b..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>
@@ -35,12 +35,12 @@
     <!-- parent pom has Platforms and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
diff --git a/samples/pom.xml b/samples/pom.xml
index 4206c9c..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>
@@ -116,17 +116,17 @@
 
     <!-- Other common sample dependencies -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
diff --git a/samples/scenarios/pom.xml b/samples/scenarios/pom.xml
index f18a207..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>
@@ -58,20 +58,20 @@
     <!-- parent pom has Providers and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-connectors-iotp</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </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 db0c7c7..8d3f5cb 100644
--- a/samples/template/pom.xml
+++ b/samples/template/pom.xml
@@ -69,7 +69,7 @@
 
     <!-- declare the Edgent provider(s) being used -->
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
diff --git a/samples/topology/pom.xml b/samples/topology/pom.xml
index 77f24a1..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>
@@ -35,15 +35,15 @@
     <!-- parent pom has Providers and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-analytics-math3</artifactId>
       <version>${edgent.runtime.version}</version>
     </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 c806cde..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>
@@ -35,17 +35,17 @@
     <!-- parent pom has Providers and SLF4J dependencies -->
 
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-analytics-sensors</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>${edgent.runtime.groupId}</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>${edgent.runtime.version}</version>
     </dependency>
diff --git a/spi/graph/pom.xml b/spi/graph/pom.xml
index 5042fb2..7e4bd98 100644
--- a/spi/graph/pom.xml
+++ b/spi/graph/pom.xml
@@ -36,12 +36,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-execution</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-graph</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/spi/topology/pom.xml b/spi/topology/pom.xml
index 57bdb0f..b664cad 100644
--- a/spi/topology/pom.xml
+++ b/spi/topology/pom.xml
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/test/appservice-applications/pom.xml b/test/appservice-applications/pom.xml
index a13256c..493b7dc 100644
--- a/test/appservice-applications/pom.xml
+++ b/test/appservice-applications/pom.xml
@@ -32,7 +32,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/test/fvtiot/pom.xml b/test/fvtiot/pom.xml
index 4bfbea9..5fdd905 100644
--- a/test/fvtiot/pom.xml
+++ b/test/fvtiot/pom.xml
@@ -45,7 +45,7 @@
             <configuration>
               <artifactItems>
                 <artifactItem>
-                  <groupId>${project.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,38 +61,38 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-connectors-pubsub</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-runtime-jsoncontrol</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-direct</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-apps-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-iot</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <scope>test</scope>
diff --git a/test/svt/pom.xml b/test/svt/pom.xml
index b9a11f7..f46fbee 100644
--- a/test/svt/pom.xml
+++ b/test/svt/pom.xml
@@ -36,22 +36,22 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-console-server</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-utils-metrics</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-providers-development</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
diff --git a/utils/metrics/pom.xml b/utils/metrics/pom.xml
index ec217ed..a3e26d1 100644
--- a/utils/metrics/pom.xml
+++ b/utils/metrics/pom.xml
@@ -36,14 +36,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.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>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>
diff --git a/utils/streamscope/pom.xml b/utils/streamscope/pom.xml
index 0ca790a..0e1ab8c 100644
--- a/utils/streamscope/pom.xml
+++ b/utils/streamscope/pom.xml
@@ -32,14 +32,14 @@
 
   <dependencies>
     <dependency>
-      <groupId>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.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>${project.groupId}</groupId>
+      <groupId>org.apache.edgent</groupId>
       <artifactId>edgent-api-topology</artifactId>
       <version>1.3.0-SNAPSHOT</version>
       <type>test-jar</type>