commit a02c037d32ecc14345f9e3519bb16e21d5e9151f
author Christofer Dutz <christofer.dutz@c-ware.de> Thu Oct 12 12:47:26 2017 +0200
committer Christofer Dutz <christofer.dutz@c-ware.de> Thu Oct 12 12:47:26 2017 +0200
tree 873c52b3fbb0733fa422f597aad4ed98e762fe08
parent 4a30ca187ea97406dd45dcd1f3eb0fc642443bad
parent 0b2630256d79e3674ffb10609499b1d91a68a2b7

Merge remote-tracking branch 'origin/feature/maven' into feature/maven

analytics/math3/pom.xml

diff --git a/analytics/math3/pom.xml b/analytics/math3/pom.xml
index 53f1544..a0e904d 100644
--- a/analytics/math3/pom.xml
+++ b/analytics/math3/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Analytics: Math3</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

analytics/math3/src/main/resources/META-INF/NOTICE

diff --git a/analytics/math3/src/main/resources/META-INF/NOTICE b/analytics/math3/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 005d3d3..0000000
--- a/analytics/math3/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Analytics: Math3
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

analytics/sensors/pom.xml

diff --git a/analytics/sensors/pom.xml b/analytics/sensors/pom.xml
index e14f2b7..8417392 100644
--- a/analytics/sensors/pom.xml
+++ b/analytics/sensors/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Analytics: Sensors</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

analytics/sensors/src/main/resources/META-INF/NOTICE

diff --git a/analytics/sensors/src/main/resources/META-INF/NOTICE b/analytics/sensors/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 34e9b1d..0000000
--- a/analytics/sensors/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Analytics: Sensors
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

api/execution/pom.xml

diff --git a/api/execution/pom.xml b/api/execution/pom.xml
index d95028c..789afee 100644
--- a/api/execution/pom.xml
+++ b/api/execution/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: API: Execution</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

api/execution/src/main/resources/META-INF/NOTICE

diff --git a/api/execution/src/main/resources/META-INF/NOTICE b/api/execution/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 0eefc5f..0000000
--- a/api/execution/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: API: Execution
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

api/function/pom.xml

diff --git a/api/function/pom.xml b/api/function/pom.xml
index 0bf67d4..bdb7a15 100644
--- a/api/function/pom.xml
+++ b/api/function/pom.xml
@@ -31,4 +31,8 @@
 
   <name>Apache Edgent: API: Function</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
 </project>
\ No newline at end of file

api/function/src/main/resources/META-INF/NOTICE

diff --git a/api/function/src/main/resources/META-INF/NOTICE b/api/function/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index e5e3260..0000000
--- a/api/function/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: API: Function
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

api/graph/pom.xml

diff --git a/api/graph/pom.xml b/api/graph/pom.xml
index 0bacf1c..c123416 100644
--- a/api/graph/pom.xml
+++ b/api/graph/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: API: Graph</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

api/graph/src/main/resources/META-INF/NOTICE

diff --git a/api/graph/src/main/resources/META-INF/NOTICE b/api/graph/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index b12d096..0000000
--- a/api/graph/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: API: Graph
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

api/oplet/pom.xml

diff --git a/api/oplet/pom.xml b/api/oplet/pom.xml
index 3816a6d..e3ad160 100644
--- a/api/oplet/pom.xml
+++ b/api/oplet/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: API: Oplet</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

api/oplet/src/main/resources/META-INF/NOTICE

diff --git a/api/oplet/src/main/resources/META-INF/NOTICE b/api/oplet/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 690b7b8..0000000
--- a/api/oplet/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: API: Oplet
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

api/topology/pom.xml

diff --git a/api/topology/pom.xml b/api/topology/pom.xml
index 0f109fb..020b3c4 100644
--- a/api/topology/pom.xml
+++ b/api/topology/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: API: Topology</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

api/topology/src/main/resources/META-INF/NOTICE

diff --git a/api/topology/src/main/resources/META-INF/NOTICE b/api/topology/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 9689467..0000000
--- a/api/topology/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: API: Topology
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

api/window/pom.xml

diff --git a/api/window/pom.xml b/api/window/pom.xml
index 5fc6b33..355c72d 100644
--- a/api/window/pom.xml
+++ b/api/window/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: API: Window</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

api/window/src/main/resources/META-INF/NOTICE

diff --git a/api/window/src/main/resources/META-INF/NOTICE b/api/window/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 907cfa1..0000000
--- a/api/window/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: API: Window
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

apps/iot/src/main/resources/META-INF/NOTICE

diff --git a/apps/iot/src/main/resources/META-INF/NOTICE b/apps/iot/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 9498e20..0000000
--- a/apps/iot/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Apps: Iot
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

apps/runtime/src/main/resources/META-INF/NOTICE

diff --git a/apps/runtime/src/main/resources/META-INF/NOTICE b/apps/runtime/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index c67bbfa..0000000
--- a/apps/runtime/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Apps: Runtime
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

connectors/command/src/main/resources/META-INF/NOTICE

diff --git a/connectors/command/src/main/resources/META-INF/NOTICE b/connectors/command/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 7f32109..0000000
--- a/connectors/command/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Connectors: Command
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

connectors/common/pom.xml

diff --git a/connectors/common/pom.xml b/connectors/common/pom.xml
index 7fc16d5..648e147 100644
--- a/connectors/common/pom.xml
+++ b/connectors/common/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: Common</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

connectors/common/src/main/resources/META-INF/NOTICE

diff --git a/connectors/common/src/main/resources/META-INF/NOTICE b/connectors/common/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index afa89d5..0000000
--- a/connectors/common/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Edgent: Connectors: Common
-Copyright 2016-2017 The Apache Software Foundation
-
-Apache Edgent is currently undergoing Incubation at the Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-===============================================================================
-
-Portions of this software were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016

connectors/csv/src/main/resources/META-INF/NOTICE

diff --git a/connectors/csv/src/main/resources/META-INF/NOTICE b/connectors/csv/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index e172570..0000000
--- a/connectors/csv/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Connectors: Csv
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

connectors/file/pom.xml

diff --git a/connectors/file/pom.xml b/connectors/file/pom.xml
index 9a5c323..df2a833 100644
--- a/connectors/file/pom.xml
+++ b/connectors/file/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: File</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

connectors/file/src/main/resources/META-INF/NOTICE

diff --git a/connectors/file/src/main/resources/META-INF/NOTICE b/connectors/file/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index c4fb1e4..0000000
--- a/connectors/file/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: File
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/http/pom.xml

diff --git a/connectors/http/pom.xml b/connectors/http/pom.xml
index a1572f4..a6ed242 100644
--- a/connectors/http/pom.xml
+++ b/connectors/http/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: HTTP</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

connectors/http/src/main/resources/META-INF/NOTICE

diff --git a/connectors/http/src/main/resources/META-INF/NOTICE b/connectors/http/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 3cba394..0000000
--- a/connectors/http/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: HTTP
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/iot/pom.xml

diff --git a/connectors/iot/pom.xml b/connectors/iot/pom.xml
index e9b6a1d..6625176 100644
--- a/connectors/iot/pom.xml
+++ b/connectors/iot/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: IoT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

connectors/iot/src/main/resources/META-INF/NOTICE

diff --git a/connectors/iot/src/main/resources/META-INF/NOTICE b/connectors/iot/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 7dbcf86..0000000
--- a/connectors/iot/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: IoT
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/iotp/pom.xml

diff --git a/connectors/iotp/pom.xml b/connectors/iotp/pom.xml
index a826f13..abe8d88 100644
--- a/connectors/iotp/pom.xml
+++ b/connectors/iotp/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: IoTP</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

connectors/iotp/src/main/resources/META-INF/NOTICE

diff --git a/connectors/iotp/src/main/resources/META-INF/NOTICE b/connectors/iotp/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 90bcd00..0000000
--- a/connectors/iotp/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: IoTP
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/jdbc/pom.xml

diff --git a/connectors/jdbc/pom.xml b/connectors/jdbc/pom.xml
index c259be3..9e20cb2 100644
--- a/connectors/jdbc/pom.xml
+++ b/connectors/jdbc/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: JDBC</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

connectors/jdbc/src/main/resources/META-INF/NOTICE

diff --git a/connectors/jdbc/src/main/resources/META-INF/NOTICE b/connectors/jdbc/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index ae60ff1..0000000
--- a/connectors/jdbc/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: JDBC
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/kafka/pom.xml

