You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by dl...@apache.org on 2017/11/23 15:22:15 UTC
[03/11] incubator-edgent git commit: - Replaced a lot of the
structural variables with constants to eventually make releasing easier.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/http/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/http/pom.xml b/platforms/android/connectors/http/pom.xml
index d3c8fe4..d321de7 100644
--- a/platforms/android/connectors/http/pom.xml
+++ b/platforms/android/connectors/http/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-http</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: HTTP</name>
+ <name>Apache Edgent (Android): Connectors: HTTP</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/iot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/iot/pom.xml b/platforms/android/connectors/iot/pom.xml
index b21ca48..1339eae 100644
--- a/platforms/android/connectors/iot/pom.xml
+++ b/platforms/android/connectors/iot/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-iot</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoT</name>
+ <name>Apache Edgent (Android): Connectors: IoT</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,12 +66,12 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/iotp/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/iotp/pom.xml b/platforms/android/connectors/iotp/pom.xml
index c674167..2a65211 100644
--- a/platforms/android/connectors/iotp/pom.xml
+++ b/platforms/android/connectors/iotp/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-iotp</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: IoTP</name>
+ <name>Apache Edgent (Android): Connectors: IoTP</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/jdbc/pom.xml b/platforms/android/connectors/jdbc/pom.xml
index fff2af4..eeb6207 100644
--- a/platforms/android/connectors/jdbc/pom.xml
+++ b/platforms/android/connectors/jdbc/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-jdbc</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: JDBC</name>
+ <name>Apache Edgent (Android): Connectors: JDBC</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,12 +66,12 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/kafka/pom.xml b/platforms/android/connectors/kafka/pom.xml
index 6c8d6f3..7ce9ee2 100644
--- a/platforms/android/connectors/kafka/pom.xml
+++ b/platforms/android/connectors/kafka/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-kafka</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Kafka</name>
+ <name>Apache Edgent (Android): Connectors: Kafka</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -80,7 +80,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/mqtt/pom.xml b/platforms/android/connectors/mqtt/pom.xml
index cbeb953..d9eeddf 100644
--- a/platforms/android/connectors/mqtt/pom.xml
+++ b/platforms/android/connectors/mqtt/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-mqtt</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: MQTT</name>
+ <name>Apache Edgent (Android): Connectors: MQTT</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/pom.xml b/platforms/android/connectors/pom.xml
index b3417d9..2059acb 100644
--- a/platforms/android/connectors/pom.xml
+++ b/platforms/android/connectors/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-connectors</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors</name>
+ <name>Apache Edgent (Android): Connectors</name>
<modules>
<module>command</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/pubsub/pom.xml b/platforms/android/connectors/pubsub/pom.xml
index 37041ca..9abf32c 100644
--- a/platforms/android/connectors/pubsub/pom.xml
+++ b/platforms/android/connectors/pubsub/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-pubsub</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: PubSub</name>
+ <name>Apache Edgent (Android): Connectors: PubSub</name>
<build>
<plugins>
@@ -46,7 +46,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,7 +62,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/serial/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/serial/pom.xml b/platforms/android/connectors/serial/pom.xml
index 08d7261..dc13a49 100644
--- a/platforms/android/connectors/serial/pom.xml
+++ b/platforms/android/connectors/serial/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-serial</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Serial</name>
+ <name>Apache Edgent (Android): Connectors: Serial</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/websocket-base/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/websocket-base/pom.xml b/platforms/android/connectors/websocket-base/pom.xml
index 4ab3273..0df1f47 100644
--- a/platforms/android/connectors/websocket-base/pom.xml
+++ b/platforms/android/connectors/websocket-base/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-websocket-base</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Base</name>
+ <name>Apache Edgent (Android): Connectors: Websocket: Base</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/websocket-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/websocket-jetty/pom.xml b/platforms/android/connectors/websocket-jetty/pom.xml
index 4f87c5f..63bf264 100644
--- a/platforms/android/connectors/websocket-jetty/pom.xml
+++ b/platforms/android/connectors/websocket-jetty/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-websocket-jetty</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Jetty</name>
+ <name>Apache Edgent (Android): Connectors: Websocket: Jetty</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket-misc</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/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 7b64013..188956f 100644
--- a/platforms/android/connectors/websocket-misc/pom.xml
+++ b/platforms/android/connectors/websocket-misc/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-websocket-misc</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Misc</name>
+ <name>Apache Edgent (Android): Connectors: Websocket: Misc</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/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 206780e..7806705 100644
--- a/platforms/android/connectors/websocket-server/pom.xml
+++ b/platforms/android/connectors/websocket-server/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-websocket-server</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket: Server</name>
+ <name>Apache Edgent (Android): Connectors: Websocket: Server</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket-jetty</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml
index 88405fa..c8cfce7 100644
--- a/platforms/android/connectors/websocket/pom.xml
+++ b/platforms/android/connectors/websocket/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-websocket</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Websocket</name>
+ <name>Apache Edgent (Android): Connectors: Websocket</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket-misc</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket-base</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml
index 8e259b0..f8f61d0 100644
--- a/platforms/android/distribution/pom.xml
+++ b/platforms/android/distribution/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-distribution</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+ <name>Apache Edgent (Android): Distribution</name>
<build>
<plugins>
@@ -78,125 +78,125 @@
<!-- Providers -->
<!-- Not on android <dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-development</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency-->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- Android platform speficic -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-android-hardware</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-android-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- Analytics -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- Utils -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-utils-streamscope</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- Connectors -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-command</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-csv</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-http</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-pubsub</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-serial</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket-jetty</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -208,7 +208,7 @@
of the development provider.
-->
<!-- Not on android <dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-console-servlets</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>war</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/pom.xml b/platforms/android/pom.xml
index 07874ab..4f48fa3 100644
--- a/platforms/android/pom.xml
+++ b/platforms/android/pom.xml
@@ -31,15 +31,7 @@
<artifactId>edgent-platforms-android</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Platforms: Android</name>
-
- <properties>
- <edgent.projname.platform>(Android)</edgent.projname.platform>
- <edgent.runtime.groupId>org.apache.edgent.android</edgent.runtime.groupId>
-
- <!-- Edgent groupId of jars the retrolambda processing will use -->
- <edgent.retrolambda.srcArtifactGroupId>org.apache.edgent.java7</edgent.retrolambda.srcArtifactGroupId>
- </properties>
+ <name>Apache Edgent (Android): Platforms: Android</name>
<modules>
<!-- Real modules -->
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/providers/direct/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/providers/direct/pom.xml b/platforms/android/providers/direct/pom.xml
index 4266634..57931ad 100644
--- a/platforms/android/providers/direct/pom.xml
+++ b/platforms/android/providers/direct/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-providers-direct</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Providers: Direct</name>
+ <name>Apache Edgent (Android): Providers: Direct</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,32 +66,32 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-spi-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-spi-graph</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-runtime-appservice</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-runtime-etiao</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-runtime-jsoncontrol</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/providers/iot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/providers/iot/pom.xml b/platforms/android/providers/iot/pom.xml
index ce19fca..c9e787b 100644
--- a/platforms/android/providers/iot/pom.xml
+++ b/platforms/android/providers/iot/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-providers-iot</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Providers: IoT</name>
+ <name>Apache Edgent (Android): Providers: IoT</name>
<build>
<plugins>
@@ -46,7 +46,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,37 +62,37 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-runtime-jsoncontrol</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-runtime-appservice</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-pubsub</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-apps-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-apps-runtime</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/providers/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/providers/pom.xml b/platforms/android/providers/pom.xml
index e289a9e..9962d9a 100644
--- a/platforms/android/providers/pom.xml
+++ b/platforms/android/providers/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-providers</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Providers</name>
+ <name>Apache Edgent (Android): Providers</name>
<modules>
<module>direct</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/runtime/appservice/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/runtime/appservice/pom.xml b/platforms/android/runtime/appservice/pom.xml
index a48a232..f887246 100644
--- a/platforms/android/runtime/appservice/pom.xml
+++ b/platforms/android/runtime/appservice/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-runtime-appservice</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Runtime: AppService</name>
+ <name>Apache Edgent (Android): Runtime: AppService</name>
<build>
<plugins>
@@ -46,7 +46,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,12 +62,12 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-execution</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/runtime/etiao/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/runtime/etiao/pom.xml b/platforms/android/runtime/etiao/pom.xml
index e0fbdae..4f9695e 100644
--- a/platforms/android/runtime/etiao/pom.xml
+++ b/platforms/android/runtime/etiao/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-runtime-etiao</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Runtime: Etiao</name>
+ <name>Apache Edgent (Android): Runtime: Etiao</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,17 +66,17 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-execution</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-graph</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-spi-graph</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/runtime/jobregistry/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/runtime/jobregistry/pom.xml b/platforms/android/runtime/jobregistry/pom.xml
index 74e2192..122138c 100644
--- a/platforms/android/runtime/jobregistry/pom.xml
+++ b/platforms/android/runtime/jobregistry/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-runtime-jobregistry</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Runtime: JobRegistry</name>
+ <name>Apache Edgent (Android): Runtime: JobRegistry</name>
<build>
<plugins>
@@ -46,7 +46,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,12 +62,12 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-execution</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/runtime/jsoncontrol/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/runtime/jsoncontrol/pom.xml b/platforms/android/runtime/jsoncontrol/pom.xml
index ccc376d..d3351be 100644
--- a/platforms/android/runtime/jsoncontrol/pom.xml
+++ b/platforms/android/runtime/jsoncontrol/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-runtime-jsoncontrol</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Runtime: JSONControl</name>
+ <name>Apache Edgent (Android): Runtime: JSONControl</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,12 +66,12 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-execution</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/runtime/pom.xml b/platforms/android/runtime/pom.xml
index e04966e..67c5259 100644
--- a/platforms/android/runtime/pom.xml
+++ b/platforms/android/runtime/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-runtime</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Runtimes</name>
+ <name>Apache Edgent (Android): Runtimes</name>
<modules>
<module>appservice</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/spi/graph/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/spi/graph/pom.xml b/platforms/android/spi/graph/pom.xml
index 2070eb5..3cf71ad 100644
--- a/platforms/android/spi/graph/pom.xml
+++ b/platforms/android/spi/graph/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-spi-graph</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: SPI: Graph</name>
+ <name>Apache Edgent (Android): SPI: Graph</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,12 +66,12 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-execution</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-graph</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/spi/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/spi/pom.xml b/platforms/android/spi/pom.xml
index 019befc..7ade849 100644
--- a/platforms/android/spi/pom.xml
+++ b/platforms/android/spi/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-spi</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: SPI</name>
+ <name>Apache Edgent (Android): SPI</name>
<modules>
<module>graph</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/spi/topology/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/spi/topology/pom.xml b/platforms/android/spi/topology/pom.xml
index 785ff32..de29c6c 100644
--- a/platforms/android/spi/topology/pom.xml
+++ b/platforms/android/spi/topology/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-spi-topology</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: SPI: Topology</name>
+ <name>Apache Edgent (Android): SPI: Topology</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/utils/metrics/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/utils/metrics/pom.xml b/platforms/android/utils/metrics/pom.xml
index 85644fc..2c1e19d 100644
--- a/platforms/android/utils/metrics/pom.xml
+++ b/platforms/android/utils/metrics/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-utils-metrics</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Utils: Metrics</name>
+ <name>Apache Edgent (Android): Utils: Metrics</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,7 +50,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/utils/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/utils/pom.xml b/platforms/android/utils/pom.xml
index 9d60d54..3d67baa 100644
--- a/platforms/android/utils/pom.xml
+++ b/platforms/android/utils/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-utils</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Utils</name>
+ <name>Apache Edgent (Android): Utils</name>
<modules>
<module>metrics</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/utils/streamscope/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/android/utils/streamscope/pom.xml b/platforms/android/utils/streamscope/pom.xml
index 7857569..f9e7957 100644
--- a/platforms/android/utils/streamscope/pom.xml
+++ b/platforms/android/utils/streamscope/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-utils-streamscope</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Utils: Streamscope</name>
+ <name>Apache Edgent (Android): Utils: Streamscope</name>
<build>
<plugins>
@@ -46,7 +46,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent.java7</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
@@ -62,7 +62,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/analytics/math3/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/analytics/math3/pom.xml b/platforms/java7/analytics/math3/pom.xml
index db21f4f..d92ba35 100644
--- a/platforms/java7/analytics/math3/pom.xml
+++ b/platforms/java7/analytics/math3/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-analytics-math3</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Analytics: Math3</name>
+ <name>Apache Edgent (Java 7): Analytics: Math3</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,7 +85,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -85,20 +96,20 @@
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/analytics/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/analytics/pom.xml b/platforms/java7/analytics/pom.xml
index 3fd5d29..7816032 100644
--- a/platforms/java7/analytics/pom.xml
+++ b/platforms/java7/analytics/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-analytics</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Analytics</name>
+ <name>Apache Edgent (Java 7): Analytics</name>
<modules>
<module>math3</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/analytics/sensors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/analytics/sensors/pom.xml b/platforms/java7/analytics/sensors/pom.xml
index fb83d28..be6c5c9 100644
--- a/platforms/java7/analytics/sensors/pom.xml
+++ b/platforms/java7/analytics/sensors/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-analytics-sensors</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Analytics: Sensors</name>
+ <name>Apache Edgent (Java 7): Analytics: Sensors</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
- <artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,26 +85,26 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/api/execution/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/api/execution/pom.xml b/platforms/java7/api/execution/pom.xml
index e535f59..e532819 100644
--- a/platforms/java7/api/execution/pom.xml
+++ b/platforms/java7/api/execution/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-api-execution</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: API: Execution</name>
+ <name>Apache Edgent (Java 7): API: Execution</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,7 +85,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/api/function/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/api/function/pom.xml b/platforms/java7/api/function/pom.xml
index 854690b..328ae12 100644
--- a/platforms/java7/api/function/pom.xml
+++ b/platforms/java7/api/function/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-api-function</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: API: Function</name>
+ <name>Apache Edgent (Java 7): API: Function</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/api/graph/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/api/graph/pom.xml b/platforms/java7/api/graph/pom.xml
index a950f53..bdd09aa 100644
--- a/platforms/java7/api/graph/pom.xml
+++ b/platforms/java7/api/graph/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-api-graph</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: API: Graph</name>
+ <name>Apache Edgent (Java 7): API: Graph</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,7 +85,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-oplet</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/api/oplet/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/api/oplet/pom.xml b/platforms/java7/api/oplet/pom.xml
index 245bf4e..b15b00e 100644
--- a/platforms/java7/api/oplet/pom.xml
+++ b/platforms/java7/api/oplet/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-api-oplet</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: API: Oplet</name>
+ <name>Apache Edgent (Java 7): API: Oplet</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,17 +85,17 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-execution</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-window</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/api/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/api/pom.xml b/platforms/java7/api/pom.xml
index 50466ff..270dee9 100644
--- a/platforms/java7/api/pom.xml
+++ b/platforms/java7/api/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-api</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: API</name>
+ <name>Apache Edgent (Java 7): API</name>
<modules>
<module>execution</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/api/topology/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/api/topology/pom.xml b/platforms/java7/api/topology/pom.xml
index e9645d5..a3e0711 100644
--- a/platforms/java7/api/topology/pom.xml
+++ b/platforms/java7/api/topology/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-api-topology</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: API: Topology</name>
+ <name>Apache Edgent (Java 7): API: Topology</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -114,22 +125,22 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-execution</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-graph</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-oplet</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/api/window/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/api/window/pom.xml b/platforms/java7/api/window/pom.xml
index 0b9932a..572515b 100644
--- a/platforms/java7/api/window/pom.xml
+++ b/platforms/java7/api/window/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-api-window</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: API: Window</name>
+ <name>Apache Edgent (Java 7): API: Window</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,7 +85,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/apps/iot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/apps/iot/pom.xml b/platforms/java7/apps/iot/pom.xml
index c4b3cd2..2fd7272 100644
--- a/platforms/java7/apps/iot/pom.xml
+++ b/platforms/java7/apps/iot/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-apps-iot</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Apps: IoT</name>
+ <name>Apache Edgent (Java 7): Apps: IoT</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -70,23 +81,23 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-pubsub</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/apps/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/apps/pom.xml b/platforms/java7/apps/pom.xml
index fc1c331..b16126c 100644
--- a/platforms/java7/apps/pom.xml
+++ b/platforms/java7/apps/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-apps</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Apps</name>
+ <name>Apache Edgent (Java 7): Apps</name>
<modules>
<module>iot</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/apps/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/apps/runtime/pom.xml b/platforms/java7/apps/runtime/pom.xml
index 9cdd3af..9ca129a 100644
--- a/platforms/java7/apps/runtime/pom.xml
+++ b/platforms/java7/apps/runtime/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-apps-runtime</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Apps: Runtime</name>
+ <name>Apache Edgent (Java 7): Apps: Runtime</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -70,24 +81,24 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-runtime-jobregistry</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-runtime-jmxcontrol</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/command/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/command/pom.xml b/platforms/java7/connectors/command/pom.xml
index 78a5a04..3590770 100644
--- a/platforms/java7/connectors/command/pom.xml
+++ b/platforms/java7/connectors/command/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-command</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Command</name>
+ <name>Apache Edgent (Java 7): Connectors: Command</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -70,38 +81,38 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/common/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/common/pom.xml b/platforms/java7/connectors/common/pom.xml
index 3290378..32f7233 100644
--- a/platforms/java7/connectors/common/pom.xml
+++ b/platforms/java7/connectors/common/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-common</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: Common</name>
+ <name>Apache Edgent (Java 7): Connectors: Common</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,26 +85,26 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/csv/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/csv/pom.xml b/platforms/java7/connectors/csv/pom.xml
index 0973c91..721955c 100644
--- a/platforms/java7/connectors/csv/pom.xml
+++ b/platforms/java7/connectors/csv/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-csv</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: CSV</name>
+ <name>Apache Edgent (Java 7): Connectors: CSV</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -76,20 +87,20 @@
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>