You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by cd...@apache.org on 2017/12/14 14:32:37 UTC
[20/50] [abbrv] 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/java7/connectors/file/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/file/pom.xml b/platforms/java7/connectors/file/pom.xml
index 6b9493a..5981306 100644
--- a/platforms/java7/connectors/file/pom.xml
+++ b/platforms/java7/connectors/file/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-connectors-file</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Connectors: File</name>
+ <name>Apache Edgent (Java 7): Connectors: File</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,43 +85,43 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-oplet</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/http/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/http/pom.xml b/platforms/java7/connectors/http/pom.xml
index 33fcecc..b1a422a 100644
--- a/platforms/java7/connectors/http/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: HTTP</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,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>
@@ -90,13 +101,13 @@
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/iot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/iot/pom.xml b/platforms/java7/connectors/iot/pom.xml
index ccb1c87..8ae7a33 100644
--- a/platforms/java7/connectors/iot/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: IoT</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,12 +85,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/java7/connectors/iotp/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/iotp/pom.xml b/platforms/java7/connectors/iotp/pom.xml
index b330429..205319f 100644
--- a/platforms/java7/connectors/iotp/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: IoTP</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,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-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/java7/connectors/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/jdbc/pom.xml b/platforms/java7/connectors/jdbc/pom.xml
index 0841a89..8fda586 100644
--- a/platforms/java7/connectors/jdbc/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: JDBC</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -71,14 +71,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -95,38 +106,38 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-function</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/kafka/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/kafka/pom.xml b/platforms/java7/connectors/kafka/pom.xml
index 1c73470..d446b2a 100644
--- a/platforms/java7/connectors/kafka/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: Kafka</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -88,7 +99,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -171,27 +182,27 @@
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/mqtt/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/mqtt/pom.xml b/platforms/java7/connectors/mqtt/pom.xml
index 5ad801d..4b77212 100644
--- a/platforms/java7/connectors/mqtt/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: MQTT</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,17 +85,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>
@@ -95,27 +106,27 @@
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/pom.xml b/platforms/java7/connectors/pom.xml
index 3a8eb4c..0c824ce 100644
--- a/platforms/java7/connectors/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors</name>
<modules>
<module>command</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/pubsub/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/pubsub/pom.xml b/platforms/java7/connectors/pubsub/pom.xml
index e81da8b..0a4ce67 100644
--- a/platforms/java7/connectors/pubsub/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: PubSub</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -70,13 +81,13 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/serial/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/serial/pom.xml b/platforms/java7/connectors/serial/pom.xml
index 88e562b..14fd296 100644
--- a/platforms/java7/connectors/serial/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: Serial</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,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>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/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 00e1b91..34b46a2 100644
--- a/platforms/java7/connectors/websocket-base/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: Websocket: Base</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,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>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/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 7942b5b..bb6e574 100644
--- a/platforms/java7/connectors/websocket-jetty/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: Websocket: Jetty</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/*,META-INF/maven/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -84,7 +95,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/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 4357c3b..2113f5a 100644
--- a/platforms/java7/connectors/websocket-misc/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: Websocket: Misc</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/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 05f6b54..a7d0bfa 100644
--- a/platforms/java7/connectors/websocket-server/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: Websocket: Server</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,7 +85,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/java7/connectors/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/websocket/pom.xml b/platforms/java7/connectors/websocket/pom.xml
index aa4eae6..ac590c2 100644
--- a/platforms/java7/connectors/websocket/pom.xml
+++ b/platforms/java7/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 (Java 7): Connectors: Websocket</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,17 +85,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>
@@ -119,34 +130,34 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket-jetty</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/console/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/console/pom.xml b/platforms/java7/console/pom.xml
index 457f83f..5cd1026 100644
--- a/platforms/java7/console/pom.xml
+++ b/platforms/java7/console/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-console</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Console</name>
+ <name>Apache Edgent (Java 7): Console</name>
<modules>
<module>server</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/console/server/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/console/server/pom.xml b/platforms/java7/console/server/pom.xml
index 6d06223..0710f5a 100644
--- a/platforms/java7/console/server/pom.xml
+++ b/platforms/java7/console/server/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-console-server</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Console: Server</name>
+ <name>Apache Edgent (Java 7): Console: Server</name>
<build>
<resources>
@@ -47,6 +47,29 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
+ <!--
+ Copy the servlets.war into the build output so it is embedded as
+ resource into the jar.
+ -->
+ <execution>
+ <id>copy-war</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>edgent-console-servlets</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ <outputDirectory>${project.build.outputDirectory}/resources</outputDirectory>
+ <destFileName>servlets.war</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
<execution>
<id>copy</id>
<phase>compile</phase>
@@ -56,42 +79,30 @@
<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/**,resources/**</excludes>
</artifactItem>
- <artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
</artifactItems>
</configuration>
</execution>
- <!--
- Copy the servlets.war into the build output so it is embedded as
- resource into the jar.
- -->
<execution>
- <id>copy-war</id>
- <phase>generate-resources</phase>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
<goals>
- <goal>copy</goal>
+ <goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.runtime.groupId}</groupId>
- <artifactId>edgent-console-servlets</artifactId>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
- <type>war</type>
- <outputDirectory>${project.build.outputDirectory}/resources</outputDirectory>
- <destFileName>servlets.war</destFileName>
+ <classifier>tests</classifier>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <excludes>META-INF/**</excludes>
</artifactItem>
</artifactItems>
</configuration>
@@ -169,7 +180,7 @@
prior to this module.
-->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-console-servlets</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>war</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/console/servlets/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/console/servlets/pom.xml b/platforms/java7/console/servlets/pom.xml
index 866ccb5..0b4a24b 100644
--- a/platforms/java7/console/servlets/pom.xml
+++ b/platforms/java7/console/servlets/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-console-servlets</artifactId>
<packaging>war</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Console: Servlets</name>
+ <name>Apache Edgent (Java 7): Console: Servlets</name>
<build>
<resources>
@@ -60,15 +60,26 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<type>war</type>
<outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -112,7 +123,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-utils-streamscope</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/distribution/pom.xml b/platforms/java7/distribution/pom.xml
index 6965afd..2fcddeb 100644
--- a/platforms/java7/distribution/pom.xml
+++ b/platforms/java7/distribution/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-distribution</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Distribution</name>
+ <name>Apache Edgent (Java 7): Distribution</name>
<build>
<plugins>
@@ -78,113 +78,113 @@
<!-- Providers -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-development</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-providers-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- Analytics -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- Utils -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-utils-streamscope</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- Connectors -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-command</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-common</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-csv</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-http</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-pubsub</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-serial</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-connectors-websocket-jetty</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -196,7 +196,7 @@
of the development provider.
-->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-console-servlets</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>war</type>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml
index 832b6ad..9170b46 100644
--- a/platforms/java7/pom.xml
+++ b/platforms/java7/pom.xml
@@ -31,16 +31,11 @@
<artifactId>edgent-platforms-java7</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Platforms: Java7</name>
+ <name>Apache Edgent (Java 7): Platforms: Java7</name>
<properties>
<!-- The 9.2 version is the last to support Java7 -->
<jetty.version>9.2.21.v20170120</jetty.version>
- <edgent.projname.platform>(Java 7)</edgent.projname.platform>
- <edgent.runtime.groupId>org.apache.edgent.java7</edgent.runtime.groupId>
-
- <!-- Edgent groupId of jars the retrolambda processing will use -->
- <edgent.retrolambda.srcArtifactGroupId>org.apache.edgent</edgent.retrolambda.srcArtifactGroupId>
</properties>
<modules>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/providers/development/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/providers/development/pom.xml b/platforms/java7/providers/development/pom.xml
index 8cd2b71..4bd3fd4 100644
--- a/platforms/java7/providers/development/pom.xml
+++ b/platforms/java7/providers/development/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-providers-development</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Providers: Development</name>
+ <name>Apache Edgent (Java 7): Providers: Development</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,40 +85,40 @@
<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-console-server</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<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>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-runtime-jmxcontrol</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-utils-streamscope</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/providers/direct/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/providers/direct/pom.xml b/platforms/java7/providers/direct/pom.xml
index b00afd1..8e23cce 100644
--- a/platforms/java7/providers/direct/pom.xml
+++ b/platforms/java7/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 (Java 7): Providers: Direct</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -76,7 +87,7 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-test-appservice-applications</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/test-resources</outputDirectory>
@@ -92,51 +103,51 @@
<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>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-utils-metrics</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/providers/iot/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/providers/iot/pom.xml b/platforms/java7/providers/iot/pom.xml
index 9f4dc81..29653ff 100644
--- a/platforms/java7/providers/iot/pom.xml
+++ b/platforms/java7/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 (Java 7): Providers: IoT</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -70,37 +81,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/java7/providers/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/providers/pom.xml b/platforms/java7/providers/pom.xml
index 3e2cd07..77d3632 100644
--- a/platforms/java7/providers/pom.xml
+++ b/platforms/java7/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 (Java 7): Providers</name>
<modules>
<module>development</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/runtime/appservice/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/runtime/appservice/pom.xml b/platforms/java7/runtime/appservice/pom.xml
index fbf14aa..a8ef363 100644
--- a/platforms/java7/runtime/appservice/pom.xml
+++ b/platforms/java7/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 (Java 7): Runtime: AppService</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -70,19 +81,19 @@
<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>
<!-- Just needed to make sure it is scheduled before this module in the reactor -->
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-test-appservice-applications</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/runtime/etiao/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/runtime/etiao/pom.xml b/platforms/java7/runtime/etiao/pom.xml
index 7044d30..95b1ac8 100644
--- a/platforms/java7/runtime/etiao/pom.xml
+++ b/platforms/java7/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 (Java 7): Runtime: Etiao</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,23 +85,23 @@
<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>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-graph</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/runtime/jmxcontrol/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/runtime/jmxcontrol/pom.xml b/platforms/java7/runtime/jmxcontrol/pom.xml
index fdfb532..36cda27 100644
--- a/platforms/java7/runtime/jmxcontrol/pom.xml
+++ b/platforms/java7/runtime/jmxcontrol/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-runtime-jmxcontrol</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Runtime: JMXControl</name>
+ <name>Apache Edgent (Java 7): Runtime: JMXControl</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,12 +85,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/java7/runtime/jobregistry/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/runtime/jobregistry/pom.xml b/platforms/java7/runtime/jobregistry/pom.xml
index 78dbcb4..4ade1d9 100644
--- a/platforms/java7/runtime/jobregistry/pom.xml
+++ b/platforms/java7/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 (Java 7): Runtime: JobRegistry</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -70,12 +81,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/java7/runtime/jsoncontrol/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/runtime/jsoncontrol/pom.xml b/platforms/java7/runtime/jsoncontrol/pom.xml
index a065f8a..cfbadcf 100644
--- a/platforms/java7/runtime/jsoncontrol/pom.xml
+++ b/platforms/java7/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 (Java 7): Runtime: JSONControl</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,12 +85,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/java7/runtime/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/runtime/pom.xml b/platforms/java7/runtime/pom.xml
index f2ae3f5..fafe398 100644
--- a/platforms/java7/runtime/pom.xml
+++ b/platforms/java7/runtime/pom.xml
@@ -30,7 +30,7 @@
<artifactId>edgent-runtime</artifactId>
<packaging>pom</packaging>
- <name>Apache Edgent ${edgent.projname.platform}: Runtime</name>
+ <name>Apache Edgent (Java 7): Runtime</name>
<modules>
<module>appservice</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/spi/graph/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml
index d8ef618..8fc3d3f 100644
--- a/platforms/java7/spi/graph/pom.xml
+++ b/platforms/java7/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 (Java 7): SPI: Graph</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,12 +85,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/java7/spi/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/spi/pom.xml b/platforms/java7/spi/pom.xml
index d074de7..4f8b265 100644
--- a/platforms/java7/spi/pom.xml
+++ b/platforms/java7/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 (Java 7): SPI</name>
<modules>
<module>graph</module>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/spi/topology/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml
index 84fa3e4..81f72e4 100644
--- a/platforms/java7/spi/topology/pom.xml
+++ b/platforms/java7/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 (Java 7): SPI: Topology</name>
<properties>
<remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
@@ -50,14 +50,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -74,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>
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/test/appservice-applications/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/test/appservice-applications/pom.xml b/platforms/java7/test/appservice-applications/pom.xml
index 1c78e6b..56bcac4 100644
--- a/platforms/java7/test/appservice-applications/pom.xml
+++ b/platforms/java7/test/appservice-applications/pom.xml
@@ -29,7 +29,7 @@
<artifactId>edgent-test-appservice-applications</artifactId>
- <name>Apache Edgent ${edgent.projname.platform}: Test: AppService Applications</name>
+ <name>Apache Edgent (Java 7): Test: AppService Applications</name>
<build>
<plugins>
@@ -46,14 +46,25 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<outputDirectory>${project.build.directory}/classes</outputDirectory>
<excludes>META-INF/*,META-INF/maven/**</excludes>
</artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>${edgent.retrolambda.srcArtifactGroupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>${project.artifactId}</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
@@ -80,7 +91,7 @@
<dependencies>
<dependency>
- <groupId>${edgent.runtime.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-api-topology</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>