diff --git a/connectors/kafka/pom.xml b/connectors/kafka/pom.xml
index 0b447ab..f67f170 100644
--- a/connectors/kafka/pom.xml
+++ b/connectors/kafka/pom.xml
@@ -31,21 +31,23 @@
 
   <name>Apache Edgent: Connectors: Kafka</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <!--
-  The pom for kafka includes dependencies that don't make sense for us.
-  In at least one case kafka dependencies include a slf4j *implementation* jar
-  and that conflicts with our samples' binding to a particular
-  version of slf4j implementation.
-  This all seems like fallout from, I believe, the kafka jars containing
-  the code for their cli tools too, and possibly tests, which need things like:
-    slf4j-log4j12, snappy-java, jline, jopt-simple, junit-3.8.1
-  
-  So at least for now, avoid transitive and just match our ant/gradle based
-  config.  Include only the exact dependencies that our kafka
-  dependency requires to function properly.
-  -->
+   The pom for kafka includes dependencies that don't make sense for us.
+   In at least one case kafka dependencies include a slf4j *implementation* jar
+   and that conflicts with our samples' binding to a particular
+   version of slf4j implementation.
+   This all seems like fallout from, I believe, the kafka jars containing
+   the code for their cli tools too, and possibly tests, which need things like:
+     slf4j-log4j12, snappy-java, jline, jopt-simple, junit-3.8.1
 
-
+   So at least for now, avoid transitive and just match our ant/gradle based
+   config.  Include only the exact dependencies that our kafka
+   dependency requires to function properly.
+   -->
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

connectors/kafka/src/main/resources/META-INF/NOTICE

diff --git a/connectors/kafka/src/main/resources/META-INF/NOTICE b/connectors/kafka/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 2cfd4d6..0000000
--- a/connectors/kafka/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: Kafka
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/mqtt/pom.xml

diff --git a/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index fc9b3ce..4f25190 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: MQTT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

connectors/mqtt/src/main/resources/META-INF/NOTICE

diff --git a/connectors/mqtt/src/main/resources/META-INF/NOTICE b/connectors/mqtt/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 3cf6fe7..0000000
--- a/connectors/mqtt/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: MQTT
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/pubsub/src/main/resources/META-INF/NOTICE

diff --git a/connectors/pubsub/src/main/resources/META-INF/NOTICE b/connectors/pubsub/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 576c82d..0000000
--- a/connectors/pubsub/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Connectors: Pubsub
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

connectors/serial/pom.xml

diff --git a/connectors/serial/pom.xml b/connectors/serial/pom.xml
index 8fc5144..77cd4f2 100644
--- a/connectors/serial/pom.xml
+++ b/connectors/serial/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: Serial</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

connectors/serial/src/main/resources/META-INF/NOTICE

diff --git a/connectors/serial/src/main/resources/META-INF/NOTICE b/connectors/serial/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index f20ee55..0000000
--- a/connectors/serial/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: Serial
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/websocket-base/pom.xml

diff --git a/connectors/websocket-base/pom.xml b/connectors/websocket-base/pom.xml
index e48d0f9..0a45088 100644
--- a/connectors/websocket-base/pom.xml
+++ b/connectors/websocket-base/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: Websocket: Base</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

connectors/websocket-base/src/main/resources/META-INF/NOTICE

diff --git a/connectors/websocket-base/src/main/resources/META-INF/NOTICE b/connectors/websocket-base/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index cb069d4..0000000
--- a/connectors/websocket-base/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: Websocket: Base
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/websocket-jetty/pom.xml

diff --git a/connectors/websocket-jetty/pom.xml b/connectors/websocket-jetty/pom.xml
index f839d44..4423837 100644
--- a/connectors/websocket-jetty/pom.xml
+++ b/connectors/websocket-jetty/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: Websocket: Jetty</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.connectors</groupId>

connectors/websocket-jetty/src/main/resources/META-INF/NOTICE

diff --git a/connectors/websocket-jetty/src/main/resources/META-INF/NOTICE b/connectors/websocket-jetty/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 3eb9e90..0000000
--- a/connectors/websocket-jetty/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: Websocket: Jetty
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/websocket-misc/pom.xml

diff --git a/connectors/websocket-misc/pom.xml b/connectors/websocket-misc/pom.xml
index 4c46023..ba72562 100644
--- a/connectors/websocket-misc/pom.xml
+++ b/connectors/websocket-misc/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: Websocket: Misc</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>javax.websocket</groupId>

connectors/websocket-misc/src/main/resources/META-INF/NOTICE

diff --git a/connectors/websocket-misc/src/main/resources/META-INF/NOTICE b/connectors/websocket-misc/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 337513b..0000000
--- a/connectors/websocket-misc/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: Websocket: Misc
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

connectors/websocket-server/pom.xml

diff --git a/connectors/websocket-server/pom.xml b/connectors/websocket-server/pom.xml
index 91f2e96..634c4d6 100644
--- a/connectors/websocket-server/pom.xml
+++ b/connectors/websocket-server/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: Websocket: Server</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.connectors</groupId>

connectors/websocket-server/src/main/resources/META-INF/NOTICE

diff --git a/connectors/websocket-server/src/main/resources/META-INF/NOTICE b/connectors/websocket-server/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 673deec..0000000
--- a/connectors/websocket-server/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-Apache Edgent: Connectors: Websocket-server
-Copyright 2016-2017 The Apache Software Foundation
-
-Apache Edgent is currently undergoing Incubation at the Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-===============================================================================
-
-Portions of this software were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016

connectors/websocket/pom.xml

diff --git a/connectors/websocket/pom.xml b/connectors/websocket/pom.xml
index 4284c12..1f5204c 100644
--- a/connectors/websocket/pom.xml
+++ b/connectors/websocket/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Connectors: Websocket</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.connectors</groupId>

connectors/websocket/src/main/resources/META-INF/NOTICE

diff --git a/connectors/websocket/src/main/resources/META-INF/NOTICE b/connectors/websocket/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 08c0a16..0000000
--- a/connectors/websocket/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Connectors: Websocket
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

console/server/src/main/remote-resources/META-INF/LICENSE

diff --git a/console/server/src/main/remote-resources/META-INF/LICENSE b/console/server/src/main/remote-resources/META-INF/LICENSE
new file mode 100644
index 0000000..4e78974
--- /dev/null
+++ b/console/server/src/main/remote-resources/META-INF/LICENSE
@@ -0,0 +1,40 @@
+
+===============================================================================
+APACHE EDGENT SUBCOMPONENTS:
+
+This binary includes a number of subcomponents with separate
+copyright notices and license terms.  Your use of this binary
+is subject to the terms and conditions of the following licenses.
+
+===============================================================================
+License: Apache License Version 2.0
+For details, see META-INF/licenses/apache-license-version-2.0.txt
+
+gson (com.google.code.gson:gson:2.2.4)
+metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
+
+===============================================================================
+License: MIT
+
+jquery (org.webjars:jquery:1.11.2)
+    For details, see META-INF/licenses/jquery-1_11_2-MIT.txt.
+
+jquery-ui (org.webjars:jquery-ui:1.11.4)
+    For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
+
+d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
+    For details, see META-INF/licenses/d3.legend-MIT.txt.
+
+===============================================================================
+License: BSD 3-Clause
+
+d3 (org.webjars.bower:d3:3.3.9)
+    For details, see META-INF/licenses/d3-3_3_9-BSD.txt.
+
+===============================================================================
+License: BSD 2-Clause
+
+d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0)
+    For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt.
+
+===============================================================================

console/server/src/main/remote-resources/META-INF/NOTICE

diff --git a/console/server/src/main/resources/META-INF/NOTICE b/console/server/src/main/remote-resources/META-INF/NOTICE
similarity index 75%
rename from console/server/src/main/resources/META-INF/NOTICE
rename to console/server/src/main/remote-resources/META-INF/NOTICE
index fdc9429..9c9e7e9 100644
--- a/console/server/src/main/resources/META-INF/NOTICE
+++ b/console/server/src/main/remote-resources/META-INF/NOTICE
@@ -1,12 +1,6 @@
+===============================================================================
 
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------------------------------
-
-Portions of this bundle were developed by IBM Corp.
+Portions of this software were developed by IBM Corp.
 Copyright IBM Corp. 2015, 2016
 
 ===============================================================================

