Repository: incubator-edgent Updated Branches: refs/heads/develop c761283a6 -> ef78d4db3
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/test/fvtiot/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/test/fvtiot/pom.xml b/platforms/java7/test/fvtiot/pom.xml index 3048bd6..274604f 100644 --- a/platforms/java7/test/fvtiot/pom.xml +++ b/platforms/java7/test/fvtiot/pom.xml @@ -29,7 +29,7 @@ <artifactId>edgent-test-fvtiot</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Test: fvtiot</name> + <name>Apache Edgent (Java 7): Test: fvtiot</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> @@ -72,7 +83,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> @@ -88,38 +99,38 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-pubsub</artifactId> <version>1.3.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-runtime-jsoncontrol</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> <scope>test</scope> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-apps-iot</artifactId> <version>1.3.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-apps-iot</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-iot</artifactId> <version>1.3.0-SNAPSHOT</version> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/test/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/test/pom.xml b/platforms/java7/test/pom.xml index c24bc4f..fbbef13 100644 --- a/platforms/java7/test/pom.xml +++ b/platforms/java7/test/pom.xml @@ -30,7 +30,7 @@ <artifactId>edgent-test</artifactId> <packaging>pom</packaging> - <name>Apache Edgent ${edgent.projname.platform}: Test</name> + <name>Apache Edgent (Java 7): Test</name> <modules> <module>appservice-applications</module> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/test/svt/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml index 8a1713e..b1ffdae 100644 --- a/platforms/java7/test/svt/pom.xml +++ b/platforms/java7/test/svt/pom.xml @@ -29,7 +29,7 @@ <artifactId>edgent-test-svt</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Test: SVT</name> + <name>Apache Edgent (Java 7): Test: SVT</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -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,22 +85,22 @@ <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-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-providers-development</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/utils/metrics/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/utils/metrics/pom.xml b/platforms/java7/utils/metrics/pom.xml index b7bf1c8..b926536 100644 --- a/platforms/java7/utils/metrics/pom.xml +++ b/platforms/java7/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 (Java 7): Utils: Metrics</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -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,14 +85,14 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-topology</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact --> <dependency> - <groupId>${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/utils/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/utils/pom.xml b/platforms/java7/utils/pom.xml index cda954d..5c09a2a 100644 --- a/platforms/java7/utils/pom.xml +++ b/platforms/java7/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 (Java 7): Utils</name> <modules> <module>metrics</module> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/utils/streamscope/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/utils/streamscope/pom.xml b/platforms/java7/utils/streamscope/pom.xml index 224bd70..6bcd4da 100644 --- a/platforms/java7/utils/streamscope/pom.xml +++ b/platforms/java7/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 (Java 7): Utils: Streamscope</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,14 +81,14 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-topology</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact --> <dependency> - <groupId>${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/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/pom.xml b/platforms/pom.xml index 1808912..3d92e54 100644 --- a/platforms/pom.xml +++ b/platforms/pom.xml @@ -29,7 +29,7 @@ <artifactId>edgent-platforms</artifactId> <packaging>pom</packaging> - <name>Apache Edgent ${edgent.projname.platform}: Platforms</name> + <name>Apache Edgent (Java 8): Platforms</name> <build> <plugins> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 84d02bf..b20ffa4 100644 --- a/pom.xml +++ b/pom.xml @@ -46,13 +46,6 @@ </scm> <properties> - <!-- Up here and not in the java8 profile, so hopefully the maven-release-plugin will find it --> - <edgent.runtime.version>1.3.0-SNAPSHOT</edgent.runtime.version> - - <!-- The next two are overriden by platforms/{java7,android}/pom --> - <edgent.projname.platform>(Java 8)</edgent.projname.platform> - <edgent.runtime.groupId>org.apache.edgent</edgent.runtime.groupId> - <java.version>1.8</java.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputencoding>UTF-8</project.reporting.outputencoding> @@ -115,6 +108,12 @@ <pluginManagement> <plugins> <plugin> + <groupId>com.buschmais.jqassistant</groupId> + <artifactId>jqassistant-maven-plugin</artifactId> + <version>1.3.0</version> + </plugin> + + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.6.1</version> @@ -359,6 +358,22 @@ </configuration> </plugin> + <plugin> + <groupId>com.buschmais.jqassistant</groupId> + <artifactId>jqassistant-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>scan</goal> + <goal>analyze</goal> + </goals> + <configuration> + <failOnSeverity>MAJOR</failOnSeverity> + </configuration> + </execution> + </executions> + </plugin> + <!-- This plugin doesn't really do much, it makes sure the jacoco agent is downloaded and that the path to this is saved in an environment @@ -613,6 +628,18 @@ <reporting> <plugins> + <plugin> + <groupId>com.buschmais.jqassistant</groupId> + <artifactId>jqassistant-maven-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + <report>report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <!-- Generates a changelog report from GIT commits --> <plugin> <groupId>org.apache.maven.plugins</groupId> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/providers/development/pom.xml ---------------------------------------------------------------------- diff --git a/providers/development/pom.xml b/providers/development/pom.xml index 8bf9af6..1b82b41 100644 --- a/providers/development/pom.xml +++ b/providers/development/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-providers-development</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Providers: Development</name> + <name>Apache Edgent (Java 8): Providers: Development</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -36,40 +36,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/providers/direct/pom.xml ---------------------------------------------------------------------- diff --git a/providers/direct/pom.xml b/providers/direct/pom.xml index eab588a..5e44f29 100644 --- a/providers/direct/pom.xml +++ b/providers/direct/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-providers-direct</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Providers: Direct</name> + <name>Apache Edgent (Java 8): Providers: Direct</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -49,7 +49,7 @@ <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> @@ -65,51 +65,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/providers/iot/pom.xml ---------------------------------------------------------------------- diff --git a/providers/iot/pom.xml b/providers/iot/pom.xml index f341f90..c5b7f8d 100644 --- a/providers/iot/pom.xml +++ b/providers/iot/pom.xml @@ -28,41 +28,41 @@ <artifactId>edgent-providers-iot</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Providers: IoT</name> + <name>Apache Edgent (Java 8): Providers: IoT</name> <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/providers/pom.xml ---------------------------------------------------------------------- diff --git a/providers/pom.xml b/providers/pom.xml index a1b35e0..49672d9 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -29,7 +29,7 @@ <artifactId>edgent-providers</artifactId> <packaging>pom</packaging> - <name>Apache Edgent ${edgent.projname.platform}: Providers</name> + <name>Apache Edgent (Java 8): Providers</name> <modules> <module>development</module> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/runtime/appservice/pom.xml ---------------------------------------------------------------------- diff --git a/runtime/appservice/pom.xml b/runtime/appservice/pom.xml index 4126b89..f8db481 100644 --- a/runtime/appservice/pom.xml +++ b/runtime/appservice/pom.xml @@ -28,23 +28,23 @@ <artifactId>edgent-runtime-appservice</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Runtime: AppService</name> + <name>Apache Edgent (Java 8): Runtime: AppService</name> <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/runtime/etiao/pom.xml ---------------------------------------------------------------------- diff --git a/runtime/etiao/pom.xml b/runtime/etiao/pom.xml index 5c3c429..0351975 100644 --- a/runtime/etiao/pom.xml +++ b/runtime/etiao/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-runtime-etiao</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Runtime: Etiao</name> + <name>Apache Edgent (Java 8): Runtime: Etiao</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -36,23 +36,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/runtime/jmxcontrol/pom.xml ---------------------------------------------------------------------- diff --git a/runtime/jmxcontrol/pom.xml b/runtime/jmxcontrol/pom.xml index 99781d3..c09128c 100644 --- a/runtime/jmxcontrol/pom.xml +++ b/runtime/jmxcontrol/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-runtime-jmxcontrol</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Runtime: JMXControl</name> + <name>Apache Edgent (Java 8): Runtime: JMXControl</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -36,12 +36,12 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-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/runtime/jobregistry/pom.xml ---------------------------------------------------------------------- diff --git a/runtime/jobregistry/pom.xml b/runtime/jobregistry/pom.xml index d8b8d06..b4e6ee9 100644 --- a/runtime/jobregistry/pom.xml +++ b/runtime/jobregistry/pom.xml @@ -28,16 +28,16 @@ <artifactId>edgent-runtime-jobregistry</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Runtime: JobRegistry</name> + <name>Apache Edgent (Java 8): Runtime: JobRegistry</name> <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/runtime/jsoncontrol/pom.xml ---------------------------------------------------------------------- diff --git a/runtime/jsoncontrol/pom.xml b/runtime/jsoncontrol/pom.xml index ae081fd..a6f0bb2 100644 --- a/runtime/jsoncontrol/pom.xml +++ b/runtime/jsoncontrol/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-runtime-jsoncontrol</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Runtime: JSONControl</name> + <name>Apache Edgent (Java 8): Runtime: JSONControl</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -36,12 +36,12 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-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/runtime/pom.xml ---------------------------------------------------------------------- diff --git a/runtime/pom.xml b/runtime/pom.xml index b6604f1..70a68bc 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -29,7 +29,7 @@ <artifactId>edgent-runtime</artifactId> <packaging>pom</packaging> - <name>Apache Edgent ${edgent.projname.platform}: Runtime</name> + <name>Apache Edgent (Java 8): Runtime</name> <modules> <module>appservice</module> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/samples/apps/pom.xml ---------------------------------------------------------------------- diff --git a/samples/apps/pom.xml b/samples/apps/pom.xml index 3423571..bf0750a 100644 --- a/samples/apps/pom.xml +++ b/samples/apps/pom.xml @@ -35,32 +35,32 @@ <!-- parent pom has Platforms and SLF4J dependencies --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-analytics-sensors</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-file</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-analytics-math3</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-iot</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-iotp</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-mqtt</artifactId> <version>${edgent.runtime.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/samples/connectors/pom.xml ---------------------------------------------------------------------- diff --git a/samples/connectors/pom.xml b/samples/connectors/pom.xml index 1f7b3dd..cd14499 100644 --- a/samples/connectors/pom.xml +++ b/samples/connectors/pom.xml @@ -35,37 +35,37 @@ <!-- parent pom has Platforms and SLF4J dependencies --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-mqtt</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-kafka</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-jdbc</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-serial</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-file</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-iotp</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-analytics-math3</artifactId> <version>${edgent.runtime.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/samples/console/pom.xml ---------------------------------------------------------------------- diff --git a/samples/console/pom.xml b/samples/console/pom.xml index da45e56..335336b 100644 --- a/samples/console/pom.xml +++ b/samples/console/pom.xml @@ -35,12 +35,12 @@ <!-- parent pom has Platforms and SLF4J dependencies --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-console-server</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-utils-metrics</artifactId> <version>${edgent.runtime.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/samples/pom.xml ---------------------------------------------------------------------- diff --git a/samples/pom.xml b/samples/pom.xml index a3ca547..4206c9c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -116,17 +116,17 @@ <!-- Other common sample dependencies --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-providers-direct</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-providers-development</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-providers-iot</artifactId> <version>${edgent.runtime.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/samples/scenarios/pom.xml ---------------------------------------------------------------------- diff --git a/samples/scenarios/pom.xml b/samples/scenarios/pom.xml index 2880387..f18a207 100644 --- a/samples/scenarios/pom.xml +++ b/samples/scenarios/pom.xml @@ -58,12 +58,12 @@ <!-- parent pom has Providers and SLF4J dependencies --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-iotp</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-analytics-math3</artifactId> <version>${edgent.runtime.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/samples/template/pom.xml ---------------------------------------------------------------------- diff --git a/samples/template/pom.xml b/samples/template/pom.xml index 72739d2..db0c7c7 100644 --- a/samples/template/pom.xml +++ b/samples/template/pom.xml @@ -69,17 +69,17 @@ <!-- declare the Edgent provider(s) being used --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-providers-direct</artifactId> <version>${edgent.runtime.version}</version> </dependency> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-providers-development</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-providers-iot</artifactId> <version>${edgent.runtime.version}</version> </dependency--> @@ -87,12 +87,12 @@ <!-- declare Edgent Android dependencies --> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-android-hardware</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}.android</groupId> + <groupId>${project.groupId}.android</groupId> <artifactId>edgent-android-topology</artifactId> <version>${edgent.runtime.version}</version> </dependency--> @@ -100,12 +100,12 @@ <!-- declare Edgent Analytics dependencies --> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-analytics-math3</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-analytics-sensors</artifactId> <version>${edgent.runtime.version}</version> </dependency--> @@ -113,7 +113,7 @@ <!-- declare Edgent Utils dependencies --> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-utils-metrics</artifactId> <version>${edgent.runtime.version}</version> </dependency--> @@ -121,37 +121,37 @@ <!-- declare Edgent Connector dependencies --> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-file</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-iot</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-iotp</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-jdbc</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-kafka</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-mqtt</artifactId> <version>${edgent.runtime.version}</version> </dependency--> <!--dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-serial</artifactId> <version>${edgent.runtime.version}</version> </dependency--> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/samples/topology/pom.xml ---------------------------------------------------------------------- diff --git a/samples/topology/pom.xml b/samples/topology/pom.xml index 8aa5274..77f24a1 100644 --- a/samples/topology/pom.xml +++ b/samples/topology/pom.xml @@ -35,7 +35,7 @@ <!-- parent pom has Providers and SLF4J dependencies --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-analytics-math3</artifactId> <version>${edgent.runtime.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/samples/utils/pom.xml ---------------------------------------------------------------------- diff --git a/samples/utils/pom.xml b/samples/utils/pom.xml index 4eff56a..c806cde 100644 --- a/samples/utils/pom.xml +++ b/samples/utils/pom.xml @@ -35,17 +35,17 @@ <!-- parent pom has Providers and SLF4J dependencies --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-utils-metrics</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-analytics-sensors</artifactId> <version>${edgent.runtime.version}</version> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-console-server</artifactId> <version>${edgent.runtime.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/spi/graph/pom.xml ---------------------------------------------------------------------- diff --git a/spi/graph/pom.xml b/spi/graph/pom.xml index b479b9a..5042fb2 100644 --- a/spi/graph/pom.xml +++ b/spi/graph/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-spi-graph</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: SPI: Graph</name> + <name>Apache Edgent (Java 8): SPI: Graph</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -36,12 +36,12 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-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/spi/pom.xml ---------------------------------------------------------------------- diff --git a/spi/pom.xml b/spi/pom.xml index 10c2316..ad916e0 100644 --- a/spi/pom.xml +++ b/spi/pom.xml @@ -29,7 +29,7 @@ <artifactId>edgent-spi</artifactId> <packaging>pom</packaging> - <name>Apache Edgent ${edgent.projname.platform}: SPI</name> + <name>Apache Edgent (Java 8): SPI</name> <modules> <module>graph</module> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/spi/topology/pom.xml ---------------------------------------------------------------------- diff --git a/spi/topology/pom.xml b/spi/topology/pom.xml index ad413bb..57bdb0f 100644 --- a/spi/topology/pom.xml +++ b/spi/topology/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-spi-topology</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: SPI: Topology</name> + <name>Apache Edgent (Java 8): SPI: Topology</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -36,7 +36,7 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-topology</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/test/appservice-applications/pom.xml ---------------------------------------------------------------------- diff --git a/test/appservice-applications/pom.xml b/test/appservice-applications/pom.xml index 87d8818..a13256c 100644 --- a/test/appservice-applications/pom.xml +++ b/test/appservice-applications/pom.xml @@ -28,11 +28,11 @@ <artifactId>edgent-test-appservice-applications</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Test: AppService Applications</name> + <name>Apache Edgent (Java 8): Test: AppService Applications</name> <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/test/fvtiot/pom.xml ---------------------------------------------------------------------- diff --git a/test/fvtiot/pom.xml b/test/fvtiot/pom.xml index 7a11a04..4bfbea9 100644 --- a/test/fvtiot/pom.xml +++ b/test/fvtiot/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-test-fvtiot</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Test: fvtiot</name> + <name>Apache Edgent (Java 8): Test: fvtiot</name> <build> <plugins> @@ -45,7 +45,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> @@ -61,38 +61,38 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-connectors-pubsub</artifactId> <version>1.3.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-runtime-jsoncontrol</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> <scope>test</scope> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-apps-iot</artifactId> <version>1.3.0-SNAPSHOT</version> <scope>test</scope> </dependency> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-apps-iot</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-iot</artifactId> <version>1.3.0-SNAPSHOT</version> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index 03afcf1..f2c6c0d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -29,7 +29,7 @@ <artifactId>edgent-test</artifactId> <packaging>pom</packaging> - <name>Apache Edgent ${edgent.projname.platform}: Test</name> + <name>Apache Edgent (Java 8): Test</name> <modules> <module>appservice-applications</module> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/test/svt/pom.xml ---------------------------------------------------------------------- diff --git a/test/svt/pom.xml b/test/svt/pom.xml index fc5bc26..b9a11f7 100644 --- a/test/svt/pom.xml +++ b/test/svt/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-test-svt</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Test: SVT</name> + <name>Apache Edgent (Java 8): Test: SVT</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -36,22 +36,22 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-topology</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-providers-development</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/utils/metrics/pom.xml ---------------------------------------------------------------------- diff --git a/utils/metrics/pom.xml b/utils/metrics/pom.xml index 2449243..ec217ed 100644 --- a/utils/metrics/pom.xml +++ b/utils/metrics/pom.xml @@ -28,7 +28,7 @@ <artifactId>edgent-utils-metrics</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Utils: Metrics</name> + <name>Apache Edgent (Java 8): Utils: Metrics</name> <properties> <remote-resources-maven-plugin.remote-resources.dir>../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir> @@ -36,14 +36,14 @@ <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-topology</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact --> <dependency> - <groupId>${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/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 06b154f..27f3136 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -29,7 +29,7 @@ <artifactId>edgent-utils</artifactId> <packaging>pom</packaging> - <name>Apache Edgent ${edgent.projname.platform}: Utils</name> + <name>Apache Edgent (Java 8): Utils</name> <modules> <module>metrics</module> http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/utils/streamscope/pom.xml ---------------------------------------------------------------------- diff --git a/utils/streamscope/pom.xml b/utils/streamscope/pom.xml index 819aae5..0ca790a 100644 --- a/utils/streamscope/pom.xml +++ b/utils/streamscope/pom.xml @@ -28,18 +28,18 @@ <artifactId>edgent-utils-streamscope</artifactId> - <name>Apache Edgent ${edgent.projname.platform}: Utils: Streamscope</name> + <name>Apache Edgent (Java 8): Utils: Streamscope</name> <dependencies> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-topology</artifactId> <version>1.3.0-SNAPSHOT</version> </dependency> <!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact --> <dependency> - <groupId>${edgent.runtime.groupId}</groupId> + <groupId>${project.groupId}</groupId> <artifactId>edgent-api-topology</artifactId> <version>1.3.0-SNAPSHOT</version> <type>test-jar</type>
