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/11/23 08:26:20 UTC
incubator-edgent-samples git commit: - Switched to providing the
version of edgent libs via dependencyManagement as there were issues with
overriding the version if the property is only defined in the parent.
Repository: incubator-edgent-samples
Updated Branches:
refs/heads/feature/fix-samples [created] ef79ac0dc
- Switched to providing the version of edgent libs via dependencyManagement as there were issues with overriding the version if the property is only defined in the parent.
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/commit/ef79ac0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/ef79ac0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/ef79ac0d
Branch: refs/heads/feature/fix-samples
Commit: ef79ac0dc5bc4b4dc5d05178dc0018ad6445521d
Parents: 5ab2570
Author: Christofer Dutz <ch...@c-ware.de>
Authored: Thu Nov 23 09:26:12 2017 +0100
Committer: Christofer Dutz <ch...@c-ware.de>
Committed: Thu Nov 23 09:26:12 2017 +0100
----------------------------------------------------------------------
apps/pom.xml | 10 ++-----
connectors/pom.xml | 7 -----
console/pom.xml | 2 --
pom.xml | 78 +++++++++++++++++++++++++++++++++++++++++++++++--
scenarios/pom.xml | 2 --
topology/pom.xml | 1 -
utils/pom.xml | 3 --
7 files changed, 77 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef79ac0d/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 7ee0b34..e6f991c 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -37,38 +37,32 @@
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples-utils</artifactId>
- <version>${project.version}</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef79ac0d/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 1ef7756..c6b490c 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -37,37 +37,30 @@
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-serial</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef79ac0d/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 8cad8ad..233c745 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -37,12 +37,10 @@
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-console-server</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef79ac0d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index af32c81..97789bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,21 +118,93 @@
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-development</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
</dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-analytics-sensors</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-connectors-file</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-analytics-math3</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-connectors-iot</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-connectors-iotp</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-connectors-mqtt</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-connectors-kafka</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-connectors-jdbc</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-connectors-serial</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-console-server</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.runtime.groupId}</groupId>
+ <artifactId>edgent-utils-metrics</artifactId>
+ <version>${edgent.runtime.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<build>
<pluginManagement>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef79ac0d/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index e6eabc5..7c4efc6 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -60,12 +60,10 @@
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef79ac0d/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 8fcaa89..73e5c68 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -37,7 +37,6 @@
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef79ac0d/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 2a2cd0c..ac4c479 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -37,17 +37,14 @@
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
<groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-console-server</artifactId>
- <version>${edgent.runtime.version}</version>
</dependency>
<dependency>