console/server/src/main/resources/META-INF/LICENSE

diff --git a/console/server/src/main/resources/META-INF/LICENSE b/console/server/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index 4686a46..0000000
--- a/console/server/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,243 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-======================================
-APACHE EDGENT SUBCOMPONENTS:
-
-This binary includes a number of subcomponents with separate
-copyright notices and license terms.  Your use of this binary
-is subject to the terms and conditions of the following licenses.
-
-==========================
-License: Apache License Version 2.0
-For details, see META-INF/licenses/apache-license-version-2.0.txt
-
-gson (com.google.code.gson:gson:2.2.4)
-metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
-
-==========================
-License: MIT
-
-jquery (org.webjars:jquery:1.11.2)
-    For details, see META-INF/licenses/jquery-1_11_2-MIT.txt.
-    jquery includes sizzle. For details, see META-INF/licenses/sizzle-1_11_1-MIT.txt.
-
-jquery-ui (org.webjars:jquery-ui:1.11.4)
-    For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
-
-d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
-    For details, see META-INF/licenses/d3.legend-MIT.txt.
-
-==========================
-License: BSD 3-Clause
-
-d3 (org.webjars.bower:d3:3.3.9)
-    For details, see META-INF/licenses/d3-3_3_9-BSD.txt.
-
-==========================
-License: BSD 2-Clause
-
-d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0)
-    For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt.
-
-======================================

console/servlets/pom.xml

diff --git a/console/servlets/pom.xml b/console/servlets/pom.xml
index 7c3e4c5..c887a38 100644
--- a/console/servlets/pom.xml
+++ b/console/servlets/pom.xml
@@ -46,13 +46,9 @@
       </resource>
     </resources>
     <plugins>
-     <!--
-          The default configuration would include the META-INF stuff into the
-          WEB-INF/classes/META-INF directory. We want it in the project root.
-      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
           <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
         </configuration>

console/servlets/src/main/remote-resources/META-INF/LICENSE

diff --git a/console/servlets/src/main/remote-resources/META-INF/LICENSE b/console/servlets/src/main/remote-resources/META-INF/LICENSE
new file mode 100644
index 0000000..4e78974
--- /dev/null
+++ b/console/servlets/src/main/remote-resources/META-INF/LICENSE
@@ -0,0 +1,40 @@
+
+===============================================================================
+APACHE EDGENT SUBCOMPONENTS:
+
+This binary includes a number of subcomponents with separate
+copyright notices and license terms.  Your use of this binary
+is subject to the terms and conditions of the following licenses.
+
+===============================================================================
+License: Apache License Version 2.0
+For details, see META-INF/licenses/apache-license-version-2.0.txt
+
+gson (com.google.code.gson:gson:2.2.4)
+metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
+
+===============================================================================
+License: MIT
+
+jquery (org.webjars:jquery:1.11.2)
+    For details, see META-INF/licenses/jquery-1_11_2-MIT.txt.
+
+jquery-ui (org.webjars:jquery-ui:1.11.4)
+    For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
+
+d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
+    For details, see META-INF/licenses/d3.legend-MIT.txt.
+
+===============================================================================
+License: BSD 3-Clause
+
+d3 (org.webjars.bower:d3:3.3.9)
+    For details, see META-INF/licenses/d3-3_3_9-BSD.txt.
+
+===============================================================================
+License: BSD 2-Clause
+
+d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0)
+    For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt.
+
+===============================================================================

console/servlets/src/main/remote-resources/META-INF/NOTICE

diff --git a/console/server/src/main/resources/META-INF/NOTICE b/console/servlets/src/main/remote-resources/META-INF/NOTICE
similarity index 75%
copy from console/server/src/main/resources/META-INF/NOTICE
copy to console/servlets/src/main/remote-resources/META-INF/NOTICE
index fdc9429..9c9e7e9 100644
--- a/console/server/src/main/resources/META-INF/NOTICE
+++ b/console/servlets/src/main/remote-resources/META-INF/NOTICE
@@ -1,12 +1,6 @@
+===============================================================================
 
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------------------------------
-
-Portions of this bundle were developed by IBM Corp.
+Portions of this software were developed by IBM Corp.
 Copyright IBM Corp. 2015, 2016
 
 ===============================================================================

console/servlets/src/main/webapp/META-INF/LICENSE

diff --git a/console/servlets/src/main/webapp/META-INF/LICENSE b/console/servlets/src/main/webapp/META-INF/LICENSE
deleted file mode 100644
index f6174a5..0000000
--- a/console/servlets/src/main/webapp/META-INF/LICENSE
+++ /dev/null
@@ -1,242 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-======================================
-APACHE EDGENT SUBCOMPONENTS:
-
-This binary includes a number of subcomponents with separate
-copyright notices and license terms.  Your use of this binary
-is subject to the terms and conditions of the following licenses.
-
-==========================
-License: Apache License Version 2.0
-For details, see META-INF/licenses/apache-license-version-2.0.txt
-
-gson (com.google.code.gson:gson:2.2.4)
-metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
-
-==========================
-License: MIT
-
-jquery (org.webjars:jquery:1.11.2)
-    For details, see META-INF/licenses/jquery-1_11_2-MIT.txt.
-
-jquery-ui (org.webjars:jquery-ui:1.11.4)
-    For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
-
-d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
-    For details, see META-INF/licenses/d3.legend-MIT.txt.
-
-==========================
-License: BSD 3-Clause
-
-d3 (org.webjars.bower:d3:3.3.9)
-    For details, see META-INF/licenses/d3-3_3_9-BSD.txt.
-
-==========================
-License: BSD 2-Clause
-
-d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0)
-    For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt.
-
-======================================

console/servlets/src/main/webapp/META-INF/NOTICE

diff --git a/console/servlets/src/main/webapp/META-INF/NOTICE b/console/servlets/src/main/webapp/META-INF/NOTICE
deleted file mode 100644
index fdc9429..0000000
--- a/console/servlets/src/main/webapp/META-INF/NOTICE
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------------------------------
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-
-===============================================================================
-
-APACHE EDGENT SUBCOMPONENTS:
-
-This product includes a number of subcomponents with separate
-copyright notices and license terms.  The following notices apply.
-
--------------------------------------------------------------------------------
-metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
-
-Metrics
-Copyright 2010-2013 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom,
-Striped64, LongAdder) with the following comments:
-
-          Written by Doug Lea with assistance from members of JCP JSR-166
-          Expert Group and released to the public domain, as explained at
-          http://creativecommons.org/publicdomain/zero/1.0/
-
-===============================================================================

platforms/android/analytics/math3/pom.xml

diff --git a/platforms/android/analytics/math3/pom.xml b/platforms/android/analytics/math3/pom.xml
index 916fbb0..54fd28e 100644
--- a/platforms/android/analytics/math3/pom.xml
+++ b/platforms/android/analytics/math3/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Analytics: Math3</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/analytics/sensors/pom.xml

diff --git a/platforms/android/analytics/sensors/pom.xml b/platforms/android/analytics/sensors/pom.xml
index 25cfa6f..2b863b6 100644
--- a/platforms/android/analytics/sensors/pom.xml
+++ b/platforms/android/analytics/sensors/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Analytics: Sensors</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/android/hardware/pom.xml

diff --git a/platforms/android/android/hardware/pom.xml b/platforms/android/android/hardware/pom.xml
index 25e2af0..9953276 100644
--- a/platforms/android/android/hardware/pom.xml
+++ b/platforms/android/android/hardware/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Android: Hardware</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.android.api</groupId>

platforms/android/android/hardware/src/main/resources/META-INF/NOTICE

diff --git a/platforms/android/android/hardware/src/main/resources/META-INF/NOTICE b/platforms/android/android/hardware/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index a746fd5..0000000
--- a/platforms/android/android/hardware/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent (Android): Android: Hardware
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

platforms/android/android/topology/pom.xml

diff --git a/platforms/android/android/topology/pom.xml b/platforms/android/android/topology/pom.xml
index f622c4c..2c84276 100644
--- a/platforms/android/android/topology/pom.xml
+++ b/platforms/android/android/topology/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Android: Topology</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.android.api</groupId>

platforms/android/android/topology/src/main/resources/META-INF/NOTICE

