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/21 11:51:20 UTC
[40/50] incubator-edgent-samples git commit: switch to
groupId-per-platform
switch to groupId-per-platform
straightforward / minimal-style changes
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/cd3c96e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/cd3c96e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/cd3c96e4
Branch: refs/heads/develop
Commit: cd3c96e484dd88d320fbd9f70239304dc6e6cbf2
Parents: 22d0c28
Author: Dale LaBossiere <dl...@us.ibm.com>
Authored: Wed Oct 18 17:49:58 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
Committed: Wed Oct 18 17:49:58 2017 -0400
----------------------------------------------------------------------
APPLICATION_DEVELOPMENT.md | 7 +-
apps/pom.xml | 31 +++++----
connectors/pom.xml | 35 +++++-----
console/pom.xml | 13 ++--
get-edgent-jars-project/get-edgent-jars.sh | 52 +++++++--------
get-edgent-jars-project/old-get-edgent-jars.sh | 46 ++++++-------
get-edgent-jars-project/pom.xml.template | 12 ++--
.../src/assembly/distribution.xml | 2 +-
pom.xml | 30 ++++-----
scenarios/pom.xml | 15 ++---
template/pom.xml | 70 ++++++++++----------
topology/pom.xml | 11 ++-
utils/pom.xml | 17 +++--
13 files changed, 167 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/APPLICATION_DEVELOPMENT.md
----------------------------------------------------------------------
diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md
index 92f0099..eb6e2fb 100644
--- a/APPLICATION_DEVELOPMENT.md
+++ b/APPLICATION_DEVELOPMENT.md
@@ -26,15 +26,14 @@ Alternatively, you can build the Edgent SDK yourself from a source release
and the resulting jars will be added to your local maven repository.
There are a set of Edgent jars for each supported platform: java8, java7, and android.
-The maven artifact groupId prefixes are:
+The maven artifact groupIds for the Edgent jars are:
- `org.apache.edgent` - for java8,
- `org.apache.edgent.java7`
- `org.apache.edgent.android`
-e.g., the groupIds for the Edgent API artifacts are
-`org.apache.edgent.api` and `org.apache.edgent.api.java7` for
-Java 8 and Java 7 respectively.
+Note, the Java package names for Edgent components do not incorporate
+the platform kind; the package names are the same regardless of the platform.
See `JAVA_SUPPORT.md` for more information on artifact coordinates, etc.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/apps/pom.xml
----------------------------------------------------------------------
diff --git a/apps/pom.xml b/apps/pom.xml
index 602c970..0fc7223 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -22,52 +22,51 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-apps</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Apps</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Apps</name>
<dependencies>
<!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/connectors/pom.xml b/connectors/pom.xml
index cf8549a..6094cbe 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -22,57 +22,56 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Connectors</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Connectors</name>
<dependencies>
<!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-serial</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-samples-topology</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index dfd35c5..59d6a54 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -22,28 +22,27 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-console</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Console</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Console</name>
<dependencies>
<!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-console-server</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/get-edgent-jars-project/get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/get-edgent-jars.sh b/get-edgent-jars-project/get-edgent-jars.sh
index 4b4194a..a8c50f7 100755
--- a/get-edgent-jars-project/get-edgent-jars.sh
+++ b/get-edgent-jars-project/get-edgent-jars.sh
@@ -27,7 +27,7 @@
## --file gav-file get only the specified artifacts. Not restricted to Edgent jars.
## The Edgent version is substituted for all instances of '{EV}'
## Lines that begin with '#' are ignored.
-## --mvn mvn-cmd use mvn-cmd instead of "./mvnw"
+## --mvn mvn-cmd use mvn-cmd instead of "../mvnw"
##
## Creates bundles and classpath.sh in the target dir.
@@ -35,7 +35,7 @@ USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--a
set -e
-# project dir is whereever this script resides
+# project dir is where this script resides
PROJ_DIR=`(cd $(dirname $0); pwd)`
SAMPLES_DIR=`(cd $(dirname $0); pwd)`/..
@@ -83,26 +83,26 @@ fi
#
DEFAULT_GAVS=`cat << EOF
org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
-org.apache.edgent.analytics:edgent-analytics-math3:{EV}
-org.apache.edgent.analytics:edgent-analytics-sensors:{EV}
-org.apache.edgent.connectors:edgent-connectors-command:{EV}
-org.apache.edgent.connectors:edgent-connectors-csv:{EV}
-org.apache.edgent.connectors:edgent-connectors-file:{EV}
-org.apache.edgent.connectors:edgent-connectors-http:{EV}
-org.apache.edgent.connectors:edgent-connectors-iot:{EV}
-org.apache.edgent.connectors:edgent-connectors-iotp:{EV}
-org.apache.edgent.connectors:edgent-connectors-jdbc:{EV}
-org.apache.edgent.connectors:edgent-connectors-kafka:{EV}
-org.apache.edgent.connectors:edgent-connectors-mqtt:{EV}
-org.apache.edgent.connectors:edgent-connectors-pubsub:{EV}
-org.apache.edgent.connectors:edgent-connectors-serial:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
-org.apache.edgent.providers:edgent-providers-development:{EV}
-org.apache.edgent.providers:edgent-providers-direct:{EV}
-org.apache.edgent.providers:edgent-providers-iot:{EV}
-org.apache.edgent.utils:edgent-utils-metrics:{EV}
-org.apache.edgent.utils:edgent-utils-streamscope:{EV}
+org.apache.edgent:edgent-analytics-math3:{EV}
+org.apache.edgent:edgent-analytics-sensors:{EV}
+org.apache.edgent:edgent-connectors-command:{EV}
+org.apache.edgent:edgent-connectors-csv:{EV}
+org.apache.edgent:edgent-connectors-file:{EV}
+org.apache.edgent:edgent-connectors-http:{EV}
+org.apache.edgent:edgent-connectors-iot:{EV}
+org.apache.edgent:edgent-connectors-iotp:{EV}
+org.apache.edgent:edgent-connectors-jdbc:{EV}
+org.apache.edgent:edgent-connectors-kafka:{EV}
+org.apache.edgent:edgent-connectors-mqtt:{EV}
+org.apache.edgent:edgent-connectors-pubsub:{EV}
+org.apache.edgent:edgent-connectors-serial:{EV}
+org.apache.edgent:edgent-connectors-websocket:{EV}
+org.apache.edgent:edgent-connectors-websocket-jetty:{EV}
+org.apache.edgent:edgent-providers-development:{EV}
+org.apache.edgent:edgent-providers-direct:{EV}
+org.apache.edgent:edgent-providers-iot:{EV}
+org.apache.edgent:edgent-utils-metrics:{EV}
+org.apache.edgent:edgent-utils-streamscope:{EV}
EOF
`
if [ "${EDGENT_PLATFORM}" != "java8" ]; then
@@ -110,8 +110,8 @@ if [ "${EDGENT_PLATFORM}" != "java8" ]; then
fi
if [ "${EDGENT_PLATFORM}" == "android" ]; then
DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "/edgent-providers-development/d"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-hardware:{EV}"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-topology:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android:edgent-android-hardware:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android:edgent-android-topology:{EV}"`
fi
@@ -136,7 +136,7 @@ mkdir -p target
DEP_DECLS_FILE=target/tmp-dep-decls
rm -f ${DEP_DECLS_FILE}
for i in ${ARTIFACT_GAVS}; do
- echo $i | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.core.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
+ echo $i | awk -F : '{ type=""; if ($3 == "{EV}") $3="${edgent.runtime.version}"; if ($4 != "") type=" <type>" $4 "</type>\n"; printf "<dependency>\n <groupId>%s</groupId>\n <artifactId>%s</artifactId>\n <version>%s</version>\n%s</dependency>\n", $1, $2, $3, type }' >> ${DEP_DECLS_FILE}
done
DEP_DECLS=`cat ${DEP_DECLS_FILE}`
@@ -158,7 +158,7 @@ echo
echo "##### Generating the bundles..."
EDGENT_VERSION_PROPERTY=
if [ "${EDGENT_VERSION}" ]; then
- EDGENT_VERSION_PROPERTY=-Dedgent.core.version=${EDGENT_VERSION}
+ EDGENT_VERSION_PROPERTY=-Dedgent.runtime.version=${EDGENT_VERSION}
fi
PLATFORM_PROFILE=
if [ ${EDGENT_PLATFORM} != "java8" ]; then
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/get-edgent-jars-project/old-get-edgent-jars.sh
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/old-get-edgent-jars.sh b/get-edgent-jars-project/old-get-edgent-jars.sh
index fffb747..40f5e07 100755
--- a/get-edgent-jars-project/old-get-edgent-jars.sh
+++ b/get-edgent-jars-project/old-get-edgent-jars.sh
@@ -35,7 +35,7 @@ USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version] [--a
set -e
-SAMPLES_DIR=`(cd $(dirname $0); pwd)`
+SAMPLES_DIR=`(cd $(dirname $0); pwd)`/..
MVN_CMD=${SAMPLES_DIR}/mvnw
EDGENT_PLATFORM=java8
@@ -82,26 +82,26 @@ fi
#
DEFAULT_GAVS=`cat << EOF
org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
-org.apache.edgent.analytics:edgent-analytics-math3:{EV}
-org.apache.edgent.analytics:edgent-analytics-sensors:{EV}
-org.apache.edgent.connectors:edgent-connectors-command:{EV}
-org.apache.edgent.connectors:edgent-connectors-csv:{EV}
-org.apache.edgent.connectors:edgent-connectors-file:{EV}
-org.apache.edgent.connectors:edgent-connectors-http:{EV}
-org.apache.edgent.connectors:edgent-connectors-iot:{EV}
-org.apache.edgent.connectors:edgent-connectors-iotp:{EV}
-org.apache.edgent.connectors:edgent-connectors-jdbc:{EV}
-org.apache.edgent.connectors:edgent-connectors-kafka:{EV}
-org.apache.edgent.connectors:edgent-connectors-mqtt:{EV}
-org.apache.edgent.connectors:edgent-connectors-pubsub:{EV}
-org.apache.edgent.connectors:edgent-connectors-serial:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
-org.apache.edgent.providers:edgent-providers-development:{EV}
-org.apache.edgent.providers:edgent-providers-direct:{EV}
-org.apache.edgent.providers:edgent-providers-iot:{EV}
-org.apache.edgent.utils:edgent-utils-metrics:{EV}
-org.apache.edgent.utils:edgent-utils-streamscope:{EV}
+org.apache.edgent:edgent-analytics-math3:{EV}
+org.apache.edgent:edgent-analytics-sensors:{EV}
+org.apache.edgent:edgent-connectors-command:{EV}
+org.apache.edgent:edgent-connectors-csv:{EV}
+org.apache.edgent:edgent-connectors-file:{EV}
+org.apache.edgent:edgent-connectors-http:{EV}
+org.apache.edgent:edgent-connectors-iot:{EV}
+org.apache.edgent:edgent-connectors-iotp:{EV}
+org.apache.edgent:edgent-connectors-jdbc:{EV}
+org.apache.edgent:edgent-connectors-kafka:{EV}
+org.apache.edgent:edgent-connectors-mqtt:{EV}
+org.apache.edgent:edgent-connectors-pubsub:{EV}
+org.apache.edgent:edgent-connectors-serial:{EV}
+org.apache.edgent:edgent-connectors-websocket:{EV}
+org.apache.edgent:edgent-connectors-websocket-jetty:{EV}
+org.apache.edgent:edgent-providers-development:{EV}
+org.apache.edgent:edgent-providers-direct:{EV}
+org.apache.edgent:edgent-providers-iot:{EV}
+org.apache.edgent:edgent-utils-metrics:{EV}
+org.apache.edgent:edgent-utils-streamscope:{EV}
EOF
`
if [ "${EDGENT_PLATFORM}" != "java8" ]; then
@@ -109,8 +109,8 @@ if [ "${EDGENT_PLATFORM}" != "java8" ]; then
fi
if [ "${EDGENT_PLATFORM}" == "android" ]; then
DEFAULT_GAVS=`echo "${DEFAULT_GAVS}" | sed -e "/edgent-providers-development/d"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-hardware:{EV}"`
- DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android.android:edgent-android-topology:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android:edgent-android-hardware:{EV}"`
+ DEFAULT_GAVS=`echo "${DEFAULT_GAVS}"; echo "org.apache.edgent.android:edgent-android-topology:{EV}"`
fi
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/get-edgent-jars-project/pom.xml.template
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/pom.xml.template b/get-edgent-jars-project/pom.xml.template
index bae3613..2027f84 100644
--- a/get-edgent-jars-project/pom.xml.template
+++ b/get-edgent-jars-project/pom.xml.template
@@ -28,11 +28,11 @@
<version>1.2.0-SNAPSHOT</version>
</parent-->
- <groupId>org.apache.edgent.get-edgent-jars</groupId>
- <artifactId>get-edgent-jars</artifactId>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>get-edgent-jars-project</artifactId>
<version>1.2.0-SNAPSHOT</version>
- <name>Apache Edgent get-edgent-jars ${samples.projname.platform}</name>
+ <name>Apache Edgent get-edgent-jars-project ${samples.projname.platform}</name>
<properties>
<samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
@@ -41,9 +41,9 @@
<edgent.base.groupId>org.apache.edgent${edgent.groupId.platform}</edgent.base.groupId>
<!-- at least for now, the samples version is lockstep with the core
so default to using the same core as the this project.
- get-edgent-jars.sh overrides via -Dedgent.core.version=...
+ get-edgent-jars.sh overrides via -Dedgent.runtime.version=...
-->
- <edgent.core.version>${project.version}</edgent.core.version>
+ <edgent.runtime.version>${project.version}</edgent.runtime.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -55,7 +55,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.5.3</version>
<configuration>
- <finalName>edgent-${edgent.platform}-jars-${edgent.core.version}</finalName>
+ <finalName>edgent-${edgent.platform}-jars-${edgent.runtime.version}</finalName>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/get-edgent-jars-project/src/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/get-edgent-jars-project/src/assembly/distribution.xml b/get-edgent-jars-project/src/assembly/distribution.xml
index 843bbf5..2f6da23 100644
--- a/get-edgent-jars-project/src/assembly/distribution.xml
+++ b/get-edgent-jars-project/src/assembly/distribution.xml
@@ -64,7 +64,7 @@
<include>org.apache.edgent*</include>
</includes>
<excludes>
- <exclude>org.apache.edgent.get-edgent-jars*</exclude>
+ <exclude>org.apache.edgent*:get-edgent-jars-project</exclude>
</excludes>
</dependencySet>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7e4efdc..45a0834 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,24 +22,24 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
+ <groupId>org.apache</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>apache</artifactId>
<version>18</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId>
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Edgent${samples.projname.platform}: Samples</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}:</name>
<properties>
- <samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
- <edgent.platform/> <!-- set by -Pplatform-* -->
- <edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
+ <samples.projname.platform>(Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
+ <edgent.runtime.platform/> <!-- set by -Pplatform-* -->
+ <edgent.runtime.groupId>org.apache.edgent${edgent.runtime.platform}</edgent.runtime.groupId>
<!-- at least for now, the samples version is lockstep with the core -->
- <edgent.core.version>${project.version}</edgent.core.version>
+ <edgent.runtime.version>${project.version}</edgent.runtime.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -67,9 +67,9 @@
<profile>
<id>platform-java7</id>
<properties>
- <edgent.platform>.java7</edgent.platform>
+ <edgent.runtime.platform>.java7</edgent.runtime.platform>
<platform.java7>true</platform.java7>
- <samples.projname.platform> (Java 7)</samples.projname.platform>
+ <samples.projname.platform>(Java 7)</samples.projname.platform>
</properties>
<build>
<plugins>
@@ -116,19 +116,19 @@
<!-- Other common sample dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index 31ce2fa..9b8628d 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -22,15 +22,14 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-scenarios</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Scenarios</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Scenarios</name>
<build>
<plugins>
@@ -59,18 +58,18 @@
<!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-samples-connectors</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/template/pom.xml
----------------------------------------------------------------------
diff --git a/template/pom.xml b/template/pom.xml
index ab67e31..e1e855d 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -35,9 +35,9 @@
<name>My Edgent Application</name>
<properties>
- <edgent.platform/> <!-- set by -Pplatform-* -->
- <edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
- <edgent.version>1.2.0-SNAPSHOT</edgent.version>
+ <edgent.runtime.platform/> <!-- set by -Pplatform-* -->
+ <edgent.runtime.groupId>org.apache.edgent${edgent.runtime.platform}</edgent.runtime.groupId>
+ <edgent.runtime.version>1.2.0-SNAPSHOT</edgent.runtime.version>
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -69,91 +69,91 @@
<!-- declare the Edgent provider(s) being used -->
<dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<!--dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-development</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!-- declare Edgent Android dependencies
-->
<!--dependency>
- <groupId>${edgent.base.groupId}.android</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-android-hardware</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.android</groupId>
+ <groupId>${edgent.runtime.groupId}.android</groupId>
<artifactId>edgent-android-topology</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!-- declare Edgent Analytics dependencies
-->
<!--dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!-- declare Edgent Utils dependencies
-->
<!--dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!-- declare Edgent Connector dependencies
-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iot</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-jdbc</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-kafka</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
<!--dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-connectors-serial</artifactId>
- <version>${edgent.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency-->
</dependencies>
@@ -164,7 +164,7 @@
<id>platform-java7</id>
<properties>
<platform.java7>true</platform.java7>
- <edgent.platform>.java7</edgent.platform>
+ <edgent.runtime.platform>.java7</edgent.runtime.platform>
</properties>
<build>
<plugins>
@@ -192,7 +192,7 @@
<id>platform-android</id>
<properties>
<platform.android>true</platform.android>
- <edgent.platform>.android</edgent.platform>
+ <edgent.runtime.platform>.android</edgent.runtime.platform>
</properties>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index 5259752..28d1ac3 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -22,27 +22,26 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Topology</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Topology</name>
<dependencies>
<!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>edgent-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cd3c96e4/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index 523a1ae..da2f87a 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,33 +22,32 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.edgent.samples</groupId>
+ <groupId>org.apache.edgent</groupId> <!-- EDGENT_BUILD_PARENT_GROUPID -->
<artifactId>edgent-samples</artifactId>
<version>1.2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
- <name>Apache Edgent Samples${samples.projname.platform}: Utils</name>
+ <name>Apache Edgent Samples ${samples.projname.platform}: Utils</name>
<dependencies>
<!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
+ <groupId>${edgent.runtime.groupId}</groupId>
<artifactId>edgent-console-server</artifactId>
- <version>${edgent.core.version}</version>
+ <version>${edgent.runtime.version}</version>
</dependency>
<dependency>