diff --git a/platforms/android/android/topology/src/main/resources/META-INF/NOTICE b/platforms/android/android/topology/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index abadf2a..0000000
--- a/platforms/android/android/topology/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent (Android): Android: Topology
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

platforms/android/api/execution/pom.xml

diff --git a/platforms/android/api/execution/pom.xml b/platforms/android/api/execution/pom.xml
index c86c208..dde6583 100644
--- a/platforms/android/api/execution/pom.xml
+++ b/platforms/android/api/execution/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): API: Execution</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/api/function/pom.xml

diff --git a/platforms/android/api/function/pom.xml b/platforms/android/api/function/pom.xml
index 17f864a..72ce668 100644
--- a/platforms/android/api/function/pom.xml
+++ b/platforms/android/api/function/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): API: Function</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/api/graph/pom.xml

diff --git a/platforms/android/api/graph/pom.xml b/platforms/android/api/graph/pom.xml
index e8b44c8..31cd044 100644
--- a/platforms/android/api/graph/pom.xml
+++ b/platforms/android/api/graph/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): API: Graph</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/api/oplet/pom.xml

diff --git a/platforms/android/api/oplet/pom.xml b/platforms/android/api/oplet/pom.xml
index aed0d31..026b5da 100644
--- a/platforms/android/api/oplet/pom.xml
+++ b/platforms/android/api/oplet/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): API: Oplet</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/api/topology/pom.xml

diff --git a/platforms/android/api/topology/pom.xml b/platforms/android/api/topology/pom.xml
index 9274bfd..00205fb 100644
--- a/platforms/android/api/topology/pom.xml
+++ b/platforms/android/api/topology/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): API: Topology</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/api/window/pom.xml

diff --git a/platforms/android/api/window/pom.xml b/platforms/android/api/window/pom.xml
index 2a930ee..f9960da 100644
--- a/platforms/android/api/window/pom.xml
+++ b/platforms/android/api/window/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): API: Window</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/apps/iot/pom.xml

diff --git a/platforms/android/apps/iot/pom.xml b/platforms/android/apps/iot/pom.xml
index da1a4f4..3ebbeb0 100644
--- a/platforms/android/apps/iot/pom.xml
+++ b/platforms/android/apps/iot/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Apps: IoT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/apps/runtime/pom.xml

diff --git a/platforms/android/apps/runtime/pom.xml b/platforms/android/apps/runtime/pom.xml
index 6f09bf3..134435d 100644
--- a/platforms/android/apps/runtime/pom.xml
+++ b/platforms/android/apps/runtime/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Apps: Runtime</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/common/pom.xml

diff --git a/platforms/android/connectors/common/pom.xml b/platforms/android/connectors/common/pom.xml
index d9e785b..8e65fd9 100644
--- a/platforms/android/connectors/common/pom.xml
+++ b/platforms/android/connectors/common/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: Common</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/file/pom.xml

diff --git a/platforms/android/connectors/file/pom.xml b/platforms/android/connectors/file/pom.xml
index c6e07d0..ba7e676 100644
--- a/platforms/android/connectors/file/pom.xml
+++ b/platforms/android/connectors/file/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: File</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/http/pom.xml

diff --git a/platforms/android/connectors/http/pom.xml b/platforms/android/connectors/http/pom.xml
index cd5f41a..63f5143 100644
--- a/platforms/android/connectors/http/pom.xml
+++ b/platforms/android/connectors/http/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: HTTP</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/iot/pom.xml

diff --git a/platforms/android/connectors/iot/pom.xml b/platforms/android/connectors/iot/pom.xml
index 98d6a65..09041de 100644
--- a/platforms/android/connectors/iot/pom.xml
+++ b/platforms/android/connectors/iot/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: IoT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/iotp/pom.xml

diff --git a/platforms/android/connectors/iotp/pom.xml b/platforms/android/connectors/iotp/pom.xml
index d94e10c..9979bc5 100644
--- a/platforms/android/connectors/iotp/pom.xml
+++ b/platforms/android/connectors/iotp/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: IoTP</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/jdbc/pom.xml

diff --git a/platforms/android/connectors/jdbc/pom.xml b/platforms/android/connectors/jdbc/pom.xml
index ed76abf..d29ea3c 100644
--- a/platforms/android/connectors/jdbc/pom.xml
+++ b/platforms/android/connectors/jdbc/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: JDBC</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/kafka/pom.xml

diff --git a/platforms/android/connectors/kafka/pom.xml b/platforms/android/connectors/kafka/pom.xml
index 27b3302..e5e95e0 100644
--- a/platforms/android/connectors/kafka/pom.xml
+++ b/platforms/android/connectors/kafka/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: Kafka</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/mqtt/pom.xml

diff --git a/platforms/android/connectors/mqtt/pom.xml b/platforms/android/connectors/mqtt/pom.xml
index 94b647a..0908118 100644
--- a/platforms/android/connectors/mqtt/pom.xml
+++ b/platforms/android/connectors/mqtt/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: MQTT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/serial/pom.xml

diff --git a/platforms/android/connectors/serial/pom.xml b/platforms/android/connectors/serial/pom.xml
index 3370740..f35ee05 100644
--- a/platforms/android/connectors/serial/pom.xml
+++ b/platforms/android/connectors/serial/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: Serial</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/websocket-base/pom.xml

diff --git a/platforms/android/connectors/websocket-base/pom.xml b/platforms/android/connectors/websocket-base/pom.xml
index 6a9eb4c..476999e 100644
--- a/platforms/android/connectors/websocket-base/pom.xml
+++ b/platforms/android/connectors/websocket-base/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: Websocket: Base</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/websocket-jetty/pom.xml

diff --git a/platforms/android/connectors/websocket-jetty/pom.xml b/platforms/android/connectors/websocket-jetty/pom.xml
index fb3fd1c..c7e77a4 100644
--- a/platforms/android/connectors/websocket-jetty/pom.xml
+++ b/platforms/android/connectors/websocket-jetty/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: Websocket: Jetty</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/websocket-misc/pom.xml

diff --git a/platforms/android/connectors/websocket-misc/pom.xml b/platforms/android/connectors/websocket-misc/pom.xml
index 5b1aef2..ca44796 100644
--- a/platforms/android/connectors/websocket-misc/pom.xml
+++ b/platforms/android/connectors/websocket-misc/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: Websocket: Misc</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/websocket-server/pom.xml

diff --git a/platforms/android/connectors/websocket-server/pom.xml b/platforms/android/connectors/websocket-server/pom.xml
index b5e4980..56e7cf3 100644
--- a/platforms/android/connectors/websocket-server/pom.xml
+++ b/platforms/android/connectors/websocket-server/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: Websocket: Server</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/connectors/websocket/pom.xml

diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml
index 9df0412..06dcd87 100644
--- a/platforms/android/connectors/websocket/pom.xml
+++ b/platforms/android/connectors/websocket/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Connectors: Websocket</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/providers/direct/pom.xml

diff --git a/platforms/android/providers/direct/pom.xml b/platforms/android/providers/direct/pom.xml
index 18c2c0a..f228c64 100644
--- a/platforms/android/providers/direct/pom.xml
+++ b/platforms/android/providers/direct/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Providers: Direct</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/providers/iot/pom.xml

diff --git a/platforms/android/providers/iot/pom.xml b/platforms/android/providers/iot/pom.xml
index 7ac5611..ed6aa5c 100644
--- a/platforms/android/providers/iot/pom.xml
+++ b/platforms/android/providers/iot/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Providers: IoT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/runtimes/appservice/pom.xml

diff --git a/platforms/android/runtimes/appservice/pom.xml b/platforms/android/runtimes/appservice/pom.xml
index cb03e28..439869d 100644
--- a/platforms/android/runtimes/appservice/pom.xml
+++ b/platforms/android/runtimes/appservice/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Runtime: AppService</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/runtimes/etiao/pom.xml

diff --git a/platforms/android/runtimes/etiao/pom.xml b/platforms/android/runtimes/etiao/pom.xml
index bde57b7..b147d56 100644
--- a/platforms/android/runtimes/etiao/pom.xml
+++ b/platforms/android/runtimes/etiao/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Runtime: Etiao</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/runtimes/jobregistry/pom.xml

diff --git a/platforms/android/runtimes/jobregistry/pom.xml b/platforms/android/runtimes/jobregistry/pom.xml
index 8c61a06..8ddfd23 100644
--- a/platforms/android/runtimes/jobregistry/pom.xml
+++ b/platforms/android/runtimes/jobregistry/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Runtime: JobRegistry</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/runtimes/jsoncontrol/pom.xml

diff --git a/platforms/android/runtimes/jsoncontrol/pom.xml b/platforms/android/runtimes/jsoncontrol/pom.xml
index 96099c1..e65ff24 100644
--- a/platforms/android/runtimes/jsoncontrol/pom.xml
+++ b/platforms/android/runtimes/jsoncontrol/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Runtime: JSONControl</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/spi/graph/pom.xml

diff --git a/platforms/android/spi/graph/pom.xml b/platforms/android/spi/graph/pom.xml
index ccc6a81..de39fae 100644
--- a/platforms/android/spi/graph/pom.xml
+++ b/platforms/android/spi/graph/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): SPI: Graph</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/spi/topology/pom.xml

diff --git a/platforms/android/spi/topology/pom.xml b/platforms/android/spi/topology/pom.xml
index 25c24d2..41f9623 100644
--- a/platforms/android/spi/topology/pom.xml
+++ b/platforms/android/spi/topology/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): SPI: Topology</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/utils/metrics/pom.xml

diff --git a/platforms/android/utils/metrics/pom.xml b/platforms/android/utils/metrics/pom.xml
index 0f8fcd1..efcfccf 100644
--- a/platforms/android/utils/metrics/pom.xml
+++ b/platforms/android/utils/metrics/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Utils: Metrics</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/android/utils/streamscope/pom.xml

diff --git a/platforms/android/utils/streamscope/pom.xml b/platforms/android/utils/streamscope/pom.xml
index b146e46..87e1ae0 100644
--- a/platforms/android/utils/streamscope/pom.xml
+++ b/platforms/android/utils/streamscope/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Android): Utils: Streamscope</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/analytics/math3/pom.xml

diff --git a/platforms/java7/analytics/math3/pom.xml b/platforms/java7/analytics/math3/pom.xml
index 3ac596a..9b28f87 100644
--- a/platforms/java7/analytics/math3/pom.xml
+++ b/platforms/java7/analytics/math3/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Analytics: Math3</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/analytics/sensors/pom.xml

diff --git a/platforms/java7/analytics/sensors/pom.xml b/platforms/java7/analytics/sensors/pom.xml
index 15dd2e8..b06d207 100644
--- a/platforms/java7/analytics/sensors/pom.xml
+++ b/platforms/java7/analytics/sensors/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Analytics: Sensors</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/api/execution/pom.xml

diff --git a/platforms/java7/api/execution/pom.xml b/platforms/java7/api/execution/pom.xml
index 6c24662..28916c4 100644
--- a/platforms/java7/api/execution/pom.xml
+++ b/platforms/java7/api/execution/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): API: Execution</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/api/function/pom.xml

diff --git a/platforms/java7/api/function/pom.xml b/platforms/java7/api/function/pom.xml
index 12e89bd..fcc3254 100644
--- a/platforms/java7/api/function/pom.xml
+++ b/platforms/java7/api/function/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): API: Function</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/api/graph/pom.xml

diff --git a/platforms/java7/api/graph/pom.xml b/platforms/java7/api/graph/pom.xml
index c3e4ec9..48bddcc 100644
--- a/platforms/java7/api/graph/pom.xml
+++ b/platforms/java7/api/graph/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): API: Graph</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/api/oplet/pom.xml

diff --git a/platforms/java7/api/oplet/pom.xml b/platforms/java7/api/oplet/pom.xml
index cc143e6..bd35991 100644
--- a/platforms/java7/api/oplet/pom.xml
+++ b/platforms/java7/api/oplet/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): API: Oplet</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/api/topology/pom.xml

diff --git a/platforms/java7/api/topology/pom.xml b/platforms/java7/api/topology/pom.xml
index c895087..7bb9f9d 100644
--- a/platforms/java7/api/topology/pom.xml
+++ b/platforms/java7/api/topology/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): API: Topology</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/api/window/pom.xml

diff --git a/platforms/java7/api/window/pom.xml b/platforms/java7/api/window/pom.xml
index ba68186..42f566f 100644
--- a/platforms/java7/api/window/pom.xml
+++ b/platforms/java7/api/window/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): API: Window</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/apps/iot/pom.xml

diff --git a/platforms/java7/apps/iot/pom.xml b/platforms/java7/apps/iot/pom.xml
index 7377c52..60f5d08 100644
--- a/platforms/java7/apps/iot/pom.xml
+++ b/platforms/java7/apps/iot/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Apps: IoT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/apps/runtime/pom.xml

diff --git a/platforms/java7/apps/runtime/pom.xml b/platforms/java7/apps/runtime/pom.xml
index ae6c702..df1c117 100644
--- a/platforms/java7/apps/runtime/pom.xml
+++ b/platforms/java7/apps/runtime/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Apps: Runtime</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/common/pom.xml

diff --git a/platforms/java7/connectors/common/pom.xml b/platforms/java7/connectors/common/pom.xml
index 7eaac25..47983de 100644
--- a/platforms/java7/connectors/common/pom.xml
+++ b/platforms/java7/connectors/common/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: Common</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/file/pom.xml

diff --git a/platforms/java7/connectors/file/pom.xml b/platforms/java7/connectors/file/pom.xml
index db8b14b..4f6e32b 100644
--- a/platforms/java7/connectors/file/pom.xml
+++ b/platforms/java7/connectors/file/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: File</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/http/pom.xml

diff --git a/platforms/java7/connectors/http/pom.xml b/platforms/java7/connectors/http/pom.xml
index 7d5b4b0..74f2252 100644
--- a/platforms/java7/connectors/http/pom.xml
+++ b/platforms/java7/connectors/http/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: HTTP</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/iot/pom.xml

diff --git a/platforms/java7/connectors/iot/pom.xml b/platforms/java7/connectors/iot/pom.xml
index 530c886..80ac455 100644
--- a/platforms/java7/connectors/iot/pom.xml
+++ b/platforms/java7/connectors/iot/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: IoT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/iotp/pom.xml

diff --git a/platforms/java7/connectors/iotp/pom.xml b/platforms/java7/connectors/iotp/pom.xml
index 4708bb4..855cf1d 100644
--- a/platforms/java7/connectors/iotp/pom.xml
+++ b/platforms/java7/connectors/iotp/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: IoTP</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/jdbc/pom.xml

diff --git a/platforms/java7/connectors/jdbc/pom.xml b/platforms/java7/connectors/jdbc/pom.xml
index 851cbb1..dece57f 100644
--- a/platforms/java7/connectors/jdbc/pom.xml
+++ b/platforms/java7/connectors/jdbc/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: JDBC</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/kafka/pom.xml

diff --git a/platforms/java7/connectors/kafka/pom.xml b/platforms/java7/connectors/kafka/pom.xml
index 7c22574..b84d55b 100644
--- a/platforms/java7/connectors/kafka/pom.xml
+++ b/platforms/java7/connectors/kafka/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: Kafka</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/mqtt/pom.xml

diff --git a/platforms/java7/connectors/mqtt/pom.xml b/platforms/java7/connectors/mqtt/pom.xml
index 0daf70f..b06afef 100644
--- a/platforms/java7/connectors/mqtt/pom.xml
+++ b/platforms/java7/connectors/mqtt/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: MQTT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/serial/pom.xml

diff --git a/platforms/java7/connectors/serial/pom.xml b/platforms/java7/connectors/serial/pom.xml
index 22034c6..74cbf5c 100644
--- a/platforms/java7/connectors/serial/pom.xml
+++ b/platforms/java7/connectors/serial/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: Serial</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/websocket-base/pom.xml

diff --git a/platforms/java7/connectors/websocket-base/pom.xml b/platforms/java7/connectors/websocket-base/pom.xml
index e43f3e0..328b796 100644
--- a/platforms/java7/connectors/websocket-base/pom.xml
+++ b/platforms/java7/connectors/websocket-base/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: Websocket: Base</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/websocket-jetty/pom.xml

diff --git a/platforms/java7/connectors/websocket-jetty/pom.xml b/platforms/java7/connectors/websocket-jetty/pom.xml
index 1fe9731..6c6bf45 100644
--- a/platforms/java7/connectors/websocket-jetty/pom.xml
+++ b/platforms/java7/connectors/websocket-jetty/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: Websocket: Jetty</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/websocket-misc/pom.xml

diff --git a/platforms/java7/connectors/websocket-misc/pom.xml b/platforms/java7/connectors/websocket-misc/pom.xml
index 3d0371b..c589b0d 100644
--- a/platforms/java7/connectors/websocket-misc/pom.xml
+++ b/platforms/java7/connectors/websocket-misc/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: Websocket: Misc</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/websocket-server/pom.xml

diff --git a/platforms/java7/connectors/websocket-server/pom.xml b/platforms/java7/connectors/websocket-server/pom.xml
index b4c87a1..f3b4021 100644
--- a/platforms/java7/connectors/websocket-server/pom.xml
+++ b/platforms/java7/connectors/websocket-server/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: Websocket: Server</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/connectors/websocket/pom.xml

diff --git a/platforms/java7/connectors/websocket/pom.xml b/platforms/java7/connectors/websocket/pom.xml
index 2afdecb..56de3e9 100644
--- a/platforms/java7/connectors/websocket/pom.xml
+++ b/platforms/java7/connectors/websocket/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Connectors: Websocket</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/console/server/src/main/remote-resources/META-INF/LICENSE

diff --git a/platforms/java7/console/server/src/main/remote-resources/META-INF/LICENSE b/platforms/java7/console/server/src/main/remote-resources/META-INF/LICENSE
new file mode 100644
index 0000000..bc4b691
--- /dev/null
+++ b/platforms/java7/console/server/src/main/remote-resources/META-INF/LICENSE
@@ -0,0 +1,41 @@
+
+===============================================================================
+APACHE EDGENT SUBCOMPONENTS:
+
+This binary includes a number of subcomponents with separate
+copyright notices and license terms.  Your use of this binary
+is subject to the terms and conditions of the following licenses.
+
+===============================================================================
+License: Apache License Version 2.0
+For details, see META-INF/licenses/apache-license-version-2.0.txt
+
+gson (com.google.code.gson:gson:2.2.4)
+metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
+
+===============================================================================
+License: MIT
+
+jquery (org.webjars:jquery:1.11.2)
+    For details, see META-INF/licenses/jquery-1_11_2-MIT.txt.
+
+jquery-ui (org.webjars:jquery-ui:1.11.4)
+    For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
+
+d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
+    For details, see META-INF/licenses/d3.legend-MIT.txt.
+
+===============================================================================
+License: BSD 3-Clause
+
+d3 (org.webjars.bower:d3:3.3.9)
+    For details, see META-INF/licenses/d3-3_3_9-BSD.txt.
+
+===============================================================================
+License: BSD 2-Clause
+
+d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0)
+    For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt.
+
+===============================================================================
+

platforms/java7/console/server/src/main/remote-resources/META-INF/NOTICE

diff --git a/console/server/src/main/resources/META-INF/NOTICE b/platforms/java7/console/server/src/main/remote-resources/META-INF/NOTICE
similarity index 75%
copy from console/server/src/main/resources/META-INF/NOTICE
copy to platforms/java7/console/server/src/main/remote-resources/META-INF/NOTICE
index fdc9429..9c9e7e9 100644
--- a/console/server/src/main/resources/META-INF/NOTICE
+++ b/platforms/java7/console/server/src/main/remote-resources/META-INF/NOTICE
@@ -1,12 +1,6 @@
+===============================================================================
 
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------------------------------
-
-Portions of this bundle were developed by IBM Corp.
+Portions of this software were developed by IBM Corp.
 Copyright IBM Corp. 2015, 2016
 
 ===============================================================================

platforms/java7/console/server/src/main/resources/META-INF/LICENSE

diff --git a/platforms/java7/console/server/src/main/resources/META-INF/LICENSE b/platforms/java7/console/server/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index 4686a46..0000000
--- a/platforms/java7/console/server/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,243 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-======================================
-APACHE EDGENT SUBCOMPONENTS:
-
-This binary includes a number of subcomponents with separate
-copyright notices and license terms.  Your use of this binary
-is subject to the terms and conditions of the following licenses.
-
-==========================
-License: Apache License Version 2.0
-For details, see META-INF/licenses/apache-license-version-2.0.txt
-
-gson (com.google.code.gson:gson:2.2.4)
-metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
-
-==========================
-License: MIT
-
-jquery (org.webjars:jquery:1.11.2)
-    For details, see META-INF/licenses/jquery-1_11_2-MIT.txt.
-    jquery includes sizzle. For details, see META-INF/licenses/sizzle-1_11_1-MIT.txt.
-
-jquery-ui (org.webjars:jquery-ui:1.11.4)
-    For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
-
-d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
-    For details, see META-INF/licenses/d3.legend-MIT.txt.
-
-==========================
-License: BSD 3-Clause
-
-d3 (org.webjars.bower:d3:3.3.9)
-    For details, see META-INF/licenses/d3-3_3_9-BSD.txt.
-
-==========================
-License: BSD 2-Clause
-
-d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0)
-    For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt.
-
-======================================

platforms/java7/console/server/src/main/resources/META-INF/NOTICE

diff --git a/platforms/java7/console/server/src/main/resources/META-INF/NOTICE b/platforms/java7/console/server/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index fdc9429..0000000
--- a/platforms/java7/console/server/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------------------------------
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-
-===============================================================================
-
-APACHE EDGENT SUBCOMPONENTS:
-
-This product includes a number of subcomponents with separate
-copyright notices and license terms.  The following notices apply.
-
--------------------------------------------------------------------------------
-metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
-
-Metrics
-Copyright 2010-2013 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom,
-Striped64, LongAdder) with the following comments:
-
-          Written by Doug Lea with assistance from members of JCP JSR-166
-          Expert Group and released to the public domain, as explained at
-          http://creativecommons.org/publicdomain/zero/1.0/
-
-===============================================================================

platforms/java7/console/servlets/pom.xml

diff --git a/platforms/java7/console/servlets/pom.xml b/platforms/java7/console/servlets/pom.xml
index 8e50745..45f2af9 100644
--- a/platforms/java7/console/servlets/pom.xml
+++ b/platforms/java7/console/servlets/pom.xml
@@ -40,13 +40,9 @@
       </resource>
     </resources>
     <plugins>
-      <!--
-        The default configuration would include the META-INF stuff into the
-        WEB-INF/classes/META-INF directory. We want it in the project root.
-      -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
         <configuration>
           <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
         </configuration>

platforms/java7/console/servlets/src/main/remote-resources/META-INF/LICENSE

diff --git a/platforms/java7/console/servlets/src/main/remote-resources/META-INF/LICENSE b/platforms/java7/console/servlets/src/main/remote-resources/META-INF/LICENSE
new file mode 100644
index 0000000..4e78974
--- /dev/null
+++ b/platforms/java7/console/servlets/src/main/remote-resources/META-INF/LICENSE
@@ -0,0 +1,40 @@
+
+===============================================================================
+APACHE EDGENT SUBCOMPONENTS:
+
+This binary includes a number of subcomponents with separate
+copyright notices and license terms.  Your use of this binary
+is subject to the terms and conditions of the following licenses.
+
+===============================================================================
+License: Apache License Version 2.0
+For details, see META-INF/licenses/apache-license-version-2.0.txt
+
+gson (com.google.code.gson:gson:2.2.4)
+metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
+
+===============================================================================
+License: MIT
+
+jquery (org.webjars:jquery:1.11.2)
+    For details, see META-INF/licenses/jquery-1_11_2-MIT.txt.
+
+jquery-ui (org.webjars:jquery-ui:1.11.4)
+    For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
+
+d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
+    For details, see META-INF/licenses/d3.legend-MIT.txt.
+
+===============================================================================
+License: BSD 3-Clause
+
+d3 (org.webjars.bower:d3:3.3.9)
+    For details, see META-INF/licenses/d3-3_3_9-BSD.txt.
+
+===============================================================================
+License: BSD 2-Clause
+
+d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0)
+    For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt.
+
+===============================================================================

platforms/java7/console/servlets/src/main/remote-resources/META-INF/NOTICE

diff --git a/console/server/src/main/resources/META-INF/NOTICE b/platforms/java7/console/servlets/src/main/remote-resources/META-INF/NOTICE
similarity index 75%
copy from console/server/src/main/resources/META-INF/NOTICE
copy to platforms/java7/console/servlets/src/main/remote-resources/META-INF/NOTICE
index fdc9429..9c9e7e9 100644
--- a/console/server/src/main/resources/META-INF/NOTICE
+++ b/platforms/java7/console/servlets/src/main/remote-resources/META-INF/NOTICE
@@ -1,12 +1,6 @@
+===============================================================================
 
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------------------------------
-
-Portions of this bundle were developed by IBM Corp.
+Portions of this software were developed by IBM Corp.
 Copyright IBM Corp. 2015, 2016
 
 ===============================================================================

platforms/java7/console/servlets/src/main/webapp/META-INF/LICENSE

diff --git a/platforms/java7/console/servlets/src/main/webapp/META-INF/LICENSE b/platforms/java7/console/servlets/src/main/webapp/META-INF/LICENSE
deleted file mode 100644
index 4686a46..0000000
--- a/platforms/java7/console/servlets/src/main/webapp/META-INF/LICENSE
+++ /dev/null
@@ -1,243 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed 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.
-
-======================================
-APACHE EDGENT SUBCOMPONENTS:
-
-This binary includes a number of subcomponents with separate
-copyright notices and license terms.  Your use of this binary
-is subject to the terms and conditions of the following licenses.
-
-==========================
-License: Apache License Version 2.0
-For details, see META-INF/licenses/apache-license-version-2.0.txt
-
-gson (com.google.code.gson:gson:2.2.4)
-metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
-
-==========================
-License: MIT
-
-jquery (org.webjars:jquery:1.11.2)
-    For details, see META-INF/licenses/jquery-1_11_2-MIT.txt.
-    jquery includes sizzle. For details, see META-INF/licenses/sizzle-1_11_1-MIT.txt.
-
-jquery-ui (org.webjars:jquery-ui:1.11.4)
-    For details, see META-INF/licenses/jquery-ui-1_11_4-MIT.txt.
-
-d3.legend.js (https://gist.githubusercontent.com/ZJONSSON/3918369/raw/bf9bce6b68a3b70f87450f155436ca4a84af1ba4/d3.legend.js)
-    For details, see META-INF/licenses/d3.legend-MIT.txt.
-
-==========================
-License: BSD 3-Clause
-
-d3 (org.webjars.bower:d3:3.3.9)
-    For details, see META-INF/licenses/d3-3_3_9-BSD.txt.
-
-==========================
-License: BSD 2-Clause
-
-d3-plugins-sankey (org.webjars.bower:d3-plugins-sankey:1.1.0)
-    For details, see META-INF/licenses/d3-plugins-sankey-1_1_0-BSD.txt.
-
-======================================

platforms/java7/console/servlets/src/main/webapp/META-INF/NOTICE

diff --git a/platforms/java7/console/servlets/src/main/webapp/META-INF/NOTICE b/platforms/java7/console/servlets/src/main/webapp/META-INF/NOTICE
deleted file mode 100644
index fdc9429..0000000
--- a/platforms/java7/console/servlets/src/main/webapp/META-INF/NOTICE
+++ /dev/null
@@ -1,34 +0,0 @@
-
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
------------------------------------------------------------------------------------------------
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-
-===============================================================================
-
-APACHE EDGENT SUBCOMPONENTS:
-
-This product includes a number of subcomponents with separate
-copyright notices and license terms.  The following notices apply.
-
--------------------------------------------------------------------------------
-metrics-core (io.dropwizard.metrics:metrics-core:3.1.2)
-
-Metrics
-Copyright 2010-2013 Coda Hale and Yammer, Inc.
-
-This product includes software developed by Coda Hale and Yammer, Inc.
-
-This product includes code derived from the JSR-166 project (ThreadLocalRandom,
-Striped64, LongAdder) with the following comments:
-
-          Written by Doug Lea with assistance from members of JCP JSR-166
-          Expert Group and released to the public domain, as explained at
-          http://creativecommons.org/publicdomain/zero/1.0/
-
-===============================================================================

platforms/java7/providers/devlopment/pom.xml

diff --git a/platforms/java7/providers/devlopment/pom.xml b/platforms/java7/providers/devlopment/pom.xml
index 4f80ebd..2c0c4c7 100644
--- a/platforms/java7/providers/devlopment/pom.xml
+++ b/platforms/java7/providers/devlopment/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Providers: Development</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/providers/direct/pom.xml

diff --git a/platforms/java7/providers/direct/pom.xml b/platforms/java7/providers/direct/pom.xml
index b3fff94..d377198 100644
--- a/platforms/java7/providers/direct/pom.xml
+++ b/platforms/java7/providers/direct/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Providers: Direct</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/providers/iot/pom.xml

diff --git a/platforms/java7/providers/iot/pom.xml b/platforms/java7/providers/iot/pom.xml
index 04503ee..8f64080 100644
--- a/platforms/java7/providers/iot/pom.xml
+++ b/platforms/java7/providers/iot/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Providers: IoT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/runtimes/appservice/pom.xml

diff --git a/platforms/java7/runtimes/appservice/pom.xml b/platforms/java7/runtimes/appservice/pom.xml
index a219250..6712e0f 100644
--- a/platforms/java7/runtimes/appservice/pom.xml
+++ b/platforms/java7/runtimes/appservice/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Runtime: AppService</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/runtimes/etiao/pom.xml

diff --git a/platforms/java7/runtimes/etiao/pom.xml b/platforms/java7/runtimes/etiao/pom.xml
index dd9bce8..711d2d7 100644
--- a/platforms/java7/runtimes/etiao/pom.xml
+++ b/platforms/java7/runtimes/etiao/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Runtime: Etiao</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/runtimes/jmxcontrol/pom.xml

diff --git a/platforms/java7/runtimes/jmxcontrol/pom.xml b/platforms/java7/runtimes/jmxcontrol/pom.xml
index 1500535..591b27b 100644
--- a/platforms/java7/runtimes/jmxcontrol/pom.xml
+++ b/platforms/java7/runtimes/jmxcontrol/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Runtime: JMXControl</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/runtimes/jobregistry/pom.xml

diff --git a/platforms/java7/runtimes/jobregistry/pom.xml b/platforms/java7/runtimes/jobregistry/pom.xml
index 298e6c1..1dc9bf8 100644
--- a/platforms/java7/runtimes/jobregistry/pom.xml
+++ b/platforms/java7/runtimes/jobregistry/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Runtime: JobRegistry</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/runtimes/jsoncontrol/pom.xml

diff --git a/platforms/java7/runtimes/jsoncontrol/pom.xml b/platforms/java7/runtimes/jsoncontrol/pom.xml
index 29d092e..fcc17d2 100644
--- a/platforms/java7/runtimes/jsoncontrol/pom.xml
+++ b/platforms/java7/runtimes/jsoncontrol/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Runtime: JSONControl</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/spi/graph/pom.xml

diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml
index 02d1161..9cd6706 100644
--- a/platforms/java7/spi/graph/pom.xml
+++ b/platforms/java7/spi/graph/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): SPI: Graph</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/spi/topology/pom.xml

diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml
index 05531c7..4fa5eb3 100644
--- a/platforms/java7/spi/topology/pom.xml
+++ b/platforms/java7/spi/topology/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): SPI: Topology</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/test/svt/pom.xml

diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml
index 109d3c4..aad6d2c 100644
--- a/platforms/java7/test/svt/pom.xml
+++ b/platforms/java7/test/svt/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Test: SVT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/utils/metrics/pom.xml

diff --git a/platforms/java7/utils/metrics/pom.xml b/platforms/java7/utils/metrics/pom.xml
index 73e44e1..7c5293d 100644
--- a/platforms/java7/utils/metrics/pom.xml
+++ b/platforms/java7/utils/metrics/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Utils: Metrics</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

platforms/java7/utils/streamscope/pom.xml

diff --git a/platforms/java7/utils/streamscope/pom.xml b/platforms/java7/utils/streamscope/pom.xml
index 51682a9..fca5f0c 100644
--- a/platforms/java7/utils/streamscope/pom.xml
+++ b/platforms/java7/utils/streamscope/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent (Java 7): Utils: Streamscope</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

pom.xml

diff --git a/pom.xml b/pom.xml
index 486d296..c020e66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,9 @@
   <name>Apache Edgent</name>
   <description>The Apache Edgent Project</description>
 
+  <!-- Needed by the remote-resources-maven-plugin to generate the project time-span in the NOTICE files -->
+  <inceptionYear>2016</inceptionYear>
+
   <scm>
     <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-edgent.git</connection>
     <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-edgent.git</developerConnection>
@@ -63,6 +66,8 @@
     <!-- Tell sonar where the coverage reports are located -->
     <sonar.jacoco.reportPath>${project.build.directory}/coverage-reports/jacoco-ut.exec</sonar.jacoco.reportPath>
     <sonar.jacoco.itReportPath>${project.build.directory}/coverage-reports/jacoco-it.exec</sonar.jacoco.itReportPath>
+
+    <remote-resources-maven-plugin.remote-resources.dir>src/main/remote-resources</remote-resources-maven-plugin.remote-resources.dir>
   </properties>
 
   <!-- Only configure the site distribution as the rest is handled by the apache parent -->
@@ -484,10 +489,13 @@
             </goals>
             <configuration>
               <resourceBundles>
+                <!-- Will generate META-INF/{DEPENDENCIES,LICENSE,NOTICE} -->
                 <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
                 <!-- Will generate META-INF/DISCLAIMER  -->
-                <resourceBundle>org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT</resourceBundle>
+                <resourceBundle>org.apache:apache-incubator-disclaimer-resource-bundle:1.1</resourceBundle>
               </resourceBundles>
+              <!-- Content in this directory will be appended to generated resources -->
+              <appendedResourcesDirectory>${remote-resources-maven-plugin.remote-resources.dir}</appendedResourcesDirectory>
             </configuration>
           </execution>
         </executions>

providers/development/pom.xml

diff --git a/providers/development/pom.xml b/providers/development/pom.xml
index f6cfd04..9d9c79c 100644
--- a/providers/development/pom.xml
+++ b/providers/development/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Providers: Development</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.providers</groupId>

providers/development/src/main/resources/META-INF/NOTICE

diff --git a/providers/development/src/main/resources/META-INF/NOTICE b/providers/development/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 6fa7c3e..0000000
--- a/providers/development/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Providers: Development
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

providers/direct/pom.xml

diff --git a/providers/direct/pom.xml b/providers/direct/pom.xml
index f60e47c..c1b6917 100644
--- a/providers/direct/pom.xml
+++ b/providers/direct/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Providers: Direct</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <build>
     <plugins>
       <plugin>

providers/direct/src/main/resources/META-INF/NOTICE

diff --git a/providers/direct/src/main/resources/META-INF/NOTICE b/providers/direct/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index c07371c..0000000
--- a/providers/direct/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Providers: Direct
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

providers/iot/src/main/resources/META-INF/NOTICE

diff --git a/providers/iot/src/main/resources/META-INF/NOTICE b/providers/iot/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 80cb758..0000000
--- a/providers/iot/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Providers: Iot
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

runtime/appservice/src/main/resources/META-INF/NOTICE

diff --git a/runtime/appservice/src/main/resources/META-INF/NOTICE b/runtime/appservice/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index f324a96..0000000
--- a/runtime/appservice/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Runtime: Appservice
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

runtime/etiao/pom.xml

diff --git a/runtime/etiao/pom.xml b/runtime/etiao/pom.xml
index f687917..b0bb14f 100644
--- a/runtime/etiao/pom.xml
+++ b/runtime/etiao/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Runtime: Etiao</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

runtime/etiao/src/main/resources/META-INF/NOTICE

diff --git a/runtime/etiao/src/main/resources/META-INF/NOTICE b/runtime/etiao/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index b9c91b7..0000000
--- a/runtime/etiao/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Runtime: Etiao
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

runtime/jmxcontrol/pom.xml

diff --git a/runtime/jmxcontrol/pom.xml b/runtime/jmxcontrol/pom.xml
index 432c48c..997bc35 100644
--- a/runtime/jmxcontrol/pom.xml
+++ b/runtime/jmxcontrol/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Runtime: JMXControl</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

runtime/jmxcontrol/src/main/resources/META-INF/NOTICE

diff --git a/runtime/jmxcontrol/src/main/resources/META-INF/NOTICE b/runtime/jmxcontrol/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 5ee3eb8..0000000
--- a/runtime/jmxcontrol/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Runtime: JMXControl
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

runtime/jobregistry/src/main/resources/META-INF/NOTICE

diff --git a/runtime/jobregistry/src/main/resources/META-INF/NOTICE b/runtime/jobregistry/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 8f011ae..0000000
--- a/runtime/jobregistry/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Runtime: Jobregistry
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).

runtime/jsoncontrol/pom.xml

diff --git a/runtime/jsoncontrol/pom.xml b/runtime/jsoncontrol/pom.xml
index e04dd06..46fc484 100644
--- a/runtime/jsoncontrol/pom.xml
+++ b/runtime/jsoncontrol/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Runtime: JSONControl</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

runtime/jsoncontrol/src/main/resources/META-INF/NOTICE

diff --git a/runtime/jsoncontrol/src/main/resources/META-INF/NOTICE b/runtime/jsoncontrol/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index e5eb831..0000000
--- a/runtime/jsoncontrol/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Runtime: JSONControl
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

spi/graph/pom.xml

diff --git a/spi/graph/pom.xml b/spi/graph/pom.xml
index e644490..71ee5a6 100644
--- a/spi/graph/pom.xml
+++ b/spi/graph/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: SPI: Graph</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

spi/graph/src/main/resources/META-INF/NOTICE

diff --git a/spi/graph/src/main/resources/META-INF/NOTICE b/spi/graph/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index e2399e7..0000000
--- a/spi/graph/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: SPI: Graph
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

spi/topology/pom.xml

diff --git a/spi/topology/pom.xml b/spi/topology/pom.xml
index 35af001..2ba8f91 100644
--- a/spi/topology/pom.xml
+++ b/spi/topology/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: SPI: Topology</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

spi/topology/src/main/resources/META-INF/NOTICE

diff --git a/spi/topology/src/main/resources/META-INF/NOTICE b/spi/topology/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 25a954e..0000000
--- a/spi/topology/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: SPI: Topology
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

src/main/ibm-remote-resources/META-INF/NOTICE

diff --git a/src/main/ibm-remote-resources/META-INF/NOTICE b/src/main/ibm-remote-resources/META-INF/NOTICE
new file mode 100644
index 0000000..b1cc91e
--- /dev/null
+++ b/src/main/ibm-remote-resources/META-INF/NOTICE
@@ -0,0 +1,5 @@
+===============================================================================
+
+Portions of this software were developed by IBM Corp.
+Copyright IBM Corp. 2015, 2016
+

test/svt/pom.xml

diff --git a/test/svt/pom.xml b/test/svt/pom.xml
index e7dcfb5..a509a02 100644
--- a/test/svt/pom.xml
+++ b/test/svt/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Test: SVT</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

test/svt/src/main/resources/META-INF/NOTICE

diff --git a/test/svt/src/main/resources/META-INF/NOTICE b/test/svt/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index cbede60..0000000
--- a/test/svt/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Test: SVT
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

utils/metrics/pom.xml

diff --git a/utils/metrics/pom.xml b/utils/metrics/pom.xml
index e910373..e192d1d 100644
--- a/utils/metrics/pom.xml
+++ b/utils/metrics/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Utils: Metrics</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

utils/metrics/src/main/resources/META-INF/NOTICE

diff --git a/utils/metrics/src/main/resources/META-INF/NOTICE b/utils/metrics/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 4b127d0..0000000
--- a/utils/metrics/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Apache Edgent: Utils: Metrics
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-===============================================================================
-
-Portions of this bundle were developed by IBM Corp.
-Copyright IBM Corp. 2015, 2016
-

utils/streamscope/pom.xml

diff --git a/utils/streamscope/pom.xml b/utils/streamscope/pom.xml
index b2ce9d1..d83e04a 100644
--- a/utils/streamscope/pom.xml
+++ b/utils/streamscope/pom.xml
@@ -31,6 +31,10 @@
 
   <name>Apache Edgent: Utils: Streamscope</name>
 
+  <properties>
+    <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.edgent.api</groupId>

utils/streamscope/src/main/resources/META-INF/NOTICE

diff --git a/utils/streamscope/src/main/resources/META-INF/NOTICE b/utils/streamscope/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index d1dace9..0000000
--- a/utils/streamscope/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Apache Edgent: Utils: Streamscope
-Copyright 2016-2017 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).