incubator-edgent git commit: - Disabled the "Cleanup" step of the build. - Fine tuned the Jenkinsfile to run "sonar" and "site-generation" only on the develop branch. - Fixed some warnings in the get-
Repository: incubator-edgent
Updated Branches:
refs/heads/develop 85f80d456 -> e8bbbfb67
- Disabled the "Cleanup" step of the build.
- Fine tuned the Jenkinsfile to run "sonar" and "site-generation" only on the
develop branch.
- Fixed some warnings in the get-edgent-jars.sh script
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/e8bbbfb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/e8bbbfb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/e8bbbfb6
Branch: refs/heads/develop
Commit: e8bbbfb67af88c442cae074eed4e3e7ccee74815
Parents: 85f80d4
Author: Christofer Dutz
Authored: Sun Nov 5 16:01:21 2017 +0100
Committer: Christofer Dutz
Committed: Sun Nov 5 16:01:21 2017 +0100
--
Jenkinsfile | 39 +++-
.../get-edgent-jars-project/get-edgent-jars.sh | 4 +-
2 files changed, 31 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e8bbbfb6/Jenkinsfile
--
diff --git a/Jenkinsfile b/Jenkinsfile
index 7e315aa..3087a6e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,17 +33,17 @@ node('ubuntu') {
def mavenGoal = "install"
def mavenLocalRepo = ""
if(env.BRANCH_NAME == 'develop') {
-mavenGoal = "deploy"
+mavenGoal = "sonar:sonar deploy"
} else {
mavenLocalRepo = "-Dmaven.repo.local=${env.WORKSPACE}/.repository"
}
def mavenFailureMode = "" // consider "--fail-at-end"? Odd ordering side
effects?
try {
-stage ('Cleanup') {
+/*stage ('Cleanup') {
echo 'Cleaning up the workspace'
deleteDir()
-}
+}*/
stage ('Checkout') {
echo 'Checking out branch ' + env.BRANCH_NAME
@@ -57,12 +57,16 @@ node('ubuntu') {
stage ('Build Edgent') {
echo 'Building Edgent'
-sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo}
-Pplatform-android,platform-java7,distribution,toolchain
-Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true ${mavenGoal} sonar:sonar"
+sh "${mvnHome}/bin/mvn ${mavenFailureMode} ${mavenLocalRepo}
-Pplatform-android,platform-java7,distribution,toolchain
-Djava8.home=${env.JAVA_HOME} -Dedgent.build.ci=true ${mavenGoal}"
}
stage ('Build Site') {
-echo 'Building Site'
-sh "${mvnHome}/bin/mvn ${mavenLocalRepo} site site:stage"
+if(env.BRANCH_NAME == 'develop') {
+echo 'Building Site'
+sh "${mvnHome}/bin/mvn ${mavenLocalRepo} site site:stage"
+} else {
+echo 'Building Site (skipped for non develop branch)'
+}
}
stage ('Build Samples') {
@@ -80,10 +84,25 @@ node('ubuntu') {
sh "cd samples/template; ${mvnHome}/bin/mvn ${mavenFailureMode}
${mavenLocalRepo} -Pplatform-android clean package; ./app-run.sh"
}
-stage ('Verify get-engent-jars') {
-echo 'Verifying get-edgent-jars'
-sh "cd samples/get-edgent-jars-project; ./get-edgent-jars.sh"
-}
+/* There seems to be a problem with this (Here the output of the build
log):
+
+Verifying get-edgent-jars
+[Pipeline] sh
+
[edgent-pipeline_develop-JN4DHO6BQV4SCTGBDJEOL4ZIC6T36DGONHH3VGS4DCDBO6UXH4MA]
Running shell script
++ cd samples/get-edgent-jars-project
++ ./get-edgent-jars.sh
+./get-edgent-jars.sh: 111: [: java8: unexpected operator
+./get-edgent-jars.sh: 118: ./get-edgent-jars.sh: Syntax error: "("
unexpected
+
+*/
+/*stage ('Verify get-engent-jars') {
+if(env.BRANCH_NAME == 'develop') {
+echo 'Verifying get-edgent-jars'
+sh "cd samples/get-edgent-jars-project; ./get-edgent-jars.sh"
+} else {
+echo 'Verifying get-edgent-jars (skipped for non develop
branch)'
+}
+}*/
}
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e8bbbfb6/samples/get-edgent-jars-project/get-edgent-jars.sh
--
diff --git a/samples/get-edgent-jars-project/get-edgent-jars.sh
b/samples/get-edgent-jars-project/get-edgent-jars.sh
index a8c50f7..8d0c5ce 100755
--- a/samples/get-edgent-jars-project/get-edgent-jars.sh
+++ b/samples/get-edgent-jars-project/get-edgent-jars.sh
@@ -120,7 +120,7 @@ function confirm () { # [$1: question]
# call with a prompt string or use a default
incubator-edgent git commit: - Added a reference to the travis build status image to the README.md
Repository: incubator-edgent Updated Branches: refs/heads/develop e8bbbfb67 -> ab1f04ae2 - Added a reference to the travis build status image to the README.md Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/ab1f04ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/ab1f04ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/ab1f04ae Branch: refs/heads/develop Commit: ab1f04ae2bc2d0b2b1a1c1d838efb09860676f24 Parents: e8bbbfb Author: Christofer Dutz Authored: Sun Nov 5 17:00:43 2017 +0100 Committer: Christofer Dutz Committed: Sun Nov 5 17:00:43 2017 +0100 -- README.md | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ab1f04ae/README.md -- diff --git a/README.md b/README.md index cf5909e..9dda318 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ --> # Welcome to Apache Edgent! +[](https://travis-ci.org/apache/incubator-edgent) + *Apache Edgent is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator PMC. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.* Apache Edgent is an open source programming model and runtime for edge devices that enables you to analyze data and events at the device.
[2/3] incubator-edgent git commit: Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/9f75a0f7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/9f75a0f7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/9f75a0f7 Branch: refs/heads/develop Commit: 9f75a0f723fd38cdf7e251e093a2b7d8102778fa Parents: 98bc09f d2e4710 Author: Christofer Dutz Authored: Mon Nov 6 21:03:47 2017 +0100 Committer: Christofer Dutz Committed: Mon Nov 6 21:03:47 2017 +0100 -- RELEASE_NOTES | 77 +- samples/README.md | 3 +- 2 files changed, 46 insertions(+), 34 deletions(-) --
[3/3] incubator-edgent git commit: - Removed some testfile prior to branching
- Removed some testfile prior to branching Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/17bcbb2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/17bcbb2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/17bcbb2c Branch: refs/heads/develop Commit: 17bcbb2c712d00cf709b7bb1eec6eebaee3c0fbd Parents: 9f75a0f Author: Christofer Dutz Authored: Mon Nov 6 21:08:43 2017 +0100 Committer: Christofer Dutz Committed: Mon Nov 6 21:08:43 2017 +0100 -- Failing Tests.txt | 26 -- 1 file changed, 26 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/17bcbb2c/Failing Tests.txt -- diff --git a/Failing Tests.txt b/Failing Tests.txt deleted file mode 100644 index 37856f3..000 --- a/Failing Tests.txt +++ /dev/null @@ -1,26 +0,0 @@ - - -List of tests I have observed to fail every now and then ... could use -some investigation on why they are failing. - -connectors/mqtt: -MqttStreamsTestManual.testConnectRetryPub -connectors/websocket -WebSocketClientTest.testSslPublicServer \ No newline at end of file
[1/3] incubator-edgent git commit: - Addressed the SonarQube issues reported for ConsoleJobServlet.java
Repository: incubator-edgent
Updated Branches:
refs/heads/develop d2e471040 -> 17bcbb2c7
- Addressed the SonarQube issues reported for ConsoleJobServlet.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/98bc09f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/98bc09f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/98bc09f8
Branch: refs/heads/develop
Commit: 98bc09f8a81b28c8f852691c3c45edcdf11ab85d
Parents: ab1f04a
Author: Christofer Dutz
Authored: Sun Nov 5 17:55:13 2017 +0100
Committer: Christofer Dutz
Committed: Sun Nov 5 17:55:13 2017 +0100
--
.../console/servlets/ConsoleJobServlet.java | 24 +++-
1 file changed, 13 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/98bc09f8/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java
--
diff --git
a/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java
b/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java
index d1b1fb9..94bc913 100644
---
a/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java
+++
b/console/servlets/src/main/java/org/apache/edgent/console/servlets/ConsoleJobServlet.java
@@ -50,32 +50,31 @@ public class ConsoleJobServlet extends HttpServlet {
boolean jobsInfo = false;
boolean jobGraph = false;
for(Map.Entry entry : parameterMap.entrySet()) {
-if (entry.getKey().equals("jobsInfo")) {
+if ("jobsInfo".equals(entry.getKey())) {
String[] vals = entry.getValue();
-if (vals[0].equals("true")) {
+if ("true".equals(vals[0])) {
jobsInfo = true;
}
-} else if (entry.getKey().equals("jobgraph")) {
+} else if ("jobgraph".equals(entry.getKey())) {
String[] vals = entry.getValue();
-if (vals[0].equals("true")) {
+if ("true".equals(vals[0])) {
jobGraph = true;
}
-} else if (entry.getKey().equals("jobId")) {
+} else if ("jobId".equals(entry.getKey())) {
String[] ids = entry.getValue();
if (ids.length == 1) {
jobId = ids[0];
}
}
}
-
-StringBuffer sbuf = new StringBuffer();
+StringBuilder sbuf = new StringBuilder();
sbuf.append("*:interface=");
sbuf.append(ObjectName.quote("org.apache.edgent.execution.mbeans.JobMXBean"));
sbuf.append(",type=");
sbuf.append(ObjectName.quote("job"));
-if (!jobId.equals("")) {
+if (!jobId.isEmpty()) {
sbuf.append(",id=");
sbuf.append(ObjectName.quote(jobId));
}
@@ -90,13 +89,16 @@ public class ConsoleJobServlet extends HttpServlet {
String jsonString = "";
if (jobsInfo) {
jsonString = JobUtil.getJobsInfo(jobObjName);
-} else if (jobGraph && !(jobId.equals("")) &&
!(jobId.equals("undefined"))) {
+} else if (jobGraph && !(jobId.isEmpty()) &&
!("undefined".equals(jobId))) {
jsonString = JobUtil.getJobGraph(jobObjName);
}
response.setContentType("application/json");
response.setCharacterEncoding("UTF-8");
-response.getWriter().write(jsonString);
-
+try {
+response.getWriter().write(jsonString);
+} catch (IOException e) {
+throw new ServletException(e);
+}
}
}
incubator-edgent git commit: [maven-release-plugin] prepare branch release/1.2
Repository: incubator-edgent Updated Branches: refs/heads/develop 17bcbb2c7 -> b73205583 [maven-release-plugin] prepare branch release/1.2 Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/b7320558 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/b7320558 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/b7320558 Branch: refs/heads/develop Commit: b73205583b360ac953b7da110571df3c837895a1 Parents: 17bcbb2 Author: Christofer Dutz Authored: Mon Nov 6 21:13:12 2017 +0100 Committer: Christofer Dutz Committed: Mon Nov 6 21:13:12 2017 +0100 -- analytics/math3/pom.xml | 3 +-- analytics/pom.xml| 3 +-- analytics/sensors/pom.xml| 3 +-- api/execution/pom.xml| 3 +-- api/function/pom.xml | 3 +-- api/graph/pom.xml| 3 +-- api/oplet/pom.xml| 3 +-- api/pom.xml | 3 +-- api/topology/pom.xml | 3 +-- api/window/pom.xml | 3 +-- apps/iot/pom.xml | 3 +-- apps/pom.xml | 3 +-- apps/runtime/pom.xml | 3 +-- connectors/command/pom.xml | 3 +-- connectors/common/pom.xml| 3 +-- connectors/csv/pom.xml | 3 +-- connectors/file/pom.xml | 3 +-- connectors/http/pom.xml | 3 +-- connectors/iot/pom.xml | 3 +-- connectors/iotp/pom.xml | 3 +-- connectors/jdbc/pom.xml | 3 +-- connectors/kafka/pom.xml | 3 +-- connectors/mqtt/pom.xml | 3 +-- connectors/pom.xml | 3 +-- connectors/pubsub/pom.xml| 3 +-- connectors/serial/pom.xml| 3 +-- connectors/websocket-base/pom.xml| 3 +-- connectors/websocket-jetty/pom.xml | 3 +-- connectors/websocket-misc/pom.xml| 3 +-- connectors/websocket-server/pom.xml | 3 +-- connectors/websocket/pom.xml | 3 +-- console/pom.xml | 3 +-- console/server/pom.xml | 3 +-- console/servlets/pom.xml | 3 +-- platforms/pom.xml| 3 +-- pom.xml | 11 +-- providers/development/pom.xml| 3 +-- providers/direct/pom.xml | 3 +-- providers/iot/pom.xml| 3 +-- providers/pom.xml| 3 +-- runtime/appservice/pom.xml | 3 +-- runtime/etiao/pom.xml| 3 +-- runtime/jmxcontrol/pom.xml | 3 +-- runtime/jobregistry/pom.xml | 3 +-- runtime/jsoncontrol/pom.xml | 3 +-- runtime/pom.xml | 3 +-- spi/graph/pom.xml| 3 +-- spi/pom.xml | 3 +-- spi/topology/pom.xml | 3 +-- test/appservice-applications/pom.xml | 3 +-- test/fvtiot/pom.xml | 3 +-- test/pom.xml | 3 +-- test/svt/pom.xml | 3 +-- utils/metrics/pom.xml| 3 +-- utils/pom.xml| 3 +-- utils/streamscope/pom.xml| 3 +-- 56 files changed, 60 insertions(+), 116 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b7320558/analytics/math3/pom.xml -- diff --git a/analytics/math3/pom.xml b/analytics/math3/pom.xml index c287f99..7ba1051 100644 --- a/analytics/math3/pom.xml +++ b/analytics/math3/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b7320558/analytics/pom.xml -- diff --git a/analytics/pom.xml b/analytics/pom.xml index a018ccc..81ccde8 100644 --- a/analytics/pom.xml +++ b/analytics/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/P
incubator-edgent git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-edgent
Updated Branches:
refs/heads/develop b73205583 -> a221f2fba
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/a221f2fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/a221f2fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/a221f2fb
Branch: refs/heads/develop
Commit: a221f2fbae81c44a77813a57056d26d318fa51e0
Parents: b732055
Author: Christofer Dutz
Authored: Mon Nov 6 21:13:20 2017 +0100
Committer: Christofer Dutz
Committed: Mon Nov 6 21:13:20 2017 +0100
--
analytics/math3/pom.xml | 10 +-
analytics/pom.xml| 2 +-
analytics/sensors/pom.xml| 10 +-
api/execution/pom.xml| 4 ++--
api/function/pom.xml | 2 +-
api/graph/pom.xml| 4 ++--
api/oplet/pom.xml| 8
api/pom.xml | 2 +-
api/topology/pom.xml | 10 +-
api/window/pom.xml | 4 ++--
apps/iot/pom.xml | 10 +-
apps/pom.xml | 2 +-
apps/runtime/pom.xml | 10 +-
connectors/command/pom.xml | 14 +++---
connectors/common/pom.xml| 10 +-
connectors/csv/pom.xml | 8
connectors/file/pom.xml | 16
connectors/http/pom.xml | 8
connectors/iot/pom.xml | 6 +++---
connectors/iotp/pom.xml | 8
connectors/jdbc/pom.xml | 14 +++---
connectors/kafka/pom.xml | 12 ++--
connectors/mqtt/pom.xml | 16
connectors/pom.xml | 2 +-
connectors/pubsub/pom.xml| 6 +++---
connectors/serial/pom.xml| 4 ++--
connectors/websocket-base/pom.xml| 4 ++--
connectors/websocket-jetty/pom.xml | 4 ++--
connectors/websocket-misc/pom.xml| 2 +-
connectors/websocket-server/pom.xml | 4 ++--
connectors/websocket/pom.xml | 18 +-
console/pom.xml | 2 +-
console/server/pom.xml | 4 ++--
console/servlets/pom.xml | 4 ++--
platforms/pom.xml| 2 +-
pom.xml | 4 ++--
providers/development/pom.xml| 16
providers/direct/pom.xml | 20 ++--
providers/iot/pom.xml| 16
providers/pom.xml| 2 +-
runtime/appservice/pom.xml | 8
runtime/etiao/pom.xml| 10 +-
runtime/jmxcontrol/pom.xml | 6 +++---
runtime/jobregistry/pom.xml | 6 +++---
runtime/jsoncontrol/pom.xml | 6 +++---
runtime/pom.xml | 2 +-
spi/graph/pom.xml| 6 +++---
spi/pom.xml | 2 +-
spi/topology/pom.xml | 4 ++--
test/appservice-applications/pom.xml | 4 ++--
test/fvtiot/pom.xml | 14 +++---
test/pom.xml | 2 +-
test/svt/pom.xml | 10 +-
utils/metrics/pom.xml| 6 +++---
utils/pom.xml| 2 +-
utils/streamscope/pom.xml| 6 +++---
56 files changed, 199 insertions(+), 199 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a221f2fb/analytics/math3/pom.xml
--
diff --git a/analytics/math3/pom.xml b/analytics/math3/pom.xml
index 7ba1051..552772c 100644
--- a/analytics/math3/pom.xml
+++ b/analytics/math3/pom.xml
@@ -23,7 +23,7 @@
org.apache.edgent
edgent-analytics
-1.2.0-SNAPSHOT
+1.3.0-SNAPSHOT
edgent-analytics-math3
@@ -38,7 +38,7 @@
${edgent.runtime.groupId}
edgent-api-topology
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
org.apache.commons
@@ -49,20 +49,20 @@
${edgent.runtime.groupId}
edgent-providers-direct
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
test
${edgent.runtime.groupId}
edgent-providers-direct
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
test-jar
test
${edgent.runtime.groupId}
edgent-api-topology
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
test-jar
test
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a221f2fb/analytics/pom.xml
--
diff --git a/analytics/
[incubator-edgent] Git Push Summary
Repository: incubator-edgent Updated Branches: refs/heads/release/1.2 [created] b73205583
incubator-edgent git commit: - Updated the versions of the java7 and android modules
Repository: incubator-edgent Updated Branches: refs/heads/develop 11e4f8493 -> 201264091 - Updated the versions of the java7 and android modules Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/20126409 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/20126409 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/20126409 Branch: refs/heads/develop Commit: 2012640912fcab096d5f646503dd2dbd66d7b1c4 Parents: 11e4f84 Author: Christofer Dutz Authored: Tue Nov 7 09:10:37 2017 +0100 Committer: Christofer Dutz Committed: Tue Nov 7 09:10:37 2017 +0100 -- platforms/android/analytics/math3/pom.xml | 2 +- platforms/android/analytics/pom.xml | 2 +- platforms/android/analytics/sensors/pom.xml | 2 +- platforms/android/android/hardware/pom.xml| 2 +- platforms/android/android/pom.xml | 2 +- platforms/android/android/topology/pom.xml| 2 +- platforms/android/api/execution/pom.xml | 2 +- platforms/android/api/function/pom.xml| 2 +- platforms/android/api/graph/pom.xml | 2 +- platforms/android/api/oplet/pom.xml | 2 +- platforms/android/api/pom.xml | 2 +- platforms/android/api/topology/pom.xml| 2 +- platforms/android/api/window/pom.xml | 2 +- platforms/android/apps/iot/pom.xml| 2 +- platforms/android/apps/pom.xml| 2 +- platforms/android/apps/runtime/pom.xml| 2 +- platforms/android/connectors/command/pom.xml | 2 +- platforms/android/connectors/common/pom.xml | 2 +- platforms/android/connectors/csv/pom.xml | 2 +- platforms/android/connectors/file/pom.xml | 2 +- platforms/android/connectors/http/pom.xml | 2 +- platforms/android/connectors/iot/pom.xml | 2 +- platforms/android/connectors/iotp/pom.xml | 2 +- platforms/android/connectors/jdbc/pom.xml | 2 +- platforms/android/connectors/kafka/pom.xml| 2 +- platforms/android/connectors/mqtt/pom.xml | 2 +- platforms/android/connectors/pom.xml | 2 +- platforms/android/connectors/pubsub/pom.xml | 2 +- platforms/android/connectors/serial/pom.xml | 2 +- platforms/android/connectors/websocket-base/pom.xml | 2 +- platforms/android/connectors/websocket-jetty/pom.xml | 2 +- platforms/android/connectors/websocket-misc/pom.xml | 2 +- platforms/android/connectors/websocket-server/pom.xml | 2 +- platforms/android/connectors/websocket/pom.xml| 2 +- platforms/android/distribution/pom.xml| 2 +- platforms/android/providers/direct/pom.xml| 2 +- platforms/android/providers/iot/pom.xml | 2 +- platforms/android/providers/pom.xml | 2 +- platforms/android/runtime/appservice/pom.xml | 2 +- platforms/android/runtime/etiao/pom.xml | 2 +- platforms/android/runtime/jobregistry/pom.xml | 2 +- platforms/android/runtime/jsoncontrol/pom.xml | 2 +- platforms/android/runtime/pom.xml | 2 +- platforms/android/spi/graph/pom.xml | 2 +- platforms/android/spi/pom.xml | 2 +- platforms/android/spi/topology/pom.xml| 2 +- platforms/android/utils/metrics/pom.xml | 2 +- platforms/android/utils/pom.xml | 2 +- platforms/android/utils/streamscope/pom.xml | 2 +- platforms/java7/analytics/math3/pom.xml | 2 +- platforms/java7/analytics/pom.xml | 2 +- platforms/java7/analytics/sensors/pom.xml | 2 +- platforms/java7/api/execution/pom.xml | 2 +- platforms/java7/api/function/pom.xml | 2 +- platforms/java7/api/graph/pom.xml | 2 +- platforms/java7/api/oplet/pom.xml | 2 +- platforms/java7/api/pom.xml | 2 +- platforms/java7/api/topology/pom.xml | 2 +- platforms/java7/api/window/pom.xml| 2 +- platforms/java7/apps/iot/pom.xml | 2 +- platforms/java7/apps/pom.xml | 2 +- platforms/java7/apps/runtime/pom.xml | 2 +- platforms/java7/connectors/command/pom.xml| 2 +- platforms/java7/connectors/common/pom.xml | 2 +- platforms/java7/connectors/csv/pom.xml| 2 +- platforms/java7/connectors/file/pom.xml | 2 +- platforms/java7/connectors/http/pom.xml | 2 +- platforms/java7/connectors/iot/pom.xml| 2 +- platforms/java7/connectors/io
incubator-edgent git commit: - Some minor update to the release branch to make it appear more tree-like
Repository: incubator-edgent Updated Branches: refs/heads/release/1.2 b73205583 -> 9af292b6f - Some minor update to the release branch to make it appear more tree-like Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/9af292b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/9af292b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/9af292b6 Branch: refs/heads/release/1.2 Commit: 9af292b6fb855f9c5ee341166c34b6dab6a37e19 Parents: b732055 Author: Christofer Dutz Authored: Tue Nov 7 09:22:22 2017 +0100 Committer: Christofer Dutz Committed: Tue Nov 7 09:22:22 2017 +0100 -- RELEASE_NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/9af292b6/RELEASE_NOTES -- diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 0021af8..7ae024d 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -8,7 +8,7 @@ A release now includes two source bundles: - Edgent Samples bundle A release now publishes the Edgent SDK jars in Apache Nexus Release -repository and to the Maven Central repository. +repository which are automatically mirrored to the Maven Central repository. A binary bundle (tgz) is no longer released. The new `get-edgent-jars.sh` tool included in the Samples source bundle can be used to create such
incubator-edgent git commit: - Initial version of the release documentation
Repository: incubator-edgent Updated Branches: refs/heads/develop 201264091 -> 8e9502188 - Initial version of the release documentation Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/8e950218 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/8e950218 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/8e950218 Branch: refs/heads/develop Commit: 8e95021884e206186b03c8dc076b44658731c549 Parents: 2012640 Author: Christofer Dutz Authored: Tue Nov 7 09:41:39 2017 +0100 Committer: Christofer Dutz Committed: Tue Nov 7 09:41:39 2017 +0100 -- src/site/asciidoc/releasing.adoc | 57 +++ 1 file changed, 57 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/8e950218/src/site/asciidoc/releasing.adoc -- diff --git a/src/site/asciidoc/releasing.adoc b/src/site/asciidoc/releasing.adoc new file mode 100644 index 000..d7a6525 --- /dev/null +++ b/src/site/asciidoc/releasing.adoc @@ -0,0 +1,57 @@ + + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + +# Releasing Edgent + +In general the `master` branch contains the repository state of the latest release of Edgent. +No commit should be done to `master` except for merging after a successful release. + +Normal development is done in the `develop` branch or in feature branches that are merged to `develop` after they are finished. + +A version is built up of three parts: `major`.`minor`.`bugfix`. For each major and minor version a corresponding `release` branch is maintained. +This allows shipping of bug-fix releases, if this is required. For bug-fix releases no new branch is created. + +Assuming develop is currently in version `1.2.0-SNAPSHOT` and we are preparing a new release, then we would first create a `release/1.2` branch. Within this branch, the Edgent version is `1.2.0-SNAPSHOT` and develop becomes `1.3.0-SNAPSHOT`. +In the `release/1.2` branch all work prior to cutting a release or for fixing bug-fixes in an existing release can be performed. This branch is usually used to stabilize the software prior to a release. + +As soon as the release branch is stable enough, the release manager cuts a release. + +When doing this, all modules versions are set to a release version, this version is committed and tagged and then the version is usually incremented to the next higher bug-fix version. +So if the `release/1.2` branch is currently in version `1.2.0-SNAPSHOT`, the versions are changed to `1.2.0` and after the committing and tagging the version is updated to `1.2.1-SNAPSHOT`. + +All of these steps are automated by the `maven-release-plugin`. + +## Creating the release branch + +A new release branch is always created from the `develop` branch. So make sure all changes have been pulled and the repo is up to date. + +The following command performs the branching: + +mvn release:branch -P platform-android,platform-java7,distribution -DbranchName=release/1.2 -DautoVersionSubmodules=true + +Without the `-DautoVersionSubmodules=true` we would have to specify the version for each module separately. This way we only have to specify the version of the root module and all children will inherit this version. + +Also the only way all modules are processed, is if we enable the `distribution` and the two `platform-android` and `platform-java7` profiles. + +After this the branches and the changes are committed, but not yet pushed. So as a last step here the release-manager needs to push the changes in his git repo. + + +## Preparing a release + +To be continued ... \ No newline at end of file
incubator-edgent git commit: - Some minor update to the release branch to make it appear more tree-like
Repository: incubator-edgent Updated Branches: refs/heads/develop 8e9502188 -> fda24d193 - Some minor update to the release branch to make it appear more tree-like (cherry picked from commit 9af292b) Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/fda24d19 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/fda24d19 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/fda24d19 Branch: refs/heads/develop Commit: fda24d19300673c2a6fb5c194fa38e7452c06aa2 Parents: 8e95021 Author: Christofer Dutz Authored: Tue Nov 7 09:22:22 2017 +0100 Committer: Christofer Dutz Committed: Tue Nov 7 09:42:53 2017 +0100 -- RELEASE_NOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/fda24d19/RELEASE_NOTES -- diff --git a/RELEASE_NOTES b/RELEASE_NOTES index ece3878..7da5c39 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -8,7 +8,7 @@ A release now includes two source bundles: - Edgent Samples bundle A release now publishes the Edgent SDK jars in Apache Nexus Release -repository and to the Maven Central repository. +repository which are automatically mirrored to the Maven Central repository. A binary bundle (tgz) is no longer released. The new `get-edgent-jars.sh` tool included in the Samples source bundle can be used to create such
[3/4] incubator-edgent git commit: - Replaced a lot of the structural variables with constants to eventually make releasing easier.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/http/pom.xml
--
diff --git a/platforms/android/connectors/http/pom.xml
b/platforms/android/connectors/http/pom.xml
index d3c8fe4..d321de7 100644
--- a/platforms/android/connectors/http/pom.xml
+++ b/platforms/android/connectors/http/pom.xml
@@ -29,7 +29,7 @@
edgent-connectors-http
- Apache Edgent ${edgent.projname.platform}: Connectors: HTTP
+ Apache Edgent (Android): Connectors: HTTP
../../../../src/main/ibm-remote-resources
@@ -50,7 +50,7 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent.java7
${project.artifactId}
${project.version}
${project.build.directory}/classes
@@ -66,7 +66,7 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-topology
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/iot/pom.xml
--
diff --git a/platforms/android/connectors/iot/pom.xml
b/platforms/android/connectors/iot/pom.xml
index b21ca48..1339eae 100644
--- a/platforms/android/connectors/iot/pom.xml
+++ b/platforms/android/connectors/iot/pom.xml
@@ -29,7 +29,7 @@
edgent-connectors-iot
- Apache Edgent ${edgent.projname.platform}: Connectors: IoT
+ Apache Edgent (Android): Connectors: IoT
../../../../src/main/ibm-remote-resources
@@ -50,7 +50,7 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent.java7
${project.artifactId}
${project.version}
${project.build.directory}/classes
@@ -66,12 +66,12 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-function
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-topology
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/iotp/pom.xml
--
diff --git a/platforms/android/connectors/iotp/pom.xml
b/platforms/android/connectors/iotp/pom.xml
index c674167..2a65211 100644
--- a/platforms/android/connectors/iotp/pom.xml
+++ b/platforms/android/connectors/iotp/pom.xml
@@ -29,7 +29,7 @@
edgent-connectors-iotp
- Apache Edgent ${edgent.projname.platform}: Connectors: IoTP
+ Apache Edgent (Android): Connectors: IoTP
../../../../src/main/ibm-remote-resources
@@ -50,7 +50,7 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent.java7
${project.artifactId}
${project.version}
${project.build.directory}/classes
@@ -66,17 +66,17 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-function
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-topology
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-connectors-iot
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/jdbc/pom.xml
--
diff --git a/platforms/android/connectors/jdbc/pom.xml
b/platforms/android/connectors/jdbc/pom.xml
index fff2af4..eeb6207 100644
--- a/platforms/android/connectors/jdbc/pom.xml
+++ b/platforms/android/connectors/jdbc/pom.xml
@@ -29,7 +29,7 @@
edgent-connectors-jdbc
- Apache Edgent ${edgent.projname.platform}: Connectors: JDBC
+ Apache Edgent (Android): Connectors: JDBC
../../../../src/main/ibm-remote-resources
@@ -50,7 +50,7 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent.java7
${project.artifactId}
${project.version}
${project.build.directory}/classes
@@ -66,12 +66,12 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-topology
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-function
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/android/connectors/kafka/pom.xml
--
diff --git a/platforms/android/connectors/kafka/pom.xml
b/platform
[1/4] incubator-edgent git commit: - Replaced a lot of the structural variables with constants to eventually make releasing easier.
Repository: incubator-edgent
Updated Branches:
refs/heads/feature/pre-release-finetuning [created] a4c77bf83
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 @@
edgent-test-fvtiot
- Apache Edgent ${edgent.projname.platform}: Test: fvtiot
+ Apache Edgent (Java 7): Test: fvtiot
@@ -46,14 +46,25 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
${project.build.directory}/classes
META-INF/**
+
+
+
+
+copy-test
+test-compile
+
+ unpack
+
+
+
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
tests
@@ -72,7 +83,7 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-test-appservice-applications
${project.version}
${project.build.directory}/test-resources
@@ -88,38 +99,38 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-connectors-pubsub
1.3.0-SNAPSHOT
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-runtime-jsoncontrol
1.3.0-SNAPSHOT
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-providers-direct
1.3.0-SNAPSHOT
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-apps-iot
1.3.0-SNAPSHOT
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-apps-iot
1.3.0-SNAPSHOT
test-jar
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-providers-iot
1.3.0-SNAPSHOT
test
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 @@
edgent-test
pom
- Apache Edgent ${edgent.projname.platform}: Test
+ Apache Edgent (Java 7): Test
appservice-applications
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 @@
edgent-test-svt
- Apache Edgent ${edgent.projname.platform}: Test: SVT
+ Apache Edgent (Java 7): Test: SVT
../../../../src/main/ibm-remote-resources
@@ -50,14 +50,25 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
${project.build.directory}/classes
META-INF/**
+
+
+
+
+copy-test
+test-compile
+
+ unpack
+
+
+
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
tests
@@ -74,22 +85,22 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-topology
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-console-server
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-utils-metrics
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-providers-development
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/utils/metrics/pom.xml
[2/4] incubator-edgent git commit: - Replaced a lot of the structural variables with constants to eventually make releasing easier.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/file/pom.xml
--
diff --git a/platforms/java7/connectors/file/pom.xml
b/platforms/java7/connectors/file/pom.xml
index 6b9493a..5981306 100644
--- a/platforms/java7/connectors/file/pom.xml
+++ b/platforms/java7/connectors/file/pom.xml
@@ -29,7 +29,7 @@
edgent-connectors-file
- Apache Edgent ${edgent.projname.platform}: Connectors: File
+ Apache Edgent (Java 7): Connectors: File
../../../../src/main/ibm-remote-resources
@@ -50,14 +50,25 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
${project.build.directory}/classes
META-INF/**
+
+
+
+
+copy-test
+test-compile
+
+ unpack
+
+
+
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
tests
@@ -74,43 +85,43 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-function
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-oplet
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-topology
1.3.0-SNAPSHOT
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-connectors-common
1.3.0-SNAPSHOT
test-jar
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-providers-direct
1.3.0-SNAPSHOT
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-providers-direct
1.3.0-SNAPSHOT
test-jar
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-topology
1.3.0-SNAPSHOT
test-jar
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/http/pom.xml
--
diff --git a/platforms/java7/connectors/http/pom.xml
b/platforms/java7/connectors/http/pom.xml
index 33fcecc..b1a422a 100644
--- a/platforms/java7/connectors/http/pom.xml
+++ b/platforms/java7/connectors/http/pom.xml
@@ -29,7 +29,7 @@
edgent-connectors-http
- Apache Edgent ${edgent.projname.platform}: Connectors: HTTP
+ Apache Edgent (Java 7): Connectors: HTTP
../../../../src/main/ibm-remote-resources
@@ -50,14 +50,25 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
${project.build.directory}/classes
META-INF/**
+
+
+
+
+copy-test
+test-compile
+
+ unpack
+
+
+
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
tests
@@ -74,7 +85,7 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-api-topology
1.3.0-SNAPSHOT
@@ -90,13 +101,13 @@
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-providers-direct
1.3.0-SNAPSHOT
test
- ${edgent.runtime.groupId}
+ ${project.groupId}
edgent-providers-direct
1.3.0-SNAPSHOT
test-jar
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/a4c77bf8/platforms/java7/connectors/iot/pom.xml
--
diff --git a/platforms/java7/connectors/iot/pom.xml
b/platforms/java7/connectors/iot/pom.xml
index ccb1c87..8ae7a33 100644
--- a/platforms/java7/connectors/iot/pom.xml
+++ b/platforms/java7/connectors/iot/pom.xml
@@ -29,7 +29,7 @@
edgent-connectors-iot
- Apache Edgent ${edgent.projname.platform}: Connectors: IoT
+ Apache Edgent (Java 7): Connectors: IoT
../../../../src/main/ibm-remote-resources
@@ -50,14 +50,25 @@
- ${edgent.retrolambda.srcArtifactGroupId}
+ org.apache.edgent
${project.artifactId}
${project.version}
${project.build.di
[4/4] incubator-edgent git commit: - Replaced a lot of the structural variables with constants to eventually make releasing easier.
- Replaced a lot of the structural variables with constants to eventually make releasing easier. Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/a4c77bf8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/a4c77bf8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/a4c77bf8 Branch: refs/heads/feature/pre-release-finetuning Commit: a4c77bf83c6090fb9b29bb13adee2f34647085a6 Parents: f46dd81 Author: Christofer Dutz Authored: Sun Nov 12 22:35:30 2017 +0100 Committer: Christofer Dutz Committed: Sun Nov 12 22:35:30 2017 +0100 -- analytics/math3/pom.xml | 10 ++-- analytics/pom.xml | 2 +- analytics/sensors/pom.xml | 10 ++-- api/execution/pom.xml | 4 +- api/function/pom.xml| 2 +- api/graph/pom.xml | 4 +- api/oplet/pom.xml | 8 +-- api/pom.xml | 2 +- api/topology/pom.xml| 10 ++-- api/window/pom.xml | 4 +- apps/iot/pom.xml| 10 ++-- apps/pom.xml| 2 +- apps/runtime/pom.xml| 10 ++-- connectors/command/pom.xml | 14 ++--- connectors/common/pom.xml | 10 ++-- connectors/csv/pom.xml | 8 +-- connectors/file/pom.xml | 16 +++--- connectors/http/pom.xml | 8 +-- connectors/iot/pom.xml | 6 +-- connectors/iotp/pom.xml | 8 +-- connectors/jdbc/pom.xml | 14 ++--- connectors/kafka/pom.xml| 12 ++--- connectors/mqtt/pom.xml | 16 +++--- connectors/pom.xml | 2 +- connectors/pubsub/pom.xml | 6 +-- connectors/serial/pom.xml | 4 +- connectors/websocket-base/pom.xml | 4 +- connectors/websocket-jetty/pom.xml | 4 +- connectors/websocket-misc/pom.xml | 2 +- connectors/websocket-server/pom.xml | 4 +- connectors/websocket/pom.xml| 18 +++ console/pom.xml | 2 +- console/server/pom.xml | 6 +-- console/servlets/pom.xml| 4 +- distribution/pom.xml| 46 platforms/android/analytics/math3/pom.xml | 6 +-- platforms/android/analytics/pom.xml | 2 +- platforms/android/analytics/sensors/pom.xml | 6 +-- platforms/android/android/hardware/pom.xml | 4 +- platforms/android/android/pom.xml | 2 +- platforms/android/android/topology/pom.xml | 6 +-- platforms/android/api/execution/pom.xml | 6 +-- platforms/android/api/function/pom.xml | 4 +- platforms/android/api/graph/pom.xml | 6 +-- platforms/android/api/oplet/pom.xml | 10 ++-- platforms/android/api/pom.xml | 2 +- platforms/android/api/topology/pom.xml | 12 ++--- platforms/android/api/window/pom.xml| 6 +-- platforms/android/apps/iot/pom.xml | 10 ++-- platforms/android/apps/pom.xml | 2 +- platforms/android/apps/runtime/pom.xml | 8 +-- platforms/android/connectors/command/pom.xml| 8 +-- platforms/android/connectors/common/pom.xml | 6 +-- platforms/android/connectors/csv/pom.xml| 4 +- platforms/android/connectors/file/pom.xml | 10 ++-- platforms/android/connectors/http/pom.xml | 6 +-- platforms/android/connectors/iot/pom.xml| 8 +-- platforms/android/connectors/iotp/pom.xml | 10 ++-- platforms/android/connectors/jdbc/pom.xml | 8 +-- platforms/android/connectors/kafka/pom.xml | 6 +-- platforms/android/connectors/mqtt/pom.xml | 10 ++-- platforms/android/connectors/pom.xml| 2 +- platforms/android/connectors/pubsub/pom.xml | 6 +-- platforms/android/connectors/serial/pom.xml | 6 +-- .../android/connectors/websocket-base/pom.xml | 6 +-- .../android/connectors/websocket-jetty/pom.xml | 6 +-- .../android/connectors/websocket-misc/pom.xml | 4 +- .../android/connectors/websocket-server/pom.xml | 6 +-- platforms/android/connectors/websocket/pom.xml | 10 ++-- platforms/android/distribution/pom.xml | 50 - platforms/android/pom.xml | 10 +--- platforms/android/providers/direct/pom.xml | 16 +++--- platforms/android/providers/iot/pom.xml | 18 +++--
[2/3] incubator-edgent git commit: - Replaced a lot of the structural variables with constants to eventually make releasing easier.
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/platforms/java7/api/execution/pom.xml
--
diff --git a/platforms/java7/api/execution/pom.xml
b/platforms/java7/api/execution/pom.xml
index e532819..a8861a6 100644
--- a/platforms/java7/api/execution/pom.xml
+++ b/platforms/java7/api/execution/pom.xml
@@ -85,7 +85,7 @@
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-function
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/platforms/java7/api/graph/pom.xml
--
diff --git a/platforms/java7/api/graph/pom.xml
b/platforms/java7/api/graph/pom.xml
index bdd09aa..57ff163 100644
--- a/platforms/java7/api/graph/pom.xml
+++ b/platforms/java7/api/graph/pom.xml
@@ -85,7 +85,7 @@
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-oplet
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/platforms/java7/api/oplet/pom.xml
--
diff --git a/platforms/java7/api/oplet/pom.xml
b/platforms/java7/api/oplet/pom.xml
index b15b00e..cd24ed8 100644
--- a/platforms/java7/api/oplet/pom.xml
+++ b/platforms/java7/api/oplet/pom.xml
@@ -85,17 +85,17 @@
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-function
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-execution
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-window
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/platforms/java7/api/topology/pom.xml
--
diff --git a/platforms/java7/api/topology/pom.xml
b/platforms/java7/api/topology/pom.xml
index a3e0711..b5b5242 100644
--- a/platforms/java7/api/topology/pom.xml
+++ b/platforms/java7/api/topology/pom.xml
@@ -125,22 +125,22 @@
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-execution
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-function
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-graph
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-oplet
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/platforms/java7/api/window/pom.xml
--
diff --git a/platforms/java7/api/window/pom.xml
b/platforms/java7/api/window/pom.xml
index 572515b..21a093c 100644
--- a/platforms/java7/api/window/pom.xml
+++ b/platforms/java7/api/window/pom.xml
@@ -85,7 +85,7 @@
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-function
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/platforms/java7/apps/iot/pom.xml
--
diff --git a/platforms/java7/apps/iot/pom.xml b/platforms/java7/apps/iot/pom.xml
index 2fd7272..06b6b56 100644
--- a/platforms/java7/apps/iot/pom.xml
+++ b/platforms/java7/apps/iot/pom.xml
@@ -81,23 +81,23 @@
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-topology
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-connectors-iot
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-connectors-pubsub
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-providers-direct
1.3.0-SNAPSHOT
test
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/platforms/java7/apps/runtime/pom.xml
--
diff --git a/platforms/java7/apps/runtime/pom.xml
b/platforms/java7/apps/runtime/pom.xml
index 9ca129a..22567e4 100644
--- a/platforms/java7/apps/runtime/pom.xml
+++ b/platforms/java7/apps/runtime/pom.xml
@@ -81,24 +81,24 @@
- ${project.groupId}
+ org.apache.edgent.java7
edgent-api-topology
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-runtime-jobregistry
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent.java7
edgent-providers-direct
1.3.0-SNAPSHOT
test
- ${project.groupId}
+ org.apache.edgent.java7
edgent-runtime-jmxcontrol
1.3.0-SNAPSHOT
test
http://git-
[1/3] incubator-edgent git commit: - Replaced a lot of the structural variables with constants to eventually make releasing easier.
Repository: incubator-edgent
Updated Branches:
refs/heads/feature/pre-release-finetuning a4c77bf83 -> 6c7ccd3da
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/test/svt/pom.xml
--
diff --git a/test/svt/pom.xml b/test/svt/pom.xml
index b9a11f7..f46fbee 100644
--- a/test/svt/pom.xml
+++ b/test/svt/pom.xml
@@ -36,22 +36,22 @@
- ${project.groupId}
+ org.apache.edgent
edgent-api-topology
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent
edgent-console-server
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent
edgent-utils-metrics
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent
edgent-providers-development
1.3.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/utils/metrics/pom.xml
--
diff --git a/utils/metrics/pom.xml b/utils/metrics/pom.xml
index ec217ed..a3e26d1 100644
--- a/utils/metrics/pom.xml
+++ b/utils/metrics/pom.xml
@@ -36,14 +36,14 @@
- ${project.groupId}
+ org.apache.edgent
edgent-api-topology
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent
edgent-api-topology
1.3.0-SNAPSHOT
test-jar
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/6c7ccd3d/utils/streamscope/pom.xml
--
diff --git a/utils/streamscope/pom.xml b/utils/streamscope/pom.xml
index 0ca790a..0e1ab8c 100644
--- a/utils/streamscope/pom.xml
+++ b/utils/streamscope/pom.xml
@@ -32,14 +32,14 @@
- ${project.groupId}
+ org.apache.edgent
edgent-api-topology
1.3.0-SNAPSHOT
- ${project.groupId}
+ org.apache.edgent
edgent-api-topology
1.3.0-SNAPSHOT
test-jar
[3/3] incubator-edgent git commit: - Replaced a lot of the structural variables with constants to eventually make releasing easier.
- Replaced a lot of the structural variables with constants to eventually make releasing easier. Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/6c7ccd3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/6c7ccd3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/6c7ccd3d Branch: refs/heads/feature/pre-release-finetuning Commit: 6c7ccd3da5e583bb2130876b6de7b4f90b9dacbf Parents: a4c77bf Author: Christofer Dutz Authored: Mon Nov 13 10:38:14 2017 +0100 Committer: Christofer Dutz Committed: Mon Nov 13 10:38:14 2017 +0100 -- analytics/math3/pom.xml | 8 +-- analytics/sensors/pom.xml | 8 +-- api/execution/pom.xml | 2 +- api/graph/pom.xml | 2 +- api/oplet/pom.xml | 6 +-- api/topology/pom.xml| 8 +-- api/window/pom.xml | 2 +- apps/iot/pom.xml| 8 +-- apps/runtime/pom.xml| 8 +-- connectors/command/pom.xml | 12 ++--- connectors/common/pom.xml | 8 +-- connectors/csv/pom.xml | 6 +-- connectors/file/pom.xml | 14 +++--- connectors/http/pom.xml | 6 +-- connectors/iot/pom.xml | 4 +- connectors/iotp/pom.xml | 6 +-- connectors/jdbc/pom.xml | 12 ++--- connectors/kafka/pom.xml| 10 ++-- connectors/mqtt/pom.xml | 14 +++--- connectors/pubsub/pom.xml | 4 +- connectors/serial/pom.xml | 2 +- connectors/websocket-base/pom.xml | 2 +- connectors/websocket-jetty/pom.xml | 2 +- connectors/websocket-server/pom.xml | 2 +- connectors/websocket/pom.xml| 16 +++--- console/server/pom.xml | 4 +- console/servlets/pom.xml| 2 +- distribution/pom.xml| 44 - jqassistant/structural-rules.xml| 37 ++ platforms/android/analytics/math3/pom.xml | 2 +- platforms/android/analytics/sensors/pom.xml | 2 +- platforms/android/android/hardware/pom.xml | 2 +- platforms/android/android/topology/pom.xml | 4 +- platforms/android/api/execution/pom.xml | 2 +- platforms/android/api/graph/pom.xml | 2 +- platforms/android/api/oplet/pom.xml | 6 +-- platforms/android/api/topology/pom.xml | 8 +-- platforms/android/api/window/pom.xml| 2 +- platforms/android/apps/iot/pom.xml | 6 +-- platforms/android/apps/runtime/pom.xml | 4 +- platforms/android/connectors/command/pom.xml| 4 +- platforms/android/connectors/common/pom.xml | 2 +- platforms/android/connectors/file/pom.xml | 6 +-- platforms/android/connectors/http/pom.xml | 2 +- platforms/android/connectors/iot/pom.xml| 4 +- platforms/android/connectors/iotp/pom.xml | 6 +-- platforms/android/connectors/jdbc/pom.xml | 4 +- platforms/android/connectors/kafka/pom.xml | 2 +- platforms/android/connectors/mqtt/pom.xml | 6 +-- platforms/android/connectors/pubsub/pom.xml | 2 +- platforms/android/connectors/serial/pom.xml | 2 +- .../android/connectors/websocket-base/pom.xml | 2 +- .../android/connectors/websocket-jetty/pom.xml | 2 +- .../android/connectors/websocket-server/pom.xml | 2 +- platforms/android/connectors/websocket/pom.xml | 6 +-- platforms/android/distribution/pom.xml | 48 +- platforms/android/providers/direct/pom.xml | 12 ++--- platforms/android/providers/iot/pom.xml | 14 +++--- platforms/android/runtime/appservice/pom.xml| 4 +- platforms/android/runtime/etiao/pom.xml | 6 +-- platforms/android/runtime/jobregistry/pom.xml | 4 +- platforms/android/runtime/jsoncontrol/pom.xml | 4 +- platforms/android/spi/graph/pom.xml | 4 +- platforms/android/spi/topology/pom.xml | 2 +- platforms/android/utils/metrics/pom.xml | 2 +- platforms/android/utils/streamscope/pom.xml | 2 +- platforms/java7/analytics/math3/pom.xml | 8 +-- platforms/java7/analytics/sensors/pom.xml | 8 +-- platforms/java7/api/execution/pom.xml | 2 +- platforms/java7/api/graph/pom.xml | 2 +- platforms/java7/api/oplet/pom.xml | 6 +-- platforms/java7/api/topology/pom.xml| 8 +-- platforms/java7/api/window/pom.xml | 2 +- platforms/java7/ap
[32/50] incubator-edgent-samples git commit: tweaks to package-app.sh
tweaks to package-app.sh
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/6c7236ff
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/6c7236ff
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/6c7236ff
Branch: refs/heads/develop
Commit: 6c7236ff84529b05ba54c63b01887ebad2a1a7fe
Parents: bba42c2
Author: Dale LaBossiere
Authored: Tue Oct 10 17:29:38 2017 -0400
Committer: Dale LaBossiere
Committed: Tue Oct 10 17:29:38 2017 -0400
--
package-app.sh | 13 +
template/pom.xml | 2 +-
2 files changed, 10 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/6c7236ff/package-app.sh
--
diff --git a/package-app.sh b/package-app.sh
index 75b8ff2..c27edcc 100755
--- a/package-app.sh
+++ b/package-app.sh
@@ -19,11 +19,9 @@
## Create a self contained application specific tar bundle that can be
## brought to a system, unpacked and run.
##
-## Requires that maven (mvn) be installed and on the PATH
-##
## Run from the Application project's top level directory.
-USAGE="usage: `basename $0` [--platform {java8|java7|android}] [--mainClass
classname] [--appjar jarname] [--add csv-paths]"
+USAGE="usage: `basename $0` [--platform {java8|java7|android}] [--mainClass
classname] [--appjar jarname] [--add csv-paths] [--mvn mvn-cmd]"
## --platform the platform the app was built for (default: java8. options:
java7, android)
## This controls which Edgent platform jars are collected.
@@ -35,9 +33,13 @@ USAGE="usage: `basename $0` [--platform
{java8|java7|android}] [--mainClass clas
## Works best for paths in/under the App's project dir.
## NOTE: anything in the App's src/main/resources dir generally
## gets included in the App's jar.
+## --mvn mvn-cmd use mvn-cmd instead of "./mvnw"
set -e
+SAMPLES_DIR=`(cd $(dirname $0); pwd)`
+MVN_CMD=${SAMPLES_DIR}/mvnw
+
MAIN_CLASS=com.mycompany.app.App
APP_JAR=my-app-1.0-SNAPSHOT.jar
ADD_PATHS=
@@ -73,7 +75,10 @@ if [ "${PLATFORM}" ] ; then
PROFILES="-Pplatform-${PLATFORM}"
fi
rm -rf target/dependency
-mvn dependency:copy-dependencies -DincludeScope=runtime ${PROFILES}
+# if someone screws up j7 or android deps, uncomment the following and
+# it will help identify wrong jars that are getting included / copied.
+#DEBUG_DEPS=-Dmdep.prependGroupId=true
+${MVN_CMD} dependency:copy-dependencies -DincludeScope=runtime ${PROFILES}
${DEBUG_DEPS}
echo
echo "# create target/app-run.sh..."
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/6c7236ff/template/pom.xml
--
diff --git a/template/pom.xml b/template/pom.xml
index 5d67cd2..593b958 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -35,7 +35,7 @@
My Edgent Application
-
+
org.apache.edgent${edgent.platform}
1.2.0-SNAPSHOT
[18/50] incubator-edgent-samples git commit: - Make the java7 version of the samples build
- Make the java7 version of the samples build
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/972363ea
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/972363ea
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/972363ea
Branch: refs/heads/develop
Commit: 972363eae8bb97841dbc40f28414cdf9f352bd0b
Parents: 9dfe051
Author: Christofer Dutz
Authored: Tue Sep 26 22:52:34 2017 +0200
Committer: Christofer Dutz
Committed: Tue Sep 26 22:52:34 2017 +0200
--
apps/pom.xml | 1 +
connectors/pom.xml | 1 +
console/pom.xml| 1 +
scenarios/pom.xml | 1 +
topology/pom.xml | 1 +
utils/pom.xml | 1 +
6 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index d6d7ea4..6041636 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -27,6 +27,7 @@
1.2.0-SNAPSHOT
+ ${edgent.base.groupId}.samples
edgent-samples-apps
Apache Edgent: Samples: Apps
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/connectors/pom.xml
--
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 8a76cb7..d57b618 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -27,6 +27,7 @@
1.2.0-SNAPSHOT
+ ${edgent.base.groupId}.samples
edgent-samples-connectors
Apache Edgent: Samples: Connectors
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/console/pom.xml
--
diff --git a/console/pom.xml b/console/pom.xml
index 046a035..4bde53f 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -27,6 +27,7 @@
1.2.0-SNAPSHOT
+ ${edgent.base.groupId}.samples
edgent-samples-console
Apache Edgent: Samples: Console
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/scenarios/pom.xml
--
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index 15befaa..cba1c78 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -27,6 +27,7 @@
1.2.0-SNAPSHOT
+ ${edgent.base.groupId}.samples
edgent-samples-scenarios
Apache Edgent: Samples: Scenarios
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/topology/pom.xml
--
diff --git a/topology/pom.xml b/topology/pom.xml
index 1d1f6b8..7dd9df3 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -27,6 +27,7 @@
1.2.0-SNAPSHOT
+ ${edgent.base.groupId}.samples
edgent-samples-topology
Apache Edgent: Samples: Topology
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/972363ea/utils/pom.xml
--
diff --git a/utils/pom.xml b/utils/pom.xml
index 898a11b..45bb1dd 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -27,6 +27,7 @@
1.2.0-SNAPSHOT
+ ${edgent.base.groupId}.samples
edgent-samples-utils
Apache Edgent: Samples: Utils
[04/50] incubator-edgent-samples git commit: tweak samples/README.md
tweak samples/README.md 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/7db0380b Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/7db0380b Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/7db0380b Branch: refs/heads/develop Commit: 7db0380b2e6f2f7d411cfff2e95e4498f86fffb9 Parents: 55efbe1 Author: Dale LaBossiere Authored: Wed Aug 30 17:43:16 2017 -0400 Committer: Dale LaBossiere Committed: Wed Aug 30 17:43:16 2017 -0400 -- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/7db0380b/README.md -- diff --git a/README.md b/README.md index 2e28660..b9b0dee 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ environment, it easiest to write your application using the Edgent APIs with java8 lambda expressions. You compile with java8 but constrain your application to using java7 features plus java8 lambda expressions. The Retrolambda tool is used to convert your application's generated -lass files to java7. +class files to java7. (the java7 and android Edgent jars were created in that manner too) Your application would then be run against the appropriate Edgent platform jars. Alternatively you can forgo the use of lambda @@ -57,7 +57,7 @@ required Edgent jars from the maven repository. The supplied Edgent samples poms include support for building for a java8, java7 or android execution environent. The poms are configured for the generation of a standard jar as well as an -uber jar. +uber jar for a sample application. You can clone the samples/template project as a starting point for your Edgent application. See samples/template/README.md. @@ -134,7 +134,7 @@ dependencies from a local or remote maven repository. The user may then directly use the jars in CLASSPATH specifications for Edgent application compilation or execution. -A `classpath.sh` script generated to assist with this. +A `classpath.sh` script is generated to assist with this. By default the script retrieves the Edgent java8 platform jars for the script's default Edgent version.
[33/50] incubator-edgent-samples git commit: fix get-edgent-jars for j7 and android
fix get-edgent-jars for j7 and android
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/ab0098af
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/ab0098af
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/ab0098af
Branch: refs/heads/develop
Commit: ab0098af645b2a0c6e85cf10e6bf9f308cacec87
Parents: 6c7236f
Author: Dale LaBossiere
Authored: Wed Oct 11 10:00:38 2017 -0400
Committer: Dale LaBossiere
Committed: Wed Oct 11 10:00:38 2017 -0400
--
.gitignore | 42 ++
console/.gitignore | 2 +-
cron/.gitignore| 2 +-
get-edgent-jars.sh | 30 --
pom.xml| 2 +-
template/pom.xml | 4 ++--
6 files changed, 71 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/.gitignore
--
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..ea30b70
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,42 @@
+
+# get-edgent-jars generated outout
+get-edgent-jars-project
+
+*.class
+
+# Local developers toolchain
+/toolchains-local.xml
+
+# Exclude the maven-wrapper.jar
+.mvn/wrapper/maven-wrapper.jar
+
+# More generated artifacts
+target/
+/test/svt/lib
+/release-edgent
+/reports
+/.gradle/
+build/
+/externalJars
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.ear
+
+# virtual machine crash logs, see
http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# IntelliJ Idea
+.idea/
+*.iml
+
+# Eclipse
+.classpath
+.project
+.settings/
+
+# Emacs
+*~
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/console/.gitignore
--
diff --git a/console/.gitignore b/console/.gitignore
index a50dafe..d3cd401 100644
--- a/console/.gitignore
+++ b/console/.gitignore
@@ -1,2 +1,2 @@
# sample's output file
-consoleUrl.txt
\ No newline at end of file
+consoleUrl.txt
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/cron/.gitignore
--
diff --git a/cron/.gitignore b/cron/.gitignore
index ed3454e..127f7ab 100644
--- a/cron/.gitignore
+++ b/cron/.gitignore
@@ -1,3 +1,3 @@
# mkcrontab generated output
-startapp.cron
\ No newline at end of file
+startapp.cron
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab0098af/get-edgent-jars.sh
--
diff --git a/get-edgent-jars.sh b/get-edgent-jars.sh
index c00e72d..46a2bbf 100755
--- a/get-edgent-jars.sh
+++ b/get-edgent-jars.sh
@@ -17,7 +17,6 @@
#
## Get the Apache Edgent jars and their transitive external dependencies.
-## Requires that maven (mvn) be installed and on the PATH
##
## By default get the Edgent java8 platform jars for the script's default
Edgent version.
##
@@ -28,13 +27,17 @@
## --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"
##
## Creates the directory get-edgent-jars-project and a maven project in it
-USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version]
[--artifacts csv-gav-list] [--file gav-file]"
+USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version]
[--artifacts csv-gav-list] [--file gav-file] [--mvn mvn-cmd]"
set -e
+SAMPLES_DIR=`(cd $(dirname $0); pwd)`
+MVN_CMD=${SAMPLES_DIR}/mvnw
+
EDGENT_PLATFORM=java8
EDGENT_VERSION=1.2.0
SLF4J_VERSION=1.7.12
@@ -56,6 +59,9 @@ if [ "$1" = "--file" -a $# -gt 1 ]; then
OPT_GAVS_FILE=$2; shift; shift
OPT_GAVS=`sed -e '/^#/d' < ${OPT_GAVS_FILE}`
fi
+if [ "$1" = "--mvn" -a $# -gt 1 ]; then
+MVN_CMD=$2; shift; shift
+fi
if [ $# != 0 ]; then
echo "$USAGE"
exit 1
@@ -132,11 +138,19 @@ confirm "Continue?" || exit
###
if [ ! -d ${PROJ_DIR} ]; then
echo "# Generating maven project ${PROJ_DIR}..."
-mvn -B archetype:generate \
+# ensure a standalone pom (no parent) to avoid unwanted inherited deps
+TMP_PROJ=${PROJ_DIR}-tmp
+mkdir ${TMP_PROJ}
+cd ${TMP_PROJ}
+${MVN_CMD} -B archetype:generate \
-DarchetypeGroupId=org.apache.maven.archeTypes \
+-DarchetypeArtifactId=maven-archetype-quickstart \
-DgroupId=org.apache.edgent.tools \
-DartifactId=${PROJ_DIR} \
-Dversion=1.0
+cd ..
+mv ${TMP_PROJ}/${PROJ_DIR} ${PROJ_DIR}
+rmdir ${
[13/50] incubator-edgent-samples git commit: - Added IBM contrib NOTICE versions to all modules contributed by IBM
- Added IBM contrib NOTICE versions to all modules contributed by IBM 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/3f3e932a Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3f3e932a Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3f3e932a Branch: refs/heads/develop Commit: 3f3e932a6f60f0e292e7f1207238a674d6ee034d Parents: 1bfb8fc Author: Christofer Dutz Authored: Mon Sep 25 16:02:50 2017 +0200 Committer: Christofer Dutz Committed: Mon Sep 25 16:02:50 2017 +0200 -- apps/src/main/resources/META-INF/NOTICE | 12 connectors/src/main/resources/META-INF/NOTICE | 12 console/src/main/resources/META-INF/NOTICE| 12 topology/src/main/resources/META-INF/NOTICE | 12 utils/src/main/resources/META-INF/NOTICE | 12 5 files changed, 60 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/apps/src/main/resources/META-INF/NOTICE -- diff --git a/apps/src/main/resources/META-INF/NOTICE b/apps/src/main/resources/META-INF/NOTICE new file mode 100644 index 000..42d63a2 --- /dev/null +++ b/apps/src/main/resources/META-INF/NOTICE @@ -0,0 +1,12 @@ + +Apache Edgent: Samples: Apps +Copyright 2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +=== + +Portions of this bundle were developed by IBM Corp. +Copyright IBM Corp. 2015, 2016 + http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/connectors/src/main/resources/META-INF/NOTICE -- diff --git a/connectors/src/main/resources/META-INF/NOTICE b/connectors/src/main/resources/META-INF/NOTICE new file mode 100644 index 000..dc8d2dd --- /dev/null +++ b/connectors/src/main/resources/META-INF/NOTICE @@ -0,0 +1,12 @@ + +Apache Edgent: Samples: Connectors +Copyright 2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +=== + +Portions of this bundle were developed by IBM Corp. +Copyright IBM Corp. 2015, 2016 + http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/console/src/main/resources/META-INF/NOTICE -- diff --git a/console/src/main/resources/META-INF/NOTICE b/console/src/main/resources/META-INF/NOTICE new file mode 100644 index 000..8fa37cf --- /dev/null +++ b/console/src/main/resources/META-INF/NOTICE @@ -0,0 +1,12 @@ + +Apache Edgent: Samples: Console +Copyright 2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +=== + +Portions of this bundle were developed by IBM Corp. +Copyright IBM Corp. 2015, 2016 + http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/topology/src/main/resources/META-INF/NOTICE -- diff --git a/topology/src/main/resources/META-INF/NOTICE b/topology/src/main/resources/META-INF/NOTICE new file mode 100644 index 000..8933656 --- /dev/null +++ b/topology/src/main/resources/META-INF/NOTICE @@ -0,0 +1,12 @@ + +Apache Edgent: Samples: Topology +Copyright 2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +=== + +Portions of this bundle were developed by IBM Corp. +Copyright IBM Corp. 2015, 2016 + http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3f3e932a/utils/src/main/resources/META-INF/NOTICE -- diff --git a/utils/src/main/resources/META-INF/NOTICE b/utils/src/main/resources/META-INF/NOTICE new file mode 100644 index 000..0b428dc --- /dev/null +++ b/utils/src/main/resources/META-INF/NOTICE @@ -0,0 +1,12 @@ + +Apache Edgent: Samples: Utils +Copyright 2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +=== + +Portions of this bundle were developed by IBM Corp. +Copy
[26/50] incubator-edgent-samples git commit: add samples/template NOTICE
add samples/template NOTICE 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/88dc329e Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/88dc329e Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/88dc329e Branch: refs/heads/develop Commit: 88dc329ee5f7bc114cc50e4ef6bceefbb3b3d5b5 Parents: 3a5355d Author: Dale LaBossiere Authored: Wed Oct 4 11:30:55 2017 -0400 Committer: Dale LaBossiere Committed: Wed Oct 4 11:30:55 2017 -0400 -- template/src/main/resources/META-INF/NOTICE | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/88dc329e/template/src/main/resources/META-INF/NOTICE -- diff --git a/template/src/main/resources/META-INF/NOTICE b/template/src/main/resources/META-INF/NOTICE new file mode 100644 index 000..d31fd13 --- /dev/null +++ b/template/src/main/resources/META-INF/NOTICE @@ -0,0 +1,6 @@ + +Apache Edgent: Samples: Template +Copyright 2016-2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/).
[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
Authored: Wed Oct 18 17:49:58 2017 -0400
Committer: Dale LaBossiere
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 @@
4.0.0
-org.apache.edgent.samples
+org.apache.edgent
edgent-samples
1.2.0-SNAPSHOT
- org.apache.edgent.samples
edgent-samples-apps
- Apache Edgent Samples${samples.projname.platform}: Apps
+ Apache Edgent Samples ${samples.projname.platform}: Apps
- ${edgent.base.groupId}.analytics
+ ${edgent.runtime.groupId}
edgent-analytics-sensors
- ${edgent.core.version}
+ ${edgent.runtime.version}
- ${edgent.base.groupId}.connectors
+ ${edgent.runtime.groupId}
edgent-connectors-file
- ${edgent.core.version}
+ ${edgent.runtime.version}
- ${edgent.base.groupId}.analytics
+ ${edgent.runtime.groupId}
edgent-analytics-math3
- ${edgent.core.version}
+ ${edgent.runtime.version}
- ${edgent.base.groupId}.connectors
+ ${edgent.runtime.groupId}
edgent-connectors-iot
- ${edgent.core.version}
+ ${edgent.runtime.version}
- ${edgent.base.groupId}.connectors
+ ${edgent.runtime.groupId}
edgent-connectors-iotp
- ${edgent.core.version}
+ ${edgent.runtime.version}
- ${edgent.base.groupId}.connectors
+ ${edgent.runtime.groupId}
edgent-connectors-mqtt
- ${edgent.core.version}
+ ${edgent.runtime.version}
- org.apache.edgent.samples
+ ${project.groupId}
edgent-samples-utils
${project.version}
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 @@
4.0.0
-org.apache.edgent.sampl
[02/50] incubator-edgent-samples git commit: - Fixed JDBCTests not working with usernames containing special characters ("christofer.dutz" in my case) - Finetuned the jacoco config - Changed the conso
- Fixed JDBCTests not working with usernames containing special characters
("christofer.dutz" in my case)
- Finetuned the jacoco config
- Changed the console server application to contain the war as embedded
resource (Making it work in examples)
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/d507d892
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d507d892
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d507d892
Branch: refs/heads/develop
Commit: d507d89221624e0b607dab969106e831ed0656ce
Parents: 9a0ef88
Author: Christofer Dutz
Authored: Tue Aug 15 21:48:56 2017 +0200
Committer: Christofer Dutz
Committed: Tue Aug 15 21:48:56 2017 +0200
--
topology/pom.xml | 30 --
1 file changed, 30 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d507d892/topology/pom.xml
--
diff --git a/topology/pom.xml b/topology/pom.xml
index 0a2581c..76231e2 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -32,36 +32,6 @@
Apache Edgent: Samples: Topology
-
-
-
-maven-dependency-plugin
-3.0.1
-
-
-copy
-generate-test-resources
-
- copy
-
-
-
-
- org.apache.edgent.console
- edgent-console-servlets
- ${project.version}
- war
-
${project.build.directory}/war-resources
- servlets.war
-
-
-
-
-
-
-
-
-
[45/50] incubator-edgent-samples git commit: getting started updates
getting started updates
- fix mvnw in samples/template
- add TempSensorSample
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/2b267b2d
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/2b267b2d
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/2b267b2d
Branch: refs/heads/develop
Commit: 2b267b2d2a99f3d0f1dcae04bb1686f9d6cce80d
Parents: b4ae7a8
Author: Dale LaBossiere
Authored: Wed Nov 1 15:04:29 2017 -0400
Committer: Dale LaBossiere
Committed: Wed Nov 1 15:04:29 2017 -0400
--
README.md | 6 +-
.../.mvn/wrapper/MavenWrapperDownloader.java| 110 +++
template/.mvn/wrapper/maven-wrapper.properties | 20
template/README.md | 2 +-
template/app-run.sh | 15 ++-
topology/run-sample.sh | 1 +
.../edgent/samples/topology/TempSensor.java | 44
.../samples/topology/TempSensorApplication.java | 44
8 files changed, 239 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/2b267b2d/README.md
--
diff --git a/README.md b/README.md
index 09079d4..6bd26ed 100644
--- a/README.md
+++ b/README.md
@@ -172,7 +172,11 @@ Eclipse in the usual manner. E.g.,
HelloEdgent Basic mechanics of declaring a topology and executing
it. Prints Hello Edgent! to standard output.
-
+
+TempSensorApplication A basic Edgent application used by the Edgent
+ "Getting Started Guide":
+ https://edgent.apache.org/docs/edgent-getting-started.html
+
PeriodicSource Create a stream by polling a random number generator
for a new value every second and then prints out the
raw tuple value and a filtered and transformed stream.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/2b267b2d/template/.mvn/wrapper/MavenWrapperDownloader.java
--
diff --git a/template/.mvn/wrapper/MavenWrapperDownloader.java
b/template/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 000..44f8e00
--- /dev/null
+++ b/template/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,110 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+/**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl'
is provided.
+ */
+private static final String DEFAULT_DOWNLOAD_URL =
+
"https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";;
+
+/**
+ * Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
+ * use instead of the default one.
+ */
+private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+".mvn/wrapper/maven-wrapper.properties";
+
+/**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+private static final String MAVEN_WRAPPER_JAR_PATH =
+".mvn/wrapper/maven-wrapper.jar";
+
+/**
+ * Name of the property which should be used to override the default
download url for the wrapper.
+ */
+private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+public static void main(String args[]) {
+System.out.println("- Downloader started");
+File baseDirectory = new File(args[0]);
+System.out.println("- Using base directory: " +
baseDirectory.getAbsolutePath());
+
+// If the maven-wrapper.properties exists, read it and check if it
contains a custom
+// wrapperUrl parameter.
+File mavenWrapperPropertyFile = new File(baseDirectory,
MAVEN
[38/50] incubator-edgent-samples git commit: more doc work
more doc work 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/51ddbc28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/51ddbc28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/51ddbc28 Branch: refs/heads/develop Commit: 51ddbc28273108d9767353f03868d114ccbe7d8f Parents: fdc2723 Author: Dale LaBossiere Authored: Tue Oct 17 16:56:48 2017 -0400 Committer: Dale LaBossiere Committed: Tue Oct 17 16:56:48 2017 -0400 -- APPLICATION_DEVELOPMENT.md | 65 ++--- README.md | 2 +- pom.xml| 2 ++ 3 files changed, 32 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/51ddbc28/APPLICATION_DEVELOPMENT.md -- diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md index 3166931..92f0099 100644 --- a/APPLICATION_DEVELOPMENT.md +++ b/APPLICATION_DEVELOPMENT.md @@ -38,6 +38,8 @@ Java 8 and Java 7 respectively. See `JAVA_SUPPORT.md` for more information on artifact coordinates, etc. +## Writing Your Application + The Edgent API is most easily used by using Java8 lambda expressions. If you only want to deploy your Edgent application to a java8 environment then your application may use any java8 features it chooses. You compile @@ -63,22 +65,20 @@ Eclipse or IntelliJ). The tooling transparently downloads the required Edgent jars from the maven repository if they aren't already present in your local maven repository. -The supplied Edgent samples poms include support for building for -a java8, java7 or android execution environment. The poms are -configured for the generation of a standard jar as well as an -uber jar for a sample application. - -You can clone the `samples/template` project as a starting point -for your Edgent application. See `samples/template/README.md`. +### Edgent Application Template + +You can clone the `template` project as a starting point for your +Edgent application. See [samples/template/README.md](template/README.md). TODO: we would like to provide a maven Edgent Application archetype that users can use to create an application project template. +### Using Non-maven-integrated Tooling + If you can't or don't want to use maven-repository-enabled tooling you will need to get a local copy of the Edgent jars and their dependencies and add them to your compile classpath. This case -is covered in the following sections. - +is covered in subsequent sections. ## Packaging and Execution @@ -106,11 +106,26 @@ The uber jar contains the application's classes and the application's dependent Edgent classes and their transitive dependencies. -The Edgent samples template project's pom and +The template project's pom and the Edgent samples poms contain configuration information that generates an uber jar in addition to the standard application jar. Eclipse can also export an uber jar. +### Separately manage the application and Edgent jars + +Copy the application's jars to the device. +Get a copy of the Edgent jars and their dependencies +onto the device. It's possible for multiple Edgent +applications to share the Edgent jars. + +The Apache Edgent project does not release a +binary bundle containing all of the Edgent jars +and their dependencies. The binary artifacts +are only released to maven central. + +See [samples/get-edgent-jars-project](get-edgent-jars-project/README.md) +for a tool to get a copy of the Edgent jars. + ### Create an application package bundle The bundle is a standalone entity containing @@ -124,37 +139,15 @@ The bundle is copied to the device and unpacked. A run script forms the appropriate `CLASSPATH` to the package's jars and starts the application. -The Edgent supplied `package-app.sh` tool supports this mode. -Eclipse can also export a similar collection -of information. - -### Separately manage the application and Edgent jars - -Copy the application's jars to the device. -Get a copy of the Edgent jars and their dependencies -onto the device to be shared by any Edgent applications -that want to use them. - -The Apache Edgent project does not release a -binary bundle containing all of the Edgent jars -and their dependencies. The binary artifacts -are only released to maven central. - -See `samples/get-edgent-jars-project` for a tool -to get a copy of the Edgent jars. - -## package-app.sh - -The `package-app.sh` script creates an application bundle. -The application bundle can be copied to an edge-device, -unpacked and then used to run the application. +The supplied `package-app.sh` script creates an +application bundle. The applicatio
[17/50] incubator-edgent-samples git commit: Merge remote-tracking branch 'origin/feature/maven' into feature/maven
Merge remote-tracking branch 'origin/feature/maven' into feature/maven 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/9dfe051a Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/9dfe051a Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/9dfe051a Branch: refs/heads/develop Commit: 9dfe051a25ccb285036811092de9c0ef19ba2135 Parents: 7d38a3e d6d7285 Author: Christofer Dutz Authored: Tue Sep 26 21:13:04 2017 +0200 Committer: Christofer Dutz Committed: Tue Sep 26 21:13:04 2017 +0200 -- README.md | 74 -- pom.xml| 9 -- template/README.md | 18 +-- template/pom.xml | 85 ++--- 4 files changed, 74 insertions(+), 112 deletions(-) --
[07/50] incubator-edgent-samples git commit: squelch eclipse warnings on samples/pom.xml
squelch eclipse warnings on samples/pom.xml 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/28a5305c Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/28a5305c Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/28a5305c Branch: refs/heads/develop Commit: 28a5305cf43b7c0f2f8de7fbe14047d99029f548 Parents: c355475 Author: Dale LaBossiere Authored: Wed Sep 6 16:31:02 2017 -0400 Committer: Dale LaBossiere Committed: Wed Sep 6 16:31:02 2017 -0400 -- pom.xml | 42 ++ 1 file changed, 42 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/28a5305c/pom.xml -- diff --git a/pom.xml b/pom.xml index c54819e..713b1e4 100644 --- a/pom.xml +++ b/pom.xml @@ -261,6 +261,48 @@ + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + +org.apache.maven.plugins +maven-dependency-plugin +[1.0.0,) + + copy + + + + + + + + +org.apache.maven.plugins +maven-remote-resources-plugin +[1.0.0,) + + process + + + + + + + + + +
[09/50] incubator-edgent-samples git commit: remove maven-wrapper.jar from repo
remove maven-wrapper.jar from repo 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/51ed7d17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/51ed7d17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/51ed7d17 Branch: refs/heads/develop Commit: 51ed7d17b8569ab0e3eeea227637889c473a3000 Parents: eeaa2bd Author: Dale LaBossiere Authored: Tue Sep 12 13:52:08 2017 -0400 Committer: Dale LaBossiere Committed: Tue Sep 12 13:52:08 2017 -0400 -- .mvn/wrapper/maven-wrapper.jar | Bin 47610 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/51ed7d17/.mvn/wrapper/maven-wrapper.jar -- diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea..000 Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
[48/50] incubator-edgent-samples git commit: Merge pull request #317
Merge pull request #317 This closes #317 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/eb42102e Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/eb42102e Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/eb42102e Branch: refs/heads/develop Commit: eb42102ef784dd13479b84d134b3b3a37665e20e Parents: 3ed0049 cc6bd62 Author: Dale LaBossiere Authored: Mon Nov 6 13:15:13 2017 -0500 Committer: Dale LaBossiere Committed: Mon Nov 6 13:15:13 2017 -0500 -- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --
[16/50] incubator-edgent-samples git commit: - Fixed an invalid groupId
- Fixed an invalid groupId
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/7d38a3e8
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/7d38a3e8
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/7d38a3e8
Branch: refs/heads/develop
Commit: 7d38a3e87505493446bed21eaa2b79daef14c44a
Parents: 3f3e932
Author: Christofer Dutz
Authored: Tue Sep 26 21:12:53 2017 +0200
Committer: Christofer Dutz
Committed: Tue Sep 26 21:12:53 2017 +0200
--
apps/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/7d38a3e8/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 2fba1ca..d6d7ea4 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -55,7 +55,7 @@
1.2.0-SNAPSHOT
- org.apache.edgent.connectors
+ ${edgent.base.groupId}.connectors
edgent-connectors-iotp
1.2.0-SNAPSHOT
[12/50] incubator-edgent-samples git commit: tweak get-edgent-jars.sh
tweak get-edgent-jars.sh
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/1bfb8fc4
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/1bfb8fc4
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/1bfb8fc4
Branch: refs/heads/develop
Commit: 1bfb8fc4fd9c5e78289ca00f7c70bc7f2c9ae16f
Parents: e7e0b32
Author: Dale LaBossiere
Authored: Tue Sep 19 15:07:10 2017 -0400
Committer: Dale LaBossiere
Committed: Tue Sep 19 15:07:10 2017 -0400
--
get-edgent-jars.sh | 21 ++---
1 file changed, 10 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/1bfb8fc4/get-edgent-jars.sh
--
diff --git a/get-edgent-jars.sh b/get-edgent-jars.sh
index f5354bc..c00e72d 100755
--- a/get-edgent-jars.sh
+++ b/get-edgent-jars.sh
@@ -31,14 +31,6 @@
##
## Creates the directory get-edgent-jars-project and a maven project in it
-### TODO
-### missing console/servlets/target/edgent-console-servlets-1.2.0-SNAPSHOT.war
-###before manually adding it below, figure out why it's not automatically
pulled in as a dep
-###note, as is, even if putting that war in the classpath,
DevelopmentSample doesn't work
-###
-### connector-websocket doesn't work??? / check on correct set of wsclient deps
-### FWIW, HelloEdgent and IotpQuickstart work against the jars retrieved by
this script.
-
USAGE="usage: [--platform {java8|java7|android}] [--version edgent-version]
[--artifacts csv-gav-list] [--file gav-file]"
set -e
@@ -73,6 +65,15 @@ fi
# would directly declare/use and let these components
# (most typically the provider) pull in the rest of the
# Edgent jars (and their dependencies)
+#
+# Explicitly add edgent-connectors-websocket-jetty
+# as there's not a direct dependency on it from connectors-websocket.
+#
+# Hmm... consider adding
org.apache.edgent.console:edgent-console-servlets:{EV}:war
+# It's bundled in edgent-console-server.jar. Having it separately available
+# would enable having the "console" in a Servler engine of the user's choosing.
+# If added, may want to put it in a directory other than edgent-jars.
+#
DEFAULT_GAVS=`cat << EOF
org.slf4j:slf4j-jdk14:${SLF4J_VERSION}
org.apache.edgent.analytics:edgent-analytics-math3:{EV}
@@ -89,9 +90,7 @@ 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-base:{EV}
org.apache.edgent.connectors:edgent-connectors-websocket-jetty:{EV}
-org.apache.edgent.connectors:edgent-connectors-websocket-misc:{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}
@@ -158,7 +157,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 : '{ printf "\n %s\n
%s\n %s\n\n", $1, $2,
$3 }' >> ${DEP_DECLS_FILE}
+echo $i | awk -F : '{ type=""; if ($4 != "") type=" " $4
"\n"; printf "\n %s\n
%s\n %s\n%s\n", $1,
$2, $3, type }' >> ${DEP_DECLS_FILE}
done
DEP_DECLS=`cat ${DEP_DECLS_FILE}`
[05/50] incubator-edgent-samples git commit: cleanup/fix some sample README and scripts
cleanup/fix some sample README and scripts 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/d6db0081 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d6db0081 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d6db0081 Branch: refs/heads/develop Commit: d6db0081056734c816a654e675163d1a35ea9223 Parents: 7db0380 Author: Dale LaBossiere Authored: Wed Sep 6 15:14:47 2017 -0400 Committer: Dale LaBossiere Committed: Wed Sep 6 15:14:47 2017 -0400 -- APPLICATION_DEVELOPMENT.md | 216 README.md | 201 + console/run-sample.sh | 2 +- scenarios/README.md| 52 ++ scenarios/run-sample.sh| 3 +- topology/run-sample.sh | 2 +- utils/README.md| 2 +- utils/run-sample.sh| 2 +- 8 files changed, 258 insertions(+), 222 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6db0081/APPLICATION_DEVELOPMENT.md -- diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md new file mode 100644 index 000..9199c94 --- /dev/null +++ b/APPLICATION_DEVELOPMENT.md @@ -0,0 +1,216 @@ + + +#Edgent Application Development, Packaging and Execution. + +This file is a work-in-progress. + +To develop Edgent applications you will utilize the +Edgent SDK/runtime jars, package your application +artifacts for deploying to an edge device for execution. + +The Edgent SDK/runtime jars are published to maven-central. +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 artifact groupId prefix is: org.apache.edgent (for java8), +org.apache.edgent.java7 and org.apache.edgent.android. e.g. +org.apache.edgent.api org.apache.edgent.api.java7 + +See `JAVA_SUPPORT.md` for more information on coordinates, etc. + +The Edgent API is most easily used by using java8 lambda expressions. +If you only want to deploy your Edgent application to a java8 environment +then your application may use any java8 features it chooses. You compile +and run against the Edgent java8 jars. + +If you want to deploy your Edgent application to a java7 or android +environment, it's still easiest to write your application using the Edgent APIs +with java8 lambda expressions. You compile with java8 but constrain +your application to using java7 features plus java8 lambda expressions. +The Retrolambda tool is used to convert your application's generated +class files to java7. +(the java7 and android Edgent jars were created in that manner too) +Your application would then be run against the appropriate +Edgent platform jars. Alternatively you can forgo the use of lambda +expressions and write your application in java7 and compile +and run against the appropriate Edgent platform jars. + +For convenience it's easiest to build your Edgent applcation using +maven-repository-enabled build tooling (e.g., maven, maven-enabled +Eclipse or IntelliJ). The tooling transparently downloads the +required Edgent jars from the maven repository. + +The supplied Edgent samples poms include support for building for +a java8, java7 or android execution environent. The poms are +configured for the generation of a standard jar as well as an +uber jar for a sample application. + +You can clone the samples/template project as a starting point +for your Edgent application. See `samples/template/README.md`. + +TODO: we would like to provide a maven Edgent Application archetype +that users can use to create an application project template. + +If you can't or don't want to use maven-repository-enabled tooling +you will need to get a local copy of the Edgent jars and their +dependencies and add them to your compile classpath. +The Edgent supplied get-edgent-jars.sh tool can be used to +get copies of the jars from a maven repository. + + +##Packaging and Execution + +Edgent doesn't provide any "deployment" mechanisms other than its primitive +"register jar" feature (see the IotProvider javadoc). Generally, managing +the deployment of application and Edgent jars to edge devices is left to +others (as an example, the IBM Watson IoT Platform has device APIs to +support "firmware" download/update). + +To run your Edgent application on an edge device, your application +jar(s) need to be on the device. Additionally, the application's +dependent Edgent jars (and their transitive dependencies) need to +be on the device. It's unlikely the device will be able
[03/50] incubator-edgent-samples git commit: - Fixed all the remaining errors and warnings in Eclipse
- Fixed all the remaining errors and warnings in Eclipse 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/55efbe1e Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/55efbe1e Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/55efbe1e Branch: refs/heads/develop Commit: 55efbe1e306418d7c1fac49c69687192d0ae4911 Parents: d507d89 Author: Christofer Dutz Authored: Wed Aug 16 09:19:12 2017 +0200 Committer: Christofer Dutz Committed: Wed Aug 16 09:19:12 2017 +0200 -- apps/pom.xml | 1 - connectors/pom.xml | 1 - console/pom.xml| 1 - scenarios/pom.xml | 1 - topology/pom.xml | 1 - utils/pom.xml | 1 - 6 files changed, 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/apps/pom.xml -- diff --git a/apps/pom.xml b/apps/pom.xml index b7c2f5c..2fba1ca 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -28,7 +28,6 @@ edgent-samples-apps - 1.2.0-SNAPSHOT Apache Edgent: Samples: Apps http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/connectors/pom.xml -- diff --git a/connectors/pom.xml b/connectors/pom.xml index f38fc64..8a76cb7 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -28,7 +28,6 @@ edgent-samples-connectors - 1.2.0-SNAPSHOT Apache Edgent: Samples: Connectors http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/console/pom.xml -- diff --git a/console/pom.xml b/console/pom.xml index cf11787..046a035 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -28,7 +28,6 @@ edgent-samples-console - 1.2.0-SNAPSHOT Apache Edgent: Samples: Console http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/scenarios/pom.xml -- diff --git a/scenarios/pom.xml b/scenarios/pom.xml index 2737986..15befaa 100644 --- a/scenarios/pom.xml +++ b/scenarios/pom.xml @@ -28,7 +28,6 @@ edgent-samples-scenarios - 1.2.0-SNAPSHOT Apache Edgent: Samples: Scenarios http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/topology/pom.xml -- diff --git a/topology/pom.xml b/topology/pom.xml index 76231e2..1d1f6b8 100644 --- a/topology/pom.xml +++ b/topology/pom.xml @@ -28,7 +28,6 @@ edgent-samples-topology - 1.2.0-SNAPSHOT Apache Edgent: Samples: Topology http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/55efbe1e/utils/pom.xml -- diff --git a/utils/pom.xml b/utils/pom.xml index 575772c..898a11b 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -28,7 +28,6 @@ edgent-samples-utils - 1.2.0-SNAPSHOT Apache Edgent: Samples: Utils
[23/50] incubator-edgent-samples git commit: add correct NOTICE to samples
add correct NOTICE to samples 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/3c6b1849 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3c6b1849 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3c6b1849 Branch: refs/heads/develop Commit: 3c6b1849421b2b1cbf0dbcf0272ebcc63f08bd7f Parents: d0dea84 Author: Dale LaBossiere Authored: Mon Oct 2 13:57:27 2017 -0400 Committer: Dale LaBossiere Committed: Mon Oct 2 13:57:27 2017 -0400 -- NOTICE | 11 +++ 1 file changed, 11 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3c6b1849/NOTICE -- diff --git a/NOTICE b/NOTICE new file mode 100644 index 000..9c9c1c3 --- /dev/null +++ b/NOTICE @@ -0,0 +1,11 @@ +Apache Edgent +Copyright 2016-2017 The Apache Software Foundation + +Apache Edgent is currently undergoing Incubation at the Apache Software Foundation. + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). +=== + +Portions of this software were developed by IBM Corp. +Copyright IBM Corp. 2015, 2016
[50/50] incubator-edgent-samples git commit: Complete the 1.2.0-SNAPSHOT to 1.3.0-SNAPSHOT changes
Complete the 1.2.0-SNAPSHOT to 1.3.0-SNAPSHOT changes
This is just a short term change to get the develop branch back in
working order. Longer term the automation needs to make all of the
needed 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/82e4b807
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/82e4b807
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/82e4b807
Branch: refs/heads/develop
Commit: 82e4b80769572268db715c97cd691ae6cd99a408
Parents: 3943bd5
Author: Dale LaBossiere
Authored: Tue Nov 7 13:02:48 2017 -0500
Committer: Dale LaBossiere
Committed: Tue Nov 7 13:02:48 2017 -0500
--
get-edgent-jars-project/get-edgent-jars.sh | 2 +-
get-edgent-jars-project/old-get-edgent-jars.sh | 2 +-
get-edgent-jars-project/pom.xml.template | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/82e4b807/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 8d0c5ce..3bdacd6 100755
--- a/get-edgent-jars-project/get-edgent-jars.sh
+++ b/get-edgent-jars-project/get-edgent-jars.sh
@@ -21,7 +21,7 @@
## By default get the Edgent java8 platform jars for the script's default
Edgent version.
##
## --platform {java8|java7|android} get the specified target platform jars
-## --version edgent-version get the specified version's jars (e.g.,
1.2.0-SNAPSHOT)
+## --version edgent-version get the specified version's jars (e.g., 1.2.0)
## --artifacts csv-gav-list get only the specified artifacts. Not restricted
to Edgent jars.
## The Edgent version is substituted for all instances of '{EV}'
## --file gav-file get only the specified artifacts. Not restricted to Edgent
jars.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/82e4b807/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 40f5e07..102467e 100755
--- a/get-edgent-jars-project/old-get-edgent-jars.sh
+++ b/get-edgent-jars-project/old-get-edgent-jars.sh
@@ -21,7 +21,7 @@
## By default get the Edgent java8 platform jars for the script's default
Edgent version.
##
## --platform {java8|java7|android} get the specified target platform jars
-## --version edgent-version get the specified version's jars (e.g.,
1.2.0-SNAPSHOT)
+## --version edgent-version get the specified version's jars (e.g., 1.2.0)
## --artifacts csv-gav-list get only the specified artifacts. Not restricted
to Edgent jars.
## The Edgent version is substituted for all instances of '{EV}'
## --file gav-file get only the specified artifacts. Not restricted to Edgent
jars.
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/82e4b807/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 8c89690..f8c9f1a 100644
--- a/get-edgent-jars-project/pom.xml.template
+++ b/get-edgent-jars-project/pom.xml.template
@@ -25,7 +25,7 @@
org.apache.edgent
[19/50] incubator-edgent-samples git commit: APPLICATION_DEVELOPMENT.md tweaks
APPLICATION_DEVELOPMENT.md tweaks 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/0b4b3130 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/0b4b3130 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/0b4b3130 Branch: refs/heads/develop Commit: 0b4b31305f69a8bed92fb054095ddb69e63b64f6 Parents: d6d7285 Author: Dale LaBossiere Authored: Tue Sep 26 17:16:04 2017 -0400 Committer: Dale LaBossiere Committed: Tue Sep 26 17:16:04 2017 -0400 -- APPLICATION_DEVELOPMENT.md | 142 ++-- 1 file changed, 78 insertions(+), 64 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/0b4b3130/APPLICATION_DEVELOPMENT.md -- diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md index 9199c94..44e3230 100644 --- a/APPLICATION_DEVELOPMENT.md +++ b/APPLICATION_DEVELOPMENT.md @@ -15,12 +15,12 @@ limitations under the License. --> -#Edgent Application Development, Packaging and Execution. +# Edgent Application Development, Packaging and Execution. This file is a work-in-progress. To develop Edgent applications you will utilize the -Edgent SDK/runtime jars, package your application +Edgent SDK/runtime jars and package your application artifacts for deploying to an edge device for execution. The Edgent SDK/runtime jars are published to maven-central. @@ -28,13 +28,19 @@ 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 artifact groupId prefix is: org.apache.edgent (for java8), -org.apache.edgent.java7 and org.apache.edgent.android. e.g. -org.apache.edgent.api org.apache.edgent.api.java7 +The maven artifact groupId prefixes are: -See `JAVA_SUPPORT.md` for more information on coordinates, etc. +- `org.apache.edgent` - for java8, +- `org.apache.edgent.java7` +- `org.apache.edgent.android` -The Edgent API is most easily used by using java8 lambda expressions. +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. + +See `JAVA_SUPPORT.md` for more information on artifact coordinates, etc. + +The Edgent API is most easily used by using Java8 lambda expressions. If you only want to deploy your Edgent application to a java8 environment then your application may use any java8 features it chooses. You compile and run against the Edgent java8 jars. @@ -45,23 +51,26 @@ with java8 lambda expressions. You compile with java8 but constrain your application to using java7 features plus java8 lambda expressions. The Retrolambda tool is used to convert your application's generated class files to java7. -(the java7 and android Edgent jars were created in that manner too) +The Edgent java7 and android platform jars were created in that manner too. Your application would then be run against the appropriate -Edgent platform jars. Alternatively you can forgo the use of lambda +Edgent platform jars. + +Alternatively you can forgo the use of lambda expressions and write your application in java7 and compile and run against the appropriate Edgent platform jars. -For convenience it's easiest to build your Edgent applcation using +For convenience it's easiest to build your Edgent application using maven-repository-enabled build tooling (e.g., maven, maven-enabled Eclipse or IntelliJ). The tooling transparently downloads the -required Edgent jars from the maven repository. +required Edgent jars from the maven repository if they aren't +already present in your local maven repository. The supplied Edgent samples poms include support for building for -a java8, java7 or android execution environent. The poms are +a java8, java7 or android execution environment. The poms are configured for the generation of a standard jar as well as an uber jar for a sample application. -You can clone the samples/template project as a starting point +You can clone the `samples/template` project as a starting point for your Edgent application. See `samples/template/README.md`. TODO: we would like to provide a maven Edgent Application archetype @@ -70,14 +79,14 @@ that users can use to create an application project template. If you can't or don't want to use maven-repository-enabled tooling you will need to get a local copy of the Edgent jars and their dependencies and add them to your compile classpath. -The Edgent supplied get-edgent-jars.sh tool can be used to +The Edgent supplied `get-edgent
[06/50] incubator-edgent-samples git commit: add .mvn to samples to make mvnw work
add .mvn to samples to make mvnw work
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/c3554752
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/c3554752
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/c3554752
Branch: refs/heads/develop
Commit: c35547526290caf517740826e6e3aaf4d90875ca
Parents: d6db008
Author: Dale LaBossiere
Authored: Wed Sep 6 15:54:12 2017 -0400
Committer: Dale LaBossiere
Committed: Wed Sep 6 15:54:12 2017 -0400
--
.mvn/wrapper/MavenWrapperDownloader.java | 110 ++
.mvn/wrapper/maven-wrapper.jar | Bin 0 -> 47610 bytes
.mvn/wrapper/maven-wrapper.properties| 20 +
README.md| 2 +-
4 files changed, 131 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/c3554752/.mvn/wrapper/MavenWrapperDownloader.java
--
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java
b/.mvn/wrapper/MavenWrapperDownloader.java
new file mode 100644
index 000..fdbdd02
--- /dev/null
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -0,0 +1,110 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+/**
+ * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl'
is provided.
+ */
+private static final String DEFAULT_DOWNLOAD_URL =
+
"http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";;
+
+/**
+ * Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
+ * use instead of the default one.
+ */
+private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+".mvn/wrapper/maven-wrapper.properties";
+
+/**
+ * Path where the maven-wrapper.jar will be saved to.
+ */
+private static final String MAVEN_WRAPPER_JAR_PATH =
+".mvn/wrapper/maven-wrapper.jar";
+
+/**
+ * Name of the property which should be used to override the default
download url for the wrapper.
+ */
+private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+public static void main(String args[]) {
+System.out.println("- Downloader started");
+File baseDirectory = new File(args[0]);
+System.out.println("- Using base directory: " +
baseDirectory.getAbsolutePath());
+
+// If the maven-wrapper.properties exists, read it and check if it
contains a custom
+// wrapperUrl parameter.
+File mavenWrapperPropertyFile = new File(baseDirectory,
MAVEN_WRAPPER_PROPERTIES_PATH);
+String url = DEFAULT_DOWNLOAD_URL;
+if(mavenWrapperPropertyFile.exists()) {
+FileInputStream mavenWrapperPropertyFileInputStream = null;
+try {
+mavenWrapperPropertyFileInputStream = new
FileInputStream(mavenWrapperPropertyFile);
+Properties mavenWrapperProperties = new Properties();
+
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+url =
mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+} catch (IOException e) {
+System.out.println("- ERROR loading '" +
MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+} finally {
+try {
+if(mavenWrapperPropertyFileInputStream != null) {
+mavenWrapperPropertyFileInputStream.close();
+}
+} catch (IOException e) {
+// Ignore ...
+}
+}
+}
+System.out.println("- Downloading from: : " + url);
+
+File outputFile = new File(baseDirectory.getAbsolutePath(),
MAVEN_WRAPPER_JAR_PATH);
+if(!outputFile.getParentFile().exists()) {
[21/50] incubator-edgent-samples git commit: sync samples mvn wrapper with changes in parent
sync samples mvn wrapper with changes in 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/67d8fdf0
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/67d8fdf0
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/67d8fdf0
Branch: refs/heads/develop
Commit: 67d8fdf06ca3286b0fa35cf5e74113a8ba935f91
Parents: c9e18ce
Author: Dale LaBossiere
Authored: Mon Oct 2 13:40:49 2017 -0400
Committer: Dale LaBossiere
Committed: Mon Oct 2 13:40:49 2017 -0400
--
.mvn/wrapper/MavenWrapperDownloader.java | 2 +-
.mvn/wrapper/maven-wrapper.properties| 2 +-
mvnw | 2 +-
mvnw.cmd | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/67d8fdf0/.mvn/wrapper/MavenWrapperDownloader.java
--
diff --git a/.mvn/wrapper/MavenWrapperDownloader.java
b/.mvn/wrapper/MavenWrapperDownloader.java
index fdbdd02..44f8e00 100644
--- a/.mvn/wrapper/MavenWrapperDownloader.java
+++ b/.mvn/wrapper/MavenWrapperDownloader.java
@@ -28,7 +28,7 @@ public class MavenWrapperDownloader {
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl'
is provided.
*/
private static final String DEFAULT_DOWNLOAD_URL =
-
"http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";;
+
"https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";;
/**
* Path to the maven-wrapper.properties file, which might contain a
downloadUrl property to
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/67d8fdf0/.mvn/wrapper/maven-wrapper.properties
--
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index d7c1f4b..7e8f382 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -17,4 +17,4 @@
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
-#wrapperUrl=http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar
+#wrapperUrl=https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/67d8fdf0/mvnw
--
diff --git a/mvnw b/mvnw
index 78d4420..53d9860 100755
--- a/mvnw
+++ b/mvnw
@@ -209,7 +209,7 @@ if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
else
echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
-
jarUrl="http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";
+
jarUrl="https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";
while IFS="=" read key value; do
case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
esac
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/67d8fdf0/mvnw.cmd
--
diff --git a/mvnw.cmd b/mvnw.cmd
index cdcd27b..898fb06 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -118,7 +118,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-set
DOWNLOAD_URL="http://central.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";
+set
DOWNLOAD_URL="https://repo1.maven.org/maven2/io/takari/maven-wrapper/0.2.1/maven-wrapper-0.2.1.jar";
FOR /F "tokens=1,2 delims==" %%A IN
(%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
)
[43/50] incubator-edgent-samples git commit: use "-incubating" order in bundle names
use "-incubating" order in bundle names
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/548ecc52
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/548ecc52
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/548ecc52
Branch: refs/heads/develop
Commit: 548ecc5269d27565938390c7082c127238bad4b2
Parents: eed412f
Author: Dale LaBossiere
Authored: Tue Oct 31 12:47:53 2017 -0400
Committer: Dale LaBossiere
Committed: Tue Oct 31 12:47:53 2017 -0400
--
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/548ecc52/pom.xml
--
diff --git a/pom.xml b/pom.xml
index ecee16e..98b1b4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,7 +168,7 @@
org.apache.maven.plugins
maven-assembly-plugin
-
apache-edgent-incubating-samples-${project.version}
+
apache-edgent-${project.version}-incubating-samples
zip
tar.gz
[46/50] incubator-edgent-samples git commit: - Disabled the "Cleanup" step of the build. - Fine tuned the Jenkinsfile to run "sonar" and "site-generation" only on the develop branch. - Fixed some warn
- Disabled the "Cleanup" step of the build.
- Fine tuned the Jenkinsfile to run "sonar" and "site-generation" only on the
develop branch.
- Fixed some warnings in the get-edgent-jars.sh script
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/3ed00490
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3ed00490
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3ed00490
Branch: refs/heads/develop
Commit: 3ed0049089df8deb42cfa50744ffa6a18adfaed7
Parents: 2b267b2
Author: Christofer Dutz
Authored: Sun Nov 5 16:01:21 2017 +0100
Committer: Christofer Dutz
Committed: Sun Nov 5 16:01:21 2017 +0100
--
get-edgent-jars-project/get-edgent-jars.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3ed00490/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 a8c50f7..8d0c5ce 100755
--- a/get-edgent-jars-project/get-edgent-jars.sh
+++ b/get-edgent-jars-project/get-edgent-jars.sh
@@ -120,7 +120,7 @@ function confirm () { # [$1: question]
# call with a prompt string or use a default
/bin/echo -n "${1:-Are you sure?}"
read -r -p " [y/n] " response
-case $response in
+case ${response} in
[yY]) return `true` ;;
[nN]) return `false` ;;
*) echo "illegal response '$response'" ;;
@@ -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.runtime.version}"; if ($4 != "") type=" " $4 "\n";
printf "\n %s\n %s\n
%s\n%s\n", $1, $2, $3, type }' >>
${DEP_DECLS_FILE}
+echo ${i} | awk -F : '{ type=""; if ($3 == "{EV}")
$3="${edgent.runtime.version}"; if ($4 != "") type=" " $4 "\n";
printf "\n %s\n %s\n
%s\n%s\n", $1, $2, $3, type }' >>
${DEP_DECLS_FILE}
done
DEP_DECLS=`cat ${DEP_DECLS_FILE}`
[29/50] incubator-edgent-samples git commit: more samples doc work
more samples doc work 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/c7df9e4d Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/c7df9e4d Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/c7df9e4d Branch: refs/heads/develop Commit: c7df9e4da267983cf34cc9441572a83565b942b9 Parents: a11725c Author: Dale LaBossiere Authored: Mon Oct 9 18:59:17 2017 -0400 Committer: Dale LaBossiere Committed: Mon Oct 9 18:59:17 2017 -0400 -- README.md | 97 ++--- template/README.md | 6 ++- 2 files changed, 81 insertions(+), 22 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/c7df9e4d/README.md -- diff --git a/README.md b/README.md index 84c392a..271feef 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,46 @@ limitations under the License. --> +# Quickstart + +You must have Java 8 installed on your system. + +Build the samples for Java 8 +```sh +./mvnw clean package +``` + +Run the HelloEdgent sample +```sh +cd topology +./run-sample.sh HelloEdgent # prints a hello message and terminates + Hello + Edgent! + ... +``` + +# Overview + +The Edgent samples provide a starting point for jump starting your +use of Edgent. See the _Samples Summary_ section for a list of the samples. + +The Edgent samples are organized into a few categories (subdirectories) +and are a collection of maven projects. They can be built using maven +or other maven-integrated tooling such as Eclipse. + +An Edgent application template maven project is supplied. +It may be a useful starting point to clone for your application. +The template has a standalone maven project pom, rather than a +stylized one used by the rest of the samples. +See [template/README.md](template/README.md). + See [APPLICATION_DEVELOPMENT.md](APPLICATION_DEVELOPMENT.md) for general information on Edgent Application Development, Packaging and Execution. Additional information may also be found in Getting Started https://edgent.apache.org/docs/edgent-getting-started + # Setup Once you have downloaded and unpacked the samples source bundle @@ -28,16 +62,13 @@ or cloned the the samples repository you need to download these additional development software tools. * Java 8 - The development setup assumes Java 8 -* Maven - *(optional) (https://maven.apache.org/)* - -Maven is used as build tool. Currently there are two options: -1. Using the maven-wrapper (the `mvnw` or `mvnw.bat` command - preferred) -2. Using an installed version of Maven (the `mvn` command) +Maven is used as build tool and a maven-wrapper +script (`mvwn` or `mvnw.bat`) is included. -The maven-wrapper will automatically download and install the -correct Maven version and use that. Besides this, there is no -difference between using the `mvn` and `mvnw` command. +The maven-wrapper automatically downloads and installs the +correct Maven version and use it. Besides this, there is no +difference between using the `mvnw` command and the `mvn` command. You may also use a maven-integrated IDE with the samples. e.g., see the _Using Eclipse_ section below. @@ -59,8 +90,8 @@ Java7 platform class files are produced when the appropriate profile is specified. Currently, building and running the samples for the Android platform -is not supported. Many samples use the `DevelopmentProvider` and -the `DevelopmentProvider` is not supported on the Android platform. +is not supported. Many samples happen to use the `DevelopmentProvider`, +which is not supported on the Android platform. Build the samples ```sh @@ -73,11 +104,13 @@ in the sample category's target directory: `/target`. ## Running the samples -See the README.md in each sample category directory. +See the README.md in each sample category directory for information +on running the samples. + # Using Eclipse -The Edgent Git repository, or samples source release bundle, contains +The Edgent Git repository and samples source release bundle contains Maven project definitions for the samples. Once you import the Maven projects into your workspace, builds @@ -92,10 +125,17 @@ Eclipse Git Team Provider plugin 1. From the *File* menu, select *Import...* 2. From the *Git* folder, select *Projects from Git* and click *Next* 3. Select *Clone URI* to clone the remote repository. Click *Next*. -+ In the *Location* section, enter the URI of your fork in the *URI* field (e.g., `g...@github.com:/incubator-edgent.git`). The other fields will be populated automatically. Click *Next*. If required, enter your passphrase. -+ In the *Source Git Repository* window, selec
[14/50] incubator-edgent-samples git commit: cleanup and tweak samples poms and doc for android
cleanup and tweak samples poms and doc for android 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/150c308d Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/150c308d Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/150c308d Branch: refs/heads/develop Commit: 150c308d2f45be0ed029f1728a47911d2899db5c Parents: 3f3e932 Author: Dale LaBossiere Authored: Tue Sep 26 11:28:11 2017 -0400 Committer: Dale LaBossiere Committed: Tue Sep 26 11:28:11 2017 -0400 -- README.md | 17 ++ pom.xml| 9 -- template/README.md | 18 +-- template/pom.xml | 85 ++--- 4 files changed, 27 insertions(+), 102 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/150c308d/README.md -- diff --git a/README.md b/README.md index 48f5f15..2589e01 100644 --- a/README.md +++ b/README.md @@ -21,25 +21,28 @@ information on Edgent Application Development, Packaging and Execution. Additional information may also be found in Getting Started https://edgent.apache.org/docs/edgent-getting-started -#Building the Edgent samples +# Building the Edgent samples By default Java8 class files are generated. -Java7 and Android platform class files are produced when the appropriate +Java7 platform class files are produced when the appropriate profile is specified. +Currently, building and running the samples for the Android platform +is not supported. Many samples use the `DevelopmentProvider` and +the `DevelopmentProvider` is not supported on the Android platform. ```sh -./mvnw clean package # -Pplatform-java7,platform-android as needed +./mvnw clean package # -Pplatform-java7 as needed ``` -A standard jar and uber jar is created for each sample category +A standard jar and uber jar are created for each sample category in the sample category's target directory: `/target`. -##Running the samples +## Running the samples See the README.md in each sample category directory. -#Using Eclipse +# Using Eclipse The Edgent Git repository, or samples source release bundle, contains Maven project definitions for the samples. @@ -80,7 +83,7 @@ E.g., 1. open the `HelloEdgent.java` sample 2. click on *Run*, *Run As*, then *Java application*. `HelloEdgent` runs and prints to the Console view. -#Samples Summary +# Samples Summary HelloEdgent Basic mechanics of declaring a topology and executing http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/150c308d/pom.xml -- diff --git a/pom.xml b/pom.xml index 713b1e4..f5032e3 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,12 @@ - + + http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/150c308d/template/README.md -- diff --git a/template/README.md b/template/README.md index ef39700..096ef15 100644 --- a/template/README.md +++ b/template/README.md @@ -3,34 +3,32 @@ An Edgent Application template project. Clone this template project to start your Edgent application project. The project's pom supports + - building for java8, java7 or android execution environments - building a standard jar and uber jar -Edit the pom for your application. Adjust for your application's maven coordinates. +Edit the pom for your application. Adjust it for your application's maven coordinates. The pom has potential Edgent dependenacies present and commented out. Include the Edgent Providers, Analytics, Utils, and Connectors used by your application. Read `../README.md` for general information about Edgent Application development. -#Building the project - +# Building the project ```sh -./mvnw clean install # add -Pplatform-java7 or -Pplatform-java8 as needed +./mvnw clean install # add -Pplatform-java7 or -Pplatform-android as needed ``` -#Running the application - -You can copy app-run.sh and the generated target/*-uber.jar to the edge device +# Running the application +You can copy `app-run.sh` and the generated `target/*-uber.jar` to the edge device ```sh ./app-run.sh ``` -#Using package-app.sh with the project +# Using package-app.sh with the project Adjust the main class name and application jar path below for your application. - ```sh -PLATFORM= # add "--platform java7" or "--platform android" if appropriate +PLATFORM= # add "--platform java7" or "--platform android" as appropriate ../package-app.sh $PLATFORM --mainClass com.mycompany.app.TemplateApp --appj
[39/50] incubator-edgent-samples git commit: minor doc stuff
minor doc stuff 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/22d0c288 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/22d0c288 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/22d0c288 Branch: refs/heads/develop Commit: 22d0c288bdf0301c1ae933381bbcaa95eceb5448 Parents: 51ddbc2 Author: Dale LaBossiere Authored: Tue Oct 17 20:09:25 2017 -0400 Committer: Dale LaBossiere Committed: Tue Oct 17 20:09:25 2017 -0400 -- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/22d0c288/README.md -- diff --git a/README.md b/README.md index 97adf54..e39fac0 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ # Quickstart You must have Java 8 installed on your system. Maven will be automatically -downloaded installed by the maven wrapper `mvnw`. +downloaded and installed by the maven wrapper `mvnw`. Build the samples for Java 8 ```sh
[27/50] incubator-edgent-samples git commit: - Adjusted the distribution to include required licensing information.
- Adjusted the distribution to include required licensing information. 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/afe46c32 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/afe46c32 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/afe46c32 Branch: refs/heads/develop Commit: afe46c321e6f3635d787c15ec225ea95a7b272b9 Parents: 88dc329 Author: Christofer Dutz Authored: Wed Oct 4 21:03:00 2017 +0200 Committer: Christofer Dutz Committed: Wed Oct 4 21:03:00 2017 +0200 -- pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/afe46c32/pom.xml -- diff --git a/pom.xml b/pom.xml index b3d1061..794cc89 100644 --- a/pom.xml +++ b/pom.xml @@ -326,6 +326,7 @@ + org.apache:apache-jar-resource-bundle:1.4 org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT
[34/50] incubator-edgent-samples git commit: rototill samples poms for j7 support
rototill samples poms for j7 support
- model like the Edgent core's platform pom structure (ugh)
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/ab768c46
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/ab768c46
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/ab768c46
Branch: refs/heads/develop
Commit: ab768c465b0b4b1e60f15651a39246d4eed14be8
Parents: ab0098a
Author: Dale LaBossiere
Authored: Wed Oct 11 15:35:50 2017 -0400
Committer: Dale LaBossiere
Committed: Wed Oct 11 15:35:50 2017 -0400
--
apps/pom.xml | 40 +--
buildtools/update-platform-poms.sh | 20
connectors/pom.xml | 39 +--
console/pom.xml| 27 -
platforms/java7/apps/pom.xml | 93
platforms/java7/connectors/pom.xml | 98 +
platforms/java7/console/pom.xml| 67
platforms/java7/pom.xml| 186
platforms/java7/scenarios/pom.xml | 102 ++
platforms/java7/topology/pom.xml | 68
platforms/java7/utils/pom.xml | 78 ++
platforms/pom.xml | 59 ++
pom.xml| 157 ++-
scenarios/pom.xml | 30 --
template/pom.xml | 30 +++---
topology/pom.xml | 28 -
utils/pom.xml | 38 +--
17 files changed, 953 insertions(+), 207 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 6041636..bebae83 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -21,54 +21,72 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
+
+
org.apache.edgent.samples
edgent-samples
1.2.0-SNAPSHOT
-
- ${edgent.base.groupId}.samples
+
+ org.apache.edgent.samples
edgent-samples-apps
- Apache Edgent: Samples: Apps
+ Apache Edgent${samples.projname.platform}: Samples: Apps
-
+
+
+ ${edgent.base.groupId}.providers
+ edgent-providers-direct
+ ${edgent.core.version}
+
+
+ ${edgent.base.groupId}.providers
+ edgent-providers-development
+ ${edgent.core.version}
+
+
+ ${edgent.base.groupId}.providers
+ edgent-providers-iot
+ ${edgent.core.version}
+
${edgent.base.groupId}.analytics
edgent-analytics-sensors
- 1.2.0-SNAPSHOT
+ ${edgent.core.version}
${edgent.base.groupId}.connectors
edgent-connectors-file
- 1.2.0-SNAPSHOT
+ ${edgent.core.version}
${edgent.base.groupId}.analytics
edgent-analytics-math3
- 1.2.0-SNAPSHOT
+ ${edgent.core.version}
${edgent.base.groupId}.connectors
edgent-connectors-iot
- 1.2.0-SNAPSHOT
+ ${edgent.core.version}
${edgent.base.groupId}.connectors
edgent-connectors-iotp
- 1.2.0-SNAPSHOT
+ ${edgent.core.version}
${edgent.base.groupId}.connectors
edgent-connectors-mqtt
- 1.2.0-SNAPSHOT
+ ${edgent.core.version}
+
${edgent.base.groupId}.samples
edgent-samples-utils
- 1.2.0-SNAPSHOT
+ ${project.version}
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/buildtools/update-platform-poms.sh
--
diff --git a/buildtools/update-platform-poms.sh
b/buildtools/update-platform-poms.sh
new file mode 100755
index 000..07cbc53
--- /dev/null
+++ b/buildtools/update-platform-poms.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# copy the java8 version of the poms to the other platform hierarchies,
+# adjusting the groupIds accordingly
+#
+# usage: buildtools/update-platform-poms.sh
+
+J8_PROJECTS="apps connectors console scenarios topology utils"
+PLATFORMS=java7
+
+for p in ${PLATFORMS}; do
+ for proj in ${J8_PROJECTS}; do
+if [ ! -d platforms/${p}/${proj} ]; then
+mkdir -p platforms/${p}/${proj}
+fi
+sed -e "s/org.apache.edgent.samples/org.apache.edgent.${p}.samples/g" \
+-e "s/UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER/DO NOT EDIT - GENERATED BY
update_platform_poms.sh/" \
+ < ${proj}/pom.xml > platforms/${p}/${proj}/pom.xml
+ done
+done
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/connectors/pom.xml
[41/50] incubator-edgent-samples git commit: Additional pom transformations: increase pom commonality/generality, lessen errors
Additional pom transformations: increase pom commonality/generality,
lessen errors
- use ${package.groupId}
- use ${package.version}
- add edgent.retrolambda.srcArtifactGroupId - (platform) groupId of
transformation's input artifacts (jars)
- add edgent.projname.platform - platform text fragment for proj name
- add edgent.runtime.groupId - groupId for the platform's jars
- rename edgent.version to edgent.runtime.version
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/ef1c55df
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/ef1c55df
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/ef1c55df
Branch: refs/heads/develop
Commit: ef1c55df7d543fdc12722b1442263993fd487fee
Parents: cd3c96e
Author: Dale LaBossiere
Authored: Mon Oct 23 10:02:12 2017 -0400
Committer: Dale LaBossiere
Committed: Mon Oct 23 10:02:12 2017 -0400
--
apps/pom.xml | 2 +-
connectors/pom.xml | 2 +-
console/pom.xml| 2 +-
pom.xml| 2 +-
scenarios/pom.xml | 2 +-
topology/pom.xml | 2 +-
utils/pom.xml | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 0fc7223..7ee0b34 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -22,7 +22,7 @@
4.0.0
-org.apache.edgent
+org.apache.edgent
edgent-samples
1.2.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/connectors/pom.xml
--
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 6094cbe..1ef7756 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -22,7 +22,7 @@
4.0.0
-org.apache.edgent
+org.apache.edgent
edgent-samples
1.2.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/console/pom.xml
--
diff --git a/console/pom.xml b/console/pom.xml
index 59d6a54..8cad8ad 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -22,7 +22,7 @@
4.0.0
-org.apache.edgent
+org.apache.edgent
edgent-samples
1.2.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 45a0834..ecee16e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
4.0.0
-org.apache
+org.apache
apache
18
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/scenarios/pom.xml
--
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index 9b8628d..e6eabc5 100644
--- a/scenarios/pom.xml
+++ b/scenarios/pom.xml
@@ -22,7 +22,7 @@
4.0.0
-org.apache.edgent
+org.apache.edgent
edgent-samples
1.2.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/topology/pom.xml
--
diff --git a/topology/pom.xml b/topology/pom.xml
index 28d1ac3..8fcaa89 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -22,7 +22,7 @@
4.0.0
-org.apache.edgent
+org.apache.edgent
edgent-samples
1.2.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ef1c55df/utils/pom.xml
--
diff --git a/utils/pom.xml b/utils/pom.xml
index da2f87a..2a2cd0c 100644
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -22,7 +22,7 @@
4.0.0
-org.apache.edgent
+org.apache.edgent
edgent-samples
1.2.0-SNAPSHOT
[47/50] incubator-edgent-samples git commit: update doc: RELEASE_NOTES, samples/README.md
update doc: RELEASE_NOTES, samples/README.md 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/cc6bd62f Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/cc6bd62f Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/cc6bd62f Branch: refs/heads/develop Commit: cc6bd62fac21482d37a04252f6be70ca01e1895a Parents: 2b267b2 Author: Dale LaBossiere Authored: Mon Nov 6 13:12:42 2017 -0500 Committer: Dale LaBossiere Committed: Mon Nov 6 13:12:42 2017 -0500 -- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/cc6bd62f/README.md -- diff --git a/README.md b/README.md index 6bd26ed..ba18312 100644 --- a/README.md +++ b/README.md @@ -213,8 +213,7 @@ SensorAnalytics Demonstrates a more complex sample that includes conditional stream tracing. -Other samples are provided but have not yet been noted above. -Feel free to explore. +Many other samples are provided but have not yet been noted above. Explore! # Licensing
[49/50] incubator-edgent-samples git commit: Update sample poms for 1.2.0-SNAPSHOT to 1.3.0-SNAPSHOT
Update sample poms for 1.2.0-SNAPSHOT to 1.3.0-SNAPSHOT
commit a221f2f changed a lot of the poms but didn't get these.
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/3943bd57
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3943bd57
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3943bd57
Branch: refs/heads/develop
Commit: 3943bd572cd4430838a470b6e1c3b428f183cf31
Parents: eb42102
Author: Dale LaBossiere
Authored: Mon Nov 6 18:30:09 2017 -0500
Committer: Dale LaBossiere
Committed: Mon Nov 6 18:30:09 2017 -0500
--
apps/pom.xml | 2 +-
connectors/pom.xml | 2 +-
console/pom.xml | 2 +-
console/run-sample.sh| 1 -
get-edgent-jars-project/README.md| 2 +-
get-edgent-jars-project/pom.xml.template | 2 +-
pom.xml | 2 +-
scenarios/pom.xml| 2 +-
scenarios/run-sample.sh | 1 -
template/pom.xml | 2 +-
topology/pom.xml | 2 +-
topology/run-sample.sh | 1 -
utils/pom.xml| 2 +-
utils/run-sample.sh | 1 -
14 files changed, 10 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index 7ee0b34..3423571 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -24,7 +24,7 @@
org.apache.edgent
edgent-samples
-1.2.0-SNAPSHOT
+1.3.0-SNAPSHOT
edgent-samples-apps
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/connectors/pom.xml
--
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 1ef7756..1f7b3dd 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -24,7 +24,7 @@
org.apache.edgent
edgent-samples
-1.2.0-SNAPSHOT
+1.3.0-SNAPSHOT
edgent-samples-connectors
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/console/pom.xml
--
diff --git a/console/pom.xml b/console/pom.xml
index 8cad8ad..da45e56 100644
--- a/console/pom.xml
+++ b/console/pom.xml
@@ -24,7 +24,7 @@
org.apache.edgent
edgent-samples
-1.2.0-SNAPSHOT
+1.3.0-SNAPSHOT
edgent-samples-console
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/console/run-sample.sh
--
diff --git a/console/run-sample.sh b/console/run-sample.sh
index b11529e..f97b058 100755
--- a/console/run-sample.sh
+++ b/console/run-sample.sh
@@ -20,7 +20,6 @@ USAGE="usage: `basename $0` [--list] simple-main-class-name
[sample-args]"
CATEGORY=console
-#UBER_JAR=target/edgent-samples-topology-1.2.0-SNAPSHOT-uber.jar
UBER_JAR=target/edgent-samples-${CATEGORY}-*-uber.jar
SAMPLE_PACKAGE_BASE=org.apache.edgent.samples.${CATEGORY}
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/get-edgent-jars-project/README.md
--
diff --git a/get-edgent-jars-project/README.md
b/get-edgent-jars-project/README.md
index ad176b9..174980c 100644
--- a/get-edgent-jars-project/README.md
+++ b/get-edgent-jars-project/README.md
@@ -28,7 +28,7 @@ project's default Edgent version.
``` sh
cd get-edgent-jars-project
-./get-edgent-jars.sh --version 1.2.0-SNAPSHOT # retrieve the Edgent
1.2.0-SNAPSHOT java8 jars
+./get-edgent-jars.sh --version 1.3.0-SNAPSHOT # retrieve the Edgent
1.3.0-SNAPSHOT java8 jars
# Generating dependency decls...
# Generating pom.xml...
...
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/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 2027f84..8c89690 100644
--- a/get-edgent-jars-project/pom.xml.template
+++ b/get-edgent-jars-project/pom.xml.template
@@ -30,7 +30,7 @@
org.apache.edgent
get-edgent-jars-project
- 1.2.0-SNAPSHOT
+ 1.3.0-SNAPSHOT
Apache Edgent get-edgent-jars-project
${samples.projname.platform}
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3943bd57/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 98b1b4e..a3ca547 100644
[42/50] incubator-edgent-samples git commit: remove all gradle tooling artifacts and "exclusions" from the repo
remove all gradle tooling artifacts and "exclusions" from the repo
We really want to support only a single set of build tooling.
Also, while perhaps not too too difficult to remedy, the current
state of the grade tooling won't work due to some repo restructuring.
TODO identify / cleanup items in buildTools that have no role going
forward (most if not all of them).
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/eed412fd
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/eed412fd
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/eed412fd
Branch: refs/heads/develop
Commit: eed412fd6311737e92a562217671fd2c85ad2ac9
Parents: ef1c55d
Author: Dale LaBossiere
Authored: Mon Oct 30 11:26:41 2017 -0400
Committer: Dale LaBossiere
Committed: Mon Oct 30 11:26:41 2017 -0400
--
.gitignore | 5 -
apps/build.gradle | 30 ---
connectors/build.gradle | 33 -
console/build.gradle| 25 --
scenarios/build.gradle | 49
topology/build.gradle | 28 -
utils/build.gradle | 27
7 files changed, 197 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 128a2d4..d555b80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,12 +9,7 @@
# More generated artifacts
target/
-/test/svt/lib
-/release-edgent
/reports
-/.gradle/
-build/
-/externalJars
# Mobile Tools for Java (J2ME)
.mtj.tmp/
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/apps/build.gradle
--
diff --git a/apps/build.gradle b/apps/build.gradle
deleted file mode 100644
index b94804b..000
--- a/apps/build.gradle
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-dependencies {
- // N.B. common dependencies are set in root build.gradle
-
- addTargetDirProjectJarDependency 'compile', ':connectors:mqtt'
- addTargetDirProjectJarDependency 'compile', ':connectors:file'
- addTargetDirProjectJarDependency 'compile', ':connectors:serial'
- addTargetDirProjectJarDependency 'compile', ':analytics:math3'
- addTargetDirProjectJarDependency 'compile', ':analytics:sensors'
- addTargetDirProjectJarDependency 'compile', ':samples:utils'
-
- // N.B. root project adds test common dependencies
-}
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eed412fd/connectors/build.gradle
--
diff --git a/connectors/build.gradle b/connectors/build.gradle
deleted file mode 100644
index 909a8e6..000
--- a/connectors/build.gradle
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
-*/
-dependencies {
- // N.B. common dependencies are set in root build.gradle
-
- addTargetDirProjectJarDependency 'compile', ':analytics:math3'
- addTargetDirProjectJarDependency 'compile', ':connectors:mqtt'
- addTargetDirProjectJarDependency 'compile', ':connectors:kafka'
- addTargetD
[36/50] incubator-edgent-samples git commit: fix (finally?) samples and j7
fix (finally?) samples and j7
- the prior "rototil" commit wasn't complete
- it didn't actually compile anything for j7... woops
- started to flesh that out but...
- had 2nd thoughts and decided should be able to simplify
- undo the rototil and simply build the samples with either j8 or j7
edgent jars
- don't have separate j8,j7 samples groupIds; samples artifacts will
be j8 unless built with -Pplatform-java7
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/e1812af8
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/e1812af8
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/e1812af8
Branch: refs/heads/develop
Commit: e1812af8958cbc1ab39c23662d9851280be4e98c
Parents: d70a181
Author: Dale LaBossiere
Authored: Mon Oct 16 14:39:58 2017 -0400
Committer: Dale LaBossiere
Committed: Mon Oct 16 14:39:58 2017 -0400
--
apps/pom.xml | 23 +---
buildtools/update-platform-poms.sh | 21
connectors/pom.xml | 23 +---
console/pom.xml| 21 +---
platforms/java7/apps/pom.xml | 93
platforms/java7/connectors/pom.xml | 98 -
platforms/java7/console/pom.xml| 67
platforms/java7/pom.xml| 186
platforms/java7/scenarios/pom.xml | 102 --
platforms/java7/topology/pom.xml | 68
platforms/java7/utils/pom.xml | 78 --
platforms/pom.xml | 59 --
pom.xml| 57 --
scenarios/pom.xml | 23 +---
topology/pom.xml | 23 +---
utils/pom.xml | 21 +---
16 files changed, 66 insertions(+), 897 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/apps/pom.xml
--
diff --git a/apps/pom.xml b/apps/pom.xml
index bebae83..602c970 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -21,8 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
-
-
org.apache.edgent.samples
edgent-samples
@@ -32,25 +30,10 @@
org.apache.edgent.samples
edgent-samples-apps
- Apache Edgent${samples.projname.platform}: Samples: Apps
+ Apache Edgent Samples${samples.projname.platform}: Apps
-
-
- ${edgent.base.groupId}.providers
- edgent-providers-direct
- ${edgent.core.version}
-
-
- ${edgent.base.groupId}.providers
- edgent-providers-development
- ${edgent.core.version}
-
-
- ${edgent.base.groupId}.providers
- edgent-providers-iot
- ${edgent.core.version}
-
+
${edgent.base.groupId}.analytics
@@ -84,7 +67,7 @@
- ${edgent.base.groupId}.samples
+ org.apache.edgent.samples
edgent-samples-utils
${project.version}
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/buildtools/update-platform-poms.sh
--
diff --git a/buildtools/update-platform-poms.sh
b/buildtools/update-platform-poms.sh
deleted file mode 100755
index 56cf1bb..000
--- a/buildtools/update-platform-poms.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# copy the java8 version of the poms to the other platform hierarchies,
-# adjusting the groupIds accordingly
-#
-# usage: buildtools/update-platform-poms.sh
-
-J8_PROJECTS="apps connectors console scenarios topology utils"
-PLATFORMS=java7
-
-for p in ${PLATFORMS}; do
- for proj in ${J8_PROJECTS}; do
-echo Updating platforms/${p}/${proj}/pom.xml...
-if [ ! -d platforms/${p}/${proj} ]; then
-mkdir -p platforms/${p}/${proj}
-fi
-sed -e "s/org.apache.edgent.samples/org.apache.edgent.${p}.samples/g" \
--e "s/UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER/DO NOT EDIT - GENERATED BY
update_platform_poms.sh/" \
- < ${proj}/pom.xml > platforms/${p}/${proj}/pom.xml
- done
-done
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/connectors/pom.xml
--
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 9f293c8..cf8549a 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -21,8 +21,6 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
-
-
org.apache.edgent.samples
edgent-samples
@@ -32,25 +30,10 @@
org.apache.edgent.samples
edgent-sam
[01/50] incubator-edgent-samples git commit: - Added the config to make the servlet.war available to the examples in "edgent-samples-topology"
Repository: incubator-edgent-samples
Updated Branches:
refs/heads/develop [created] 82e4b8076
- Added the config to make the servlet.war available to the examples in
"edgent-samples-topology"
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/9a0ef885
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/9a0ef885
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/9a0ef885
Branch: refs/heads/develop
Commit: 9a0ef885b63a85ff6dd88a54506f3fea31639887
Parents: 6e8d3e2
Author: Christofer Dutz
Authored: Mon Aug 14 15:39:23 2017 +0200
Committer: Christofer Dutz
Committed: Mon Aug 14 15:39:23 2017 +0200
--
topology/pom.xml | 30 ++
1 file changed, 30 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/9a0ef885/topology/pom.xml
--
diff --git a/topology/pom.xml b/topology/pom.xml
index 76231e2..0a2581c 100644
--- a/topology/pom.xml
+++ b/topology/pom.xml
@@ -32,6 +32,36 @@
Apache Edgent: Samples: Topology
+
+
+
+maven-dependency-plugin
+3.0.1
+
+
+copy
+generate-test-resources
+
+ copy
+
+
+
+
+ org.apache.edgent.console
+ edgent-console-servlets
+ ${project.version}
+ war
+
${project.build.directory}/war-resources
+ servlets.war
+
+
+
+
+
+
+
+
+
[20/50] incubator-edgent-samples git commit: merge from origin/feature/maven
merge from origin/feature/maven 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/c9e18ce7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/c9e18ce7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/c9e18ce7 Branch: refs/heads/develop Commit: c9e18ce79dee6f9082c7ddbe999d7854f4a6b43c Parents: 0b4b313 972363e Author: Dale LaBossiere Authored: Tue Sep 26 17:18:01 2017 -0400 Committer: Dale LaBossiere Committed: Tue Sep 26 17:18:01 2017 -0400 -- apps/pom.xml | 3 ++- connectors/pom.xml | 1 + console/pom.xml| 1 + scenarios/pom.xml | 1 + topology/pom.xml | 1 + utils/pom.xml | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) --
[44/50] incubator-edgent-samples git commit: doc tweaks
doc tweaks 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/b4ae7a8b Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/b4ae7a8b Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/b4ae7a8b Branch: refs/heads/develop Commit: b4ae7a8b9605b2ab1f0b5488ac99bf29fdfa86da Parents: 548ecc5 Author: Dale LaBossiere Authored: Wed Nov 1 09:20:06 2017 -0400 Committer: Dale LaBossiere Committed: Wed Nov 1 09:20:06 2017 -0400 -- APPLICATION_DEVELOPMENT.md | 10 -- README.md | 10 ++ 2 files changed, 10 insertions(+), 10 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/b4ae7a8b/APPLICATION_DEVELOPMENT.md -- diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md index eb6e2fb..9e01074 100644 --- a/APPLICATION_DEVELOPMENT.md +++ b/APPLICATION_DEVELOPMENT.md @@ -19,9 +19,11 @@ To develop Edgent applications you will utilize the Edgent SDK/runtime jars and package your application -artifacts for deploying to an edge device for execution. +artifacts for deploying to an edge device or gateway for execution. -The Edgent SDK/runtime jars are published to maven-central. +The Edgent SDK/runtime jars are published to the +[ASF Nexus Repository](https://repository.apache.org/content/repositories/releases/) +and the Maven Central Repository. Alternatively, you can build the Edgent SDK yourself from a source release and the resulting jars will be added to your local maven repository. @@ -129,10 +131,6 @@ for a tool to get a copy of the Edgent jars. The bundle is a standalone entity containing everything that's needed to run your application. - -The bundle contains the application's jar -and the application's dependent Edgent jars and their -transitive dependencies. The bundle is copied to the device and unpacked. A run script forms the appropriate `CLASSPATH` http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/b4ae7a8b/README.md -- diff --git a/README.md b/README.md index e39fac0..09079d4 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ and used. If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider plugin -1. From the *File* menu, select *Import...* +1. From the Eclipse *File* menu, select *Import...* 2. From the *Git* folder, select *Projects from Git* and click *Next* 3. Select *Clone URI* to clone the remote repository. Click *Next*. + In the *Location* section, enter the URI of your fork in the *URI* field @@ -143,7 +143,7 @@ Once you have cloned the Git repository to your machine or are working from an unpacked samples source release bundle, import the Maven projects into your workspace -1. From the *File* menu, select *Import...* +1. From the Eclipse *File* menu, select *Import...* 2. From the *Maven* folder, select *Existing Maven Projects* and click *Next* + browse to the `samples` directory in the clone or source release directory and select it. A hierarchy of samples projects / pom.xml files will be @@ -160,8 +160,10 @@ Eclipse Maven or Git Team Provider. Once the samples projects have been imported you can run them from Eclipse in the usual manner. E.g., -1. open the `HelloEdgent.java` sample -2. click on *Run*, *Run As*, then *Java application*. +1. From the Eclipse *Navigate* menu, select *Open Type* + + enter type type name `HelloEdgent` and click *OK* +2. right click on the `HelloEdgent` class name and from the context menu + + click on *Run As*, then *Java application*. `HelloEdgent` runs and prints to the Console view.
[10/50] incubator-edgent-samples git commit: remove runjdbcsample.sh.orig
remove runjdbcsample.sh.orig
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/4456eb29
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/4456eb29
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/4456eb29
Branch: refs/heads/develop
Commit: 4456eb29d80569ca41e408f4892c17752868cf86
Parents: 51ed7d1
Author: Dale LaBossiere
Authored: Tue Sep 12 18:25:32 2017 -0400
Committer: Dale LaBossiere
Committed: Tue Sep 12 18:25:32 2017 -0400
--
connectors/scripts/jdbc/runjdbcsample.sh.orig | 46 --
1 file changed, 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/4456eb29/connectors/scripts/jdbc/runjdbcsample.sh.orig
--
diff --git a/connectors/scripts/jdbc/runjdbcsample.sh.orig
b/connectors/scripts/jdbc/runjdbcsample.sh.orig
deleted file mode 100755
index 46d8f04..000
--- a/connectors/scripts/jdbc/runjdbcsample.sh.orig
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-#http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-edgent=../../..
-
-# Runs the Sample JDBC Writer or Reader
-#
-# ./runjdbcsample.sh writer
-# ./runjdbcsample.sh reader
-
-if [ -z "$DERBY_HOME" ]; then
-echo "\$DERBY_HOME not defined."
-exit 1;
-fi
-if [ ! -f $DERBY_HOME/lib/derby.jar ]; then
-echo "\$DERBY_HOME/lib/derby.jar: file not found"
-exit 1;
-fi
-
-export
CLASSPATH=${edgent}/samples/lib/edgent.samples.connectors.jar:$DERBY_HOME/lib/derby.jar
-
-app=$1; shift
-if [ "$app" == "writer" ]; then
-java org.apache.edgent.samples.connectors.jdbc.SimpleWriterApp
jdbc.properties
-elif [ "$app" == "reader" ]; then
-java org.apache.edgent.samples.connectors.jdbc.SimpleReaderApp
jdbc.properties
-else
-echo "unrecognized mode '$app'"
-echo "usage: $0 writer|reader"
-exit 1
-fi
[24/50] incubator-edgent-samples git commit: - Removed the "DEPENDENCIES" generation (not needed) - Removed the now no longer needed optional dependencies - Reduced the number of bundled license texts
- Removed the "DEPENDENCIES" generation (not needed) - Removed the now no longer needed optional dependencies - Reduced the number of bundled license texts to only the required ones 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/2bfdbf41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/2bfdbf41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/2bfdbf41 Branch: refs/heads/develop Commit: 2bfdbf41715ec3c2bb1e69b085c008339737e473 Parents: 3c6b184 Author: Christofer Dutz Authored: Wed Oct 4 10:29:35 2017 +0200 Committer: Christofer Dutz Committed: Wed Oct 4 10:29:35 2017 +0200 -- pom.xml | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/2bfdbf41/pom.xml -- diff --git a/pom.xml b/pom.xml index 794cc89..b3d1061 100644 --- a/pom.xml +++ b/pom.xml @@ -326,7 +326,6 @@ - org.apache:apache-jar-resource-bundle:1.4 org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT
[30/50] incubator-edgent-samples git commit: source bundle README updates
source bundle README updates 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/97aa739d Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/97aa739d Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/97aa739d Branch: refs/heads/develop Commit: 97aa739d9f5e625409cd14f77bf02cc16a3b90f8 Parents: c7df9e4 Author: Dale LaBossiere Authored: Mon Oct 9 19:11:53 2017 -0400 Committer: Dale LaBossiere Committed: Mon Oct 9 19:11:53 2017 -0400 -- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/97aa739d/README.md -- diff --git a/README.md b/README.md index 271feef..b78b6e2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,8 @@ # Quickstart -You must have Java 8 installed on your system. +You must have Java 8 installed on your system. Maven will be automatically +downloaded installed by the maven wrapper `mvnw`. Build the samples for Java 8 ```sh
[35/50] incubator-edgent-samples git commit: more samples build tweaking
more samples build tweaking
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/d70a1815
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d70a1815
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d70a1815
Branch: refs/heads/develop
Commit: d70a1815c312f152f97cca2dce800e489ad078c1
Parents: ab768c4
Author: Dale LaBossiere
Authored: Wed Oct 11 16:02:54 2017 -0400
Committer: Dale LaBossiere
Committed: Wed Oct 11 16:02:54 2017 -0400
--
buildtools/update-platform-poms.sh | 1 +
pom.xml| 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d70a1815/buildtools/update-platform-poms.sh
--
diff --git a/buildtools/update-platform-poms.sh
b/buildtools/update-platform-poms.sh
index 07cbc53..56cf1bb 100755
--- a/buildtools/update-platform-poms.sh
+++ b/buildtools/update-platform-poms.sh
@@ -10,6 +10,7 @@ PLATFORMS=java7
for p in ${PLATFORMS}; do
for proj in ${J8_PROJECTS}; do
+echo Updating platforms/${p}/${proj}/pom.xml...
if [ ! -d platforms/${p}/${proj} ]; then
mkdir -p platforms/${p}/${proj}
fi
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d70a1815/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d63493a..8bb8727 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,8 @@
(Java 8)
org.apache.edgent
-1.2.0-SNAPSHOT
+
+${project.version}
1.8
UTF-8
[28/50] incubator-edgent-samples git commit: more distribution & samples doc tweaks
more distribution & samples doc tweaks 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/a11725cd Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/a11725cd Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/a11725cd Branch: refs/heads/develop Commit: a11725cdf0da92dcc07e605a2df334923bc6eb92 Parents: afe46c3 Author: Dale LaBossiere Authored: Mon Oct 9 13:11:28 2017 -0400 Committer: Dale LaBossiere Committed: Mon Oct 9 13:11:28 2017 -0400 -- LICENSE| 201 template/README.md | 2 +- 2 files changed, 202 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/a11725cd/LICENSE -- diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..8dada3e --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to repro
[25/50] incubator-edgent-samples git commit: fix NOTICE initial copyright dates
fix NOTICE initial copyright dates - fix initial copyright date in NOTICE files - and add 'non-IBM' NOTICE files to achieve the above 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/3a5355dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/3a5355dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/3a5355dd Branch: refs/heads/develop Commit: 3a5355dd3b54223d494c03a3003d85be79f7a1f3 Parents: 2bfdbf4 Author: Dale LaBossiere Authored: Wed Oct 4 11:24:14 2017 -0400 Committer: Dale LaBossiere Committed: Wed Oct 4 11:24:14 2017 -0400 -- apps/src/main/resources/META-INF/NOTICE | 2 +- connectors/src/main/resources/META-INF/NOTICE | 2 +- console/src/main/resources/META-INF/NOTICE| 2 +- scenarios/src/main/resources/META-INF/NOTICE | 6 ++ topology/src/main/resources/META-INF/NOTICE | 2 +- utils/src/main/resources/META-INF/NOTICE | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3a5355dd/apps/src/main/resources/META-INF/NOTICE -- diff --git a/apps/src/main/resources/META-INF/NOTICE b/apps/src/main/resources/META-INF/NOTICE index 42d63a2..4b208a9 100644 --- a/apps/src/main/resources/META-INF/NOTICE +++ b/apps/src/main/resources/META-INF/NOTICE @@ -1,6 +1,6 @@ Apache Edgent: Samples: Apps -Copyright 2017 The Apache Software Foundation +Copyright 2016-2017 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3a5355dd/connectors/src/main/resources/META-INF/NOTICE -- diff --git a/connectors/src/main/resources/META-INF/NOTICE b/connectors/src/main/resources/META-INF/NOTICE index dc8d2dd..cce431c 100644 --- a/connectors/src/main/resources/META-INF/NOTICE +++ b/connectors/src/main/resources/META-INF/NOTICE @@ -1,6 +1,6 @@ Apache Edgent: Samples: Connectors -Copyright 2017 The Apache Software Foundation +Copyright 2016-2017 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3a5355dd/console/src/main/resources/META-INF/NOTICE -- diff --git a/console/src/main/resources/META-INF/NOTICE b/console/src/main/resources/META-INF/NOTICE index 8fa37cf..0b5f6e3 100644 --- a/console/src/main/resources/META-INF/NOTICE +++ b/console/src/main/resources/META-INF/NOTICE @@ -1,6 +1,6 @@ Apache Edgent: Samples: Console -Copyright 2017 The Apache Software Foundation +Copyright 2016-2017 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3a5355dd/scenarios/src/main/resources/META-INF/NOTICE -- diff --git a/scenarios/src/main/resources/META-INF/NOTICE b/scenarios/src/main/resources/META-INF/NOTICE new file mode 100644 index 000..2f9c926 --- /dev/null +++ b/scenarios/src/main/resources/META-INF/NOTICE @@ -0,0 +1,6 @@ + +Apache Edgent: Samples: Scenarios +Copyright 2016-2017 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3a5355dd/topology/src/main/resources/META-INF/NOTICE -- diff --git a/topology/src/main/resources/META-INF/NOTICE b/topology/src/main/resources/META-INF/NOTICE index 8933656..e02f844 100644 --- a/topology/src/main/resources/META-INF/NOTICE +++ b/topology/src/main/resources/META-INF/NOTICE @@ -1,6 +1,6 @@ Apache Edgent: Samples: Topology -Copyright 2017 The Apache Software Foundation +Copyright 2016-2017 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/3a5355dd/utils/src/main/resources/META-INF/NOTICE -- diff --git a/utils/src/main/resources/META-INF/NOTICE b/utils/src/main/resources/META-INF/NOTICE index 0b428dc..a581fd5 100644 --- a/utils/src/main/resources/META-INF/NOTICE +++ b/utils/src/main/resources/META-INF/NOTICE @@ -1,6 +1,6 @@ Apac
[11/50] incubator-edgent-samples git commit: Add sample list to samples/R.md, couple of other doc cleanup
Add sample list to samples/R.md, couple of other doc cleanup 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/e7e0b322 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/e7e0b322 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/e7e0b322 Branch: refs/heads/develop Commit: e7e0b3226d8d05ef566ac21c12a6bdd0d9cc14d6 Parents: 4456eb2 Author: Dale LaBossiere Authored: Mon Sep 18 11:38:34 2017 -0400 Committer: Dale LaBossiere Committed: Mon Sep 18 11:38:34 2017 -0400 -- README.md | 49 + 1 file changed, 49 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e7e0b322/README.md -- diff --git a/README.md b/README.md index ceea313..48f5f15 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ are automatically downloaded to the local maven repository and used. If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider plugin + 1. From the *File* menu, select *Import...* 2. From the *Git* folder, select *Projects from Git* and click *Next* 3. Select *Clone URI* to clone the remote repository. Click *Next*. @@ -62,6 +63,7 @@ If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider Once you have cloned the Git repository to your machine or are working from an unpacked samples source release bundle, import the Maven projects into your workspace + 1. From the *File* menu, select *Import...* 2. From the *Maven* folder, select *Existing Maven Projects* and click *Next* + browse to the `samples` directory in the clone or source release directory and select it. A hierarchy of samples projects / pom.xml files will be listed and all selected. @@ -74,5 +76,52 @@ Note: Specifics may change depending on your version of Eclipse or the Eclipse M Once the samples projects have been imported you can run them as any Eclipse application. E.g., + 1. open the `HelloEdgent.java` sample 2. click on *Run*, *Run As*, then *Java application*. `HelloEdgent` runs and prints to the Console view. + +#Samples Summary + + +HelloEdgent Basic mechanics of declaring a topology and executing + it. Prints Hello Edgent! to standard output. + +PeriodicSource Create a stream by polling a random number generator + for a new value every second and then prints out the + raw tuple value and a filtered and transformed stream. + +SensorAggregates Demonstrates partitioned window aggregation and + filtering of simulated sensors that are bursty in + nature, so that only intermittently is the data output + to standard output. + +File Use the File stream connector to write a stream of + tuples to files. Also watch a directory for new files + and create a stream of tuples from the file contents. + +Iotp Use the IBM Watson IoT Platform connector to send + simulated sensor readings to an IBM Watson IoT Platform + instance as device events. Receive device commands. + +JDBC Use the JDBC stream connector to write a stream of + tuples to an Apache Derby database table. Create a + stream of tuples by reading a table. + +KafkaUse the Kafka stream connector to publish a stream of + tuples to a Kafka topic. Create a stream of tuples by + subscribing to a topic and receiving messages from it. + +MQTT Use the MQTT stream connector to publish a stream of + tuples to a MQTT topic. Create a stream of tuples by + subscribing to a topic and receiving messages from it. + +SensorAnalytics Demonstrates a more complex sample that includes + configuration control, a device of one or more sensors + and some typical analytics, use of MQTT for publishing + results and receiving commands, local results logging, + conditional stream tracing. + + +Other samples are provided but have not yet been fully documented. +Feel free to explore. +
[22/50] incubator-edgent-samples git commit: add DISCLAIMER to samples source bundle
add DISCLAIMER to samples source bundle 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/d0dea843 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d0dea843 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d0dea843 Branch: refs/heads/develop Commit: d0dea8437d17cacec5bbd2e73fc5276f60df461d Parents: 67d8fdf Author: Dale LaBossiere Authored: Mon Oct 2 13:55:00 2017 -0400 Committer: Dale LaBossiere Committed: Mon Oct 2 13:55:00 2017 -0400 -- pom.xml | 22 ++ 1 file changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d0dea843/pom.xml -- diff --git a/pom.xml b/pom.xml index f5032e3..794cc89 100644 --- a/pom.xml +++ b/pom.xml @@ -312,6 +312,28 @@ + + + +org.apache.maven.plugins +maven-remote-resources-plugin +1.5 + + +process-resource-bundles + + process + + + + org.apache:apache-jar-resource-bundle:1.4 + + org.apache.apache.resources:apache-incubator-disclaimer-resource-bundle:1.2-SNAPSHOT + + + + + org.apache.maven.plugins
[15/50] incubator-edgent-samples git commit: Adjust javadoc overview.html for getting started and samples
Adjust javadoc overview.html for getting started and samples 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/d6d72853 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/d6d72853 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/d6d72853 Branch: refs/heads/develop Commit: d6d728539f39beedd7cac49989f53badef942ba0 Parents: 150c308 Author: Dale LaBossiere Authored: Tue Sep 26 15:12:20 2017 -0400 Committer: Dale LaBossiere Committed: Tue Sep 26 15:12:20 2017 -0400 -- README.md | 59 +++--- 1 file changed, 48 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/d6d72853/README.md -- diff --git a/README.md b/README.md index 2589e01..84c392a 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,37 @@ information on Edgent Application Development, Packaging and Execution. Additional information may also be found in Getting Started https://edgent.apache.org/docs/edgent-getting-started +# Setup + +Once you have downloaded and unpacked the samples source bundle +or cloned the the samples repository you need to download +these additional development software tools. + +* Java 8 - The development setup assumes Java 8 +* Maven - *(optional) (https://maven.apache.org/)* + +Maven is used as build tool. Currently there are two options: + +1. Using the maven-wrapper (the `mvnw` or `mvnw.bat` command - preferred) +2. Using an installed version of Maven (the `mvn` command) + +The maven-wrapper will automatically download and install the +correct Maven version and use that. Besides this, there is no +difference between using the `mvn` and `mvnw` command. + +You may also use a maven-integrated IDE with the samples. +e.g., see the _Using Eclipse_ section below. + +The samples use Edgent SDK jars that have been released +in a maven repository such as Maven Central. + +Alternatively, you can download the Edgent SDK sources and build them, +populating your local maven repository. The samples +will then use those Edgent SDK jars. Adjust the `edgent.version` +property in the top level samples `pom.xml` accordingly. +See [downloads](https://edgent.apache.org/docs/downloads) +for downloading the Edgent SDK sources. + # Building the Edgent samples By default Java8 class files are generated. @@ -29,7 +60,9 @@ profile is specified. Currently, building and running the samples for the Android platform is not supported. Many samples use the `DevelopmentProvider` and -the `DevelopmentProvider` is not supported on the Android platform. +the `DevelopmentProvider` is not supported on the Android platform. + +Build the samples ```sh ./mvnw clean package # -Pplatform-java7 as needed ``` @@ -47,14 +80,14 @@ See the README.md in each sample category directory. The Edgent Git repository, or samples source release bundle, contains Maven project definitions for the samples. -Once you import the Maven projects into your workspace, -builds and JUnit testing of Edgent in Eclipse use the -same artifacts as the Maven command line tooling. Like -the command line tooling, the jars for dependent projects +Once you import the Maven projects into your workspace, builds +in Eclipse use the same artifacts as the Maven command line tooling. +Like the command line tooling, the jars for dependent projects are automatically downloaded to the local maven repository and used. -If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider plugin +If you want to use Eclipse to clone your fork, use the +Eclipse Git Team Provider plugin 1. From the *File* menu, select *Import...* 2. From the *Git* folder, select *Projects from Git* and click *Next* @@ -65,7 +98,9 @@ If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider 4. In the *Select a wizard to use for importing projects* window, click *Cancel*. Then follow the steps below to import the Maven projects. -Once you have cloned the Git repository to your machine or are working from an unpacked samples source release bundle, import the Maven projects into your workspace +Once you have cloned the Git repository to your machine or are working +from an unpacked samples source release bundle, import the Maven projects +into your workspace 1. From the *File* menu, select *Import...* 2. From the *Maven* folder, select *Existing Maven Projects* and click *Next* @@ -73,12 +108,14 @@ Once you have cloned the Git repository to your machine or are working from an u + Verify the *Add project(s) to working set* checkbox is checked + Click *Finish*. Eclipse starts the
[08/50] incubator-edgent-samples git commit: more D.md and README cleanup
more D.md and README cleanup 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/eeaa2bd0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/eeaa2bd0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/eeaa2bd0 Branch: refs/heads/develop Commit: eeaa2bd0d685d1701eec1ecbd88d89f79cd77dd8 Parents: 28a5305 Author: Dale LaBossiere Authored: Tue Sep 12 12:30:01 2017 -0400 Committer: Dale LaBossiere Committed: Tue Sep 12 12:30:01 2017 -0400 -- README.md | 45 +++-- 1 file changed, 43 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/eeaa2bd0/README.md -- diff --git a/README.md b/README.md index cda4749..ceea313 100644 --- a/README.md +++ b/README.md @@ -18,14 +18,17 @@ See [APPLICATION_DEVELOPMENT.md](APPLICATION_DEVELOPMENT.md) for general information on Edgent Application Development, Packaging and Execution. +Additional information may also be found in +Getting Started https://edgent.apache.org/docs/edgent-getting-started + #Building the Edgent samples -By default java8 class files are generated. +By default Java8 class files are generated. Java7 and Android platform class files are produced when the appropriate profile is specified. ```sh -./mvnw clean package # -Pplatform-java7 or -Pplatform-android as needed +./mvnw clean package # -Pplatform-java7,platform-android as needed ``` A standard jar and uber jar is created for each sample category @@ -35,3 +38,41 @@ in the sample category's target directory: `/target`. ##Running the samples See the README.md in each sample category directory. + +#Using Eclipse + +The Edgent Git repository, or samples source release bundle, contains +Maven project definitions for the samples. + +Once you import the Maven projects into your workspace, +builds and JUnit testing of Edgent in Eclipse use the +same artifacts as the Maven command line tooling. Like +the command line tooling, the jars for dependent projects +are automatically downloaded to the local maven repository +and used. + +If you want to use Eclipse to clone your fork, use the Eclipse Git Team Provider plugin +1. From the *File* menu, select *Import...* +2. From the *Git* folder, select *Projects from Git* and click *Next* +3. Select *Clone URI* to clone the remote repository. Click *Next*. ++ In the *Location* section, enter the URI of your fork in the *URI* field (e.g., `g...@github.com:/incubator-edgent.git`). The other fields will be populated automatically. Click *Next*. If required, enter your passphrase. ++ In the *Source Git Repository* window, select the branch (usually `master`) and click *Next* ++ Specify the directory where your local clone will be stored and click *Next*. The repository will be cloned. Note: You can build and run tests using Maven in this directory. +4. In the *Select a wizard to use for importing projects* window, click *Cancel*. Then follow the steps below to import the Maven projects. + + +Once you have cloned the Git repository to your machine or are working from an unpacked samples source release bundle, import the Maven projects into your workspace +1. From the *File* menu, select *Import...* +2. From the *Maven* folder, select *Existing Maven Projects* and click *Next* + + browse to the `samples` directory in the clone or source release directory and select it. A hierarchy of samples projects / pom.xml files will be listed and all selected. + + Verify the *Add project(s) to working set* checkbox is checked + + Click *Finish*. Eclipse starts the import process and builds the workspace. + +Top-level artifacts such as `README.md` are available under the `edgent-samples` project. + +Note: Specifics may change depending on your version of Eclipse or the Eclipse Maven or Git Team Provider. + +Once the samples projects have been imported you can run them as any Eclipse application. +E.g., +1. open the `HelloEdgent.java` sample +2. click on *Run*, *Run As*, then *Java application*. `HelloEdgent` runs and prints to the Console view.
[37/50] incubator-edgent-samples git commit: rework get-edgent-jars.sh, add get-edgent-jars-project
rework get-edgent-jars.sh, add get-edgent-jars-project The new approach uses the same maven "distribution" mechanism that as the source release's "mvn package -Pdistribution". The commonality of the generated bundles is goodness and the included DEPENDENCIES (licensing doc) file is valuable for users. At this time the original script is retained as old-get-edgent-jars.sh. Updated relevant doc. 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/fdc2723c Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/fdc2723c Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/fdc2723c Branch: refs/heads/develop Commit: fdc2723cfc27896c69b5fc6ec1fe1c1eca0a1b1c Parents: e1812af Author: Dale LaBossiere Authored: Tue Oct 17 13:59:03 2017 -0400 Committer: Dale LaBossiere Committed: Tue Oct 17 13:59:03 2017 -0400 -- .gitignore | 3 - APPLICATION_DEVELOPMENT.md | 59 + get-edgent-jars-project/.gitignore | 6 + get-edgent-jars-project/README.md | 54 get-edgent-jars-project/get-edgent-jars.sh | 226 + get-edgent-jars-project/old-get-edgent-jars.sh | 254 +++ get-edgent-jars-project/pom.xml.template| 148 +++ .../src/assembly/distribution.xml | 81 ++ .../src/main/resources/README | 12 + get-edgent-jars.sh | 254 --- template/README.md | 7 + 11 files changed, 797 insertions(+), 307 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/.gitignore -- diff --git a/.gitignore b/.gitignore index ea30b70..128a2d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ -# get-edgent-jars generated outout -get-edgent-jars-project - *.class # Local developers toolchain http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/fdc2723c/APPLICATION_DEVELOPMENT.md -- diff --git a/APPLICATION_DEVELOPMENT.md b/APPLICATION_DEVELOPMENT.md index 44e3230..3166931 100644 --- a/APPLICATION_DEVELOPMENT.md +++ b/APPLICATION_DEVELOPMENT.md @@ -17,8 +17,6 @@ # Edgent Application Development, Packaging and Execution. -This file is a work-in-progress. - To develop Edgent applications you will utilize the Edgent SDK/runtime jars and package your application artifacts for deploying to an edge device for execution. @@ -78,9 +76,8 @@ that users can use to create an application project template. If you can't or don't want to use maven-repository-enabled tooling you will need to get a local copy of the Edgent jars and their -dependencies and add them to your compile classpath. -The Edgent supplied `get-edgent-jars.sh` tool can be used to -get copies of the jars from a maven repository. +dependencies and add them to your compile classpath. This case +is covered in the following sections. ## Packaging and Execution @@ -109,7 +106,8 @@ The uber jar contains the application's classes and the application's dependent Edgent classes and their transitive dependencies. -The Edgent samples poms contain configuration information +The Edgent samples template project's pom and +the Edgent samples poms contain configuration information that generates an uber jar in addition to the standard application jar. Eclipse can also export an uber jar. @@ -142,46 +140,8 @@ binary bundle containing all of the Edgent jars and their dependencies. The binary artifacts are only released to maven central. -The Edgent supplied get-edgent-jars.sh tool supports this mode. - -## get-edgent-jars.sh - -The `get-edgent-jars.sh` script copies the Edgent runtime jars and their -dependencies from a local or remote maven repository into a local folder. - -The user may then directly use the jars in CLASSPATH specifications -for Edgent application compilation or execution. -A `classpath.sh` script is generated to assist with this. - -By default the script retrieves the Edgent java8 platform jars for the -script's default Edgent version. - -The script creates and builds a small maven project as -part of its execution. - -``` sh -get-edgent-jars.sh --version 1.2.0-SNAPSHOT # retrieve the Edgent 1.2.0-SNAPSHOT java8 jars -This command downloads the Apache Edgent jars and their transitive external dependencies. -The external dependencies have their own licensing term that you should review. -A summary of the external dependencies can be found here . -Continue? [y/n] y -# Generating maven project get-edgent-jars-p
[31/50] incubator-edgent-samples git commit: add commented out edgent-android deps to sample template
add commented out edgent-android deps to sample template
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/bba42c21
Tree:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/tree/bba42c21
Diff:
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/diff/bba42c21
Branch: refs/heads/develop
Commit: bba42c21c1538fc63df09c2f3d76660b0e09577a
Parents: 97aa739
Author: Dale LaBossiere
Authored: Tue Oct 10 11:23:00 2017 -0400
Committer: Dale LaBossiere
Committed: Tue Oct 10 11:23:00 2017 -0400
--
template/pom.xml | 13 +
1 file changed, 13 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/bba42c21/template/pom.xml
--
diff --git a/template/pom.xml b/template/pom.xml
index f225640..5d67cd2 100644
--- a/template/pom.xml
+++ b/template/pom.xml
@@ -84,6 +84,19 @@
${edgent.version}
+
+
+
+
[3/3] incubator-edgent git commit: - Reverted the version back to 1.2.0-SNAPSHOT
- Reverted the version back to 1.2.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/34b21c96 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/34b21c96 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/34b21c96 Branch: refs/heads/feature/pre-release-finetuning Commit: 34b21c96a7aeb8a08185245cebe3b100bc506fd0 Parents: 6c7ccd3 Author: Christofer Dutz Authored: Tue Nov 21 14:31:59 2017 +0100 Committer: Christofer Dutz Committed: Tue Nov 21 14:31:59 2017 +0100 -- analytics/math3/pom.xml | 10 ++--- analytics/pom.xml | 2 +- analytics/sensors/pom.xml | 10 ++--- api/execution/pom.xml | 4 +- api/function/pom.xml| 2 +- api/graph/pom.xml | 4 +- api/oplet/pom.xml | 8 ++-- api/pom.xml | 2 +- api/topology/pom.xml| 10 ++--- api/window/pom.xml | 4 +- apps/iot/pom.xml| 10 ++--- apps/pom.xml| 2 +- apps/runtime/pom.xml| 10 ++--- connectors/command/pom.xml | 14 +++--- connectors/common/pom.xml | 10 ++--- connectors/csv/pom.xml | 8 ++-- connectors/file/pom.xml | 16 +++ connectors/http/pom.xml | 8 ++-- connectors/iot/pom.xml | 6 +-- connectors/iotp/pom.xml | 8 ++-- connectors/jdbc/pom.xml | 14 +++--- connectors/kafka/pom.xml| 12 ++--- connectors/mqtt/pom.xml | 16 +++ connectors/pom.xml | 2 +- connectors/pubsub/pom.xml | 6 +-- connectors/serial/pom.xml | 4 +- connectors/websocket-base/pom.xml | 4 +- connectors/websocket-jetty/pom.xml | 4 +- connectors/websocket-misc/pom.xml | 2 +- connectors/websocket-server/pom.xml | 4 +- connectors/websocket/pom.xml| 18 console/pom.xml | 2 +- console/server/pom.xml | 4 +- console/servlets/pom.xml| 4 +- distribution/pom.xml| 46 ++-- platforms/android/analytics/math3/pom.xml | 4 +- platforms/android/analytics/pom.xml | 2 +- platforms/android/analytics/sensors/pom.xml | 4 +- platforms/android/android/hardware/pom.xml | 4 +- platforms/android/android/pom.xml | 2 +- platforms/android/android/topology/pom.xml | 6 +-- platforms/android/api/execution/pom.xml | 4 +- platforms/android/api/function/pom.xml | 2 +- platforms/android/api/graph/pom.xml | 4 +- platforms/android/api/oplet/pom.xml | 8 ++-- platforms/android/api/pom.xml | 2 +- platforms/android/api/topology/pom.xml | 10 ++--- platforms/android/api/window/pom.xml| 4 +- platforms/android/apps/iot/pom.xml | 8 ++-- platforms/android/apps/pom.xml | 2 +- platforms/android/apps/runtime/pom.xml | 6 +-- platforms/android/connectors/command/pom.xml| 6 +-- platforms/android/connectors/common/pom.xml | 4 +- platforms/android/connectors/csv/pom.xml| 2 +- platforms/android/connectors/file/pom.xml | 8 ++-- platforms/android/connectors/http/pom.xml | 4 +- platforms/android/connectors/iot/pom.xml| 6 +-- platforms/android/connectors/iotp/pom.xml | 8 ++-- platforms/android/connectors/jdbc/pom.xml | 6 +-- platforms/android/connectors/kafka/pom.xml | 4 +- platforms/android/connectors/mqtt/pom.xml | 8 ++-- platforms/android/connectors/pom.xml| 2 +- platforms/android/connectors/pubsub/pom.xml | 4 +- platforms/android/connectors/serial/pom.xml | 4 +- .../android/connectors/websocket-base/pom.xml | 4 +- .../android/connectors/websocket-jetty/pom.xml | 4 +- .../android/connectors/websocket-misc/pom.xml | 2 +- .../android/connectors/websocket-server/pom.xml | 4 +- platforms/android/connectors/websocket/pom.xml | 8 ++-- platforms/android/distribution/pom.xml | 46 ++-- platforms/android/pom.xml | 2 +- platforms/android/providers/direct/pom.xml | 14 +++--- platforms/android/providers/iot/pom.xml | 16 +++ platforms/android/providers/pom.xml
[2/3] incubator-edgent git commit: - Reverted the version back to 1.2.0-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/android/connectors/websocket-misc/pom.xml -- diff --git a/platforms/android/connectors/websocket-misc/pom.xml b/platforms/android/connectors/websocket-misc/pom.xml index 188956f..203efd8 100644 --- a/platforms/android/connectors/websocket-misc/pom.xml +++ b/platforms/android/connectors/websocket-misc/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.android edgent-connectors -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-connectors-websocket-misc http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/android/connectors/websocket-server/pom.xml -- diff --git a/platforms/android/connectors/websocket-server/pom.xml b/platforms/android/connectors/websocket-server/pom.xml index e32ee20..17d2f15 100644 --- a/platforms/android/connectors/websocket-server/pom.xml +++ b/platforms/android/connectors/websocket-server/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.android edgent-connectors -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-connectors-websocket-server @@ -68,7 +68,7 @@ org.apache.edgent.android edgent-connectors-websocket-jetty - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.eclipse.jetty.websocket http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/android/connectors/websocket/pom.xml -- diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml index 01a23a4..1555304 100644 --- a/platforms/android/connectors/websocket/pom.xml +++ b/platforms/android/connectors/websocket/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.android edgent-connectors -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-connectors-websocket @@ -68,17 +68,17 @@ org.apache.edgent.android edgent-connectors-common - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-websocket-misc - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-websocket-base - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT javax.websocket http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/android/distribution/pom.xml -- diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml index 422566e..4157744 100644 --- a/platforms/android/distribution/pom.xml +++ b/platforms/android/distribution/pom.xml @@ -25,7 +25,7 @@ org.apache.edgent.android edgent-platforms-android -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-distribution @@ -85,120 +85,120 @@ org.apache.edgent.android edgent-providers-direct - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-providers-iot - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-android-hardware - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-android-topology - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-analytics-math3 - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-analytics-sensors - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-utils-metrics - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-utils-streamscope - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-command - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-common - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-csv - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-file - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-http - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-iot - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-iotp - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.android edgent-connectors-jdbc - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.andro
[1/3] incubator-edgent git commit: - Reverted the version back to 1.2.0-SNAPSHOT
Repository: incubator-edgent Updated Branches: refs/heads/feature/pre-release-finetuning 6c7ccd3da -> 34b21c96a http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/java7/runtime/jmxcontrol/pom.xml -- diff --git a/platforms/java7/runtime/jmxcontrol/pom.xml b/platforms/java7/runtime/jmxcontrol/pom.xml index acf4287..eabf917 100644 --- a/platforms/java7/runtime/jmxcontrol/pom.xml +++ b/platforms/java7/runtime/jmxcontrol/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.java7 edgent-runtime -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-runtime-jmxcontrol @@ -87,12 +87,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.java7 edgent-api-function - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/java7/runtime/jobregistry/pom.xml -- diff --git a/platforms/java7/runtime/jobregistry/pom.xml b/platforms/java7/runtime/jobregistry/pom.xml index c3be453..91ba528 100644 --- a/platforms/java7/runtime/jobregistry/pom.xml +++ b/platforms/java7/runtime/jobregistry/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.java7 edgent-runtime -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-runtime-jobregistry @@ -83,12 +83,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.java7 edgent-api-topology - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/java7/runtime/jsoncontrol/pom.xml -- diff --git a/platforms/java7/runtime/jsoncontrol/pom.xml b/platforms/java7/runtime/jsoncontrol/pom.xml index 602b0af..f279c79 100644 --- a/platforms/java7/runtime/jsoncontrol/pom.xml +++ b/platforms/java7/runtime/jsoncontrol/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.java7 edgent-runtime -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-runtime-jsoncontrol @@ -87,12 +87,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.java7 edgent-api-function - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/java7/runtime/pom.xml -- diff --git a/platforms/java7/runtime/pom.xml b/platforms/java7/runtime/pom.xml index fafe398..8ccb626 100644 --- a/platforms/java7/runtime/pom.xml +++ b/platforms/java7/runtime/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.java7 edgent-platforms-java7 -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-runtime http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/java7/spi/graph/pom.xml -- diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml index e707d14..16e83ef 100644 --- a/platforms/java7/spi/graph/pom.xml +++ b/platforms/java7/spi/graph/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.java7 edgent-spi -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-spi-graph @@ -87,12 +87,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT org.apache.edgent.java7 edgent-api-graph - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/java7/spi/pom.xml -- diff --git a/platforms/java7/spi/pom.xml b/platforms/java7/spi/pom.xml index 4f8b265..e1f569f 100644 --- a/platforms/java7/spi/pom.xml +++ b/platforms/java7/spi/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.java7 edgent-platforms-java7 -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-spi http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/34b21c96/platforms/java7/spi/topology/pom.xml -- diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml index fc1efdd..889da9a 100644 --- a/platforms/java7/spi/topology/pom.xml +++ b/platforms/java7/spi/topology/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.java7 edgent-spi -1.3.0-SNAPSHOT +1.2.0-SNAPSHOT edgent-spi-topology @@ -87,7 +87,7 @@ org.apache.edgent.java7 edgent-api-topology - 1.3.0-SNAPSHOT + 1.2.0-SNAPSHOT http://git-wip-us.apache.org/
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
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
Authored: Thu Nov 23 09:26:12 2017 +0100
Committer: Christofer Dutz
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 @@
${edgent.runtime.groupId}
edgent-analytics-sensors
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-file
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-analytics-math3
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-iot
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-iotp
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-mqtt
- ${edgent.runtime.version}
- ${project.groupId}
+ org.apache.edgent
edgent-samples-utils
- ${project.version}
+ 1.2.0-SNAPSHOT
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 @@
${edgent.runtime.groupId}
edgent-connectors-mqtt
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-kafka
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-jdbc
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-serial
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-file
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-connectors-iotp
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-analytics-math3
- ${edgent.runtime.version}
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 @@
${edgent.runtime.groupId}
edgent-console-server
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-utils-metrics
- ${edgent.runtime.version}
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 @@
${edgent.runtime.groupId}
edgent-providers-direct
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-providers-development
- ${edgent.runtime.version}
${edgent.runtime.groupId}
edgent-providers-iot
- ${edgent.runtime.version}
+
+
+
+${edgent.runtime.groupId}
+edgent-providers-direct
+${edgent.runtime.version}
+
+
+${edgent.runtime.groupId}
+edgent-providers-development
+${edgent.runtime.version}
+
+
+${edgent.runtime.groupId}
+edgent-providers-iot
+${edgent.runtime.version}
+
+
[5/6] incubator-edgent git commit: fix url to APPLICATION_DEVELOPMENT.md in samples repo
fix url to APPLICATION_DEVELOPMENT.md in samples repo Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/c761283a Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/c761283a Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/c761283a Branch: refs/heads/feature/pre-release-finetuning Commit: c761283a68a55e42d76a5f8ac49a013e4db95727 Parents: 4217008 Author: Dale LaBossiere Authored: Tue Nov 21 18:23:43 2017 -0500 Committer: Dale LaBossiere Committed: Tue Nov 21 18:23:43 2017 -0500 -- DEVELOPMENT.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/c761283a/DEVELOPMENT.md -- diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 671c81c..d57cdc1 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -142,7 +142,7 @@ For a not quite two hour introduction into Maven please feel free to watch this ## Building Edgent For Using Edgent __Note:__ Apache Edgent releases include convenience binaries. Use of them -is covered in [samples/APPLICATION_DEVELOPMENT.md](https://github.com/apache/incubator-edgent-samples/APPLICATION_DEVELOPMENT.md). +is covered in [samples/APPLICATION_DEVELOPMENT.md](https://github.com/apache/incubator-edgent-samples/blob/develop/APPLICATION_DEVELOPMENT.md). If instead you want to build Edgent for your use there are two different use-cases: @@ -171,7 +171,7 @@ $ ./mvnw clean install -Djava8.home=$JAVA_HOME -Ptoolchain,platform-java7,platfo ### Building Edgent for NOT using it with Maven Build Edgent as described above to populate the local maven repository. -Then see [samples/APPLICATION_DEVELOPMENT.md](https://github.com/apache/incubator-edgent-samples/APPLICATION_DEVELOPMENT.md) +Then see [samples/APPLICATION_DEVELOPMENT.md](https://github.com/apache/incubator-edgent-samples/blob/develop/APPLICATION_DEVELOPMENT.md) for information about the `get-edgent-jars.sh` script. An alternative to using the `get-edgent-jars.sh` script is to
[2/6] incubator-edgent git commit: add header to new module, update RELEASE_NOTES
add header to new module, update RELEASE_NOTES Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/cc1864b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/cc1864b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/cc1864b5 Branch: refs/heads/feature/pre-release-finetuning Commit: cc1864b57b54c88a80b1eb2889c7cbbb94f6dd26 Parents: 718ff63 Author: Dale LaBossiere Authored: Mon Nov 20 17:38:19 2017 -0500 Committer: Dale LaBossiere Committed: Mon Nov 20 17:38:19 2017 -0500 -- RELEASE_NOTES | 1 + .../WebSocketClientConnectTestHelper.java | 18 ++ 2 files changed, 19 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/cc1864b5/RELEASE_NOTES -- diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 7da5c39..fc2bbd8 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -71,6 +71,7 @@ EDGENT-423 Range.toStringUnsigned() not supported on Java7/Android Miscellaneous changes - +EDGENT-438 Improve WebSocketClientTest skip-if-cant-connect EDGENT-436 Change tests that use complete() TMO for successful runs EDGENT-435 CME in TrackingScheduledExecutor seen with testMultiTopologyPollWithError() EDGENT-434 Desensitize PlumbingTest.testParallelBalanced http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/cc1864b5/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java -- diff --git a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java index f6ffc12..aaf3b57 100644 --- a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java +++ b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java @@ -1,3 +1,21 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ package org.apache.edgent.test.connectors.wsclient.javax.websocket; import java.net.URI;
[4/6] incubator-edgent git commit: update doc for samples repo
update doc for samples repo Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/42170089 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/42170089 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/42170089 Branch: refs/heads/feature/pre-release-finetuning Commit: 421700896b8b4c4a95e74f1047c617ffc006d59e Parents: 62384dd Author: Dale LaBossiere Authored: Tue Nov 21 18:18:35 2017 -0500 Committer: Dale LaBossiere Committed: Tue Nov 21 18:18:35 2017 -0500 -- DEVELOPMENT.md | 7 --- README | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/42170089/DEVELOPMENT.md -- diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 5f1c8c8..671c81c 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -142,7 +142,7 @@ For a not quite two hour introduction into Maven please feel free to watch this ## Building Edgent For Using Edgent __Note:__ Apache Edgent releases include convenience binaries. Use of them -is covered in [samples/APPLICATION_DEVELOPMENT.md](samples/APPLICATION_DEVELOPMENT.md). +is covered in [samples/APPLICATION_DEVELOPMENT.md](https://github.com/apache/incubator-edgent-samples/APPLICATION_DEVELOPMENT.md). If instead you want to build Edgent for your use there are two different use-cases: @@ -171,7 +171,7 @@ $ ./mvnw clean install -Djava8.home=$JAVA_HOME -Ptoolchain,platform-java7,platfo ### Building Edgent for NOT using it with Maven Build Edgent as described above to populate the local maven repository. -Then see [samples/APPLICATION_DEVELOPMENT.md](samples/APPLICATION_DEVELOPMENT.md) +Then see [samples/APPLICATION_DEVELOPMENT.md](https://github.com/apache/incubator-edgent-samples/APPLICATION_DEVELOPMENT.md) for information about the `get-edgent-jars.sh` script. An alternative to using the `get-edgent-jars.sh` script is to @@ -484,10 +484,11 @@ such as an MQTT broker, Apache Kafka, a cloud based IoT service, etc. * `analytics` - Analytics for use by Edgent applications. * `utils` - Optional utilities for Edgent applications. * `console` - Development console that allows visualization of the streams within an Edgent application during development. -* `samples` - Sample applications, from Hello World to some sensor simulation applications. * `android` - Code specific to Android. * `test` - SVT +Samples are located at https://github.com/apache/incubator-edgent-samples + ## Coding Conventions Placeholder: see [EDGENT-23](https://issues.apache.org/jira/browse/EDGENT-23) http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/42170089/README -- diff --git a/README b/README index ce57c19..40d08ad 100644 --- a/README +++ b/README @@ -12,7 +12,8 @@ Build the Edgent SDK Java8 jars and install them in your local maven repository $ ./mvnw clean install # add -DskipTests to omit running the tests You can now construct applications that use Edgent. The Edgent samples -are a good place to start and are available as a separate download. +are a good place to start and are available as a separate download +at https://github.com/apache/incubator-edgent-samples Additional Information --
[6/6] incubator-edgent git commit: Merge branches 'develop' and 'feature/pre-release-finetuning' of https://git-wip-us.apache.org/repos/asf/incubator-edgent into feature/pre-release-finetuning
Merge branches 'develop' and 'feature/pre-release-finetuning' of https://git-wip-us.apache.org/repos/asf/incubator-edgent into feature/pre-release-finetuning Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/ef78d4db Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/ef78d4db Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/ef78d4db Branch: refs/heads/feature/pre-release-finetuning Commit: ef78d4db349fb14965a695bed06ddc72b96e078d Parents: 34b21c9 c761283 Author: Christofer Dutz Authored: Thu Nov 23 09:34:18 2017 +0100 Committer: Christofer Dutz Committed: Thu Nov 23 09:34:18 2017 +0100 -- DEVELOPMENT.md | 7 ++- README | 3 +- RELEASE_NOTES | 1 + .../WebSocketClientConnectTestHelper.java | 64 .../javax/websocket/WebSocketClientTest.java| 26 +++- 5 files changed, 80 insertions(+), 21 deletions(-) --
[1/6] incubator-edgent git commit: [Edgent-438] improve WebSocketClientTest's skip-if-cant-connect
Repository: incubator-edgent
Updated Branches:
refs/heads/feature/pre-release-finetuning 34b21c96a -> ef78d4db3
[Edgent-438] improve WebSocketClientTest's skip-if-cant-connect
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/718ff63b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/718ff63b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/718ff63b
Branch: refs/heads/feature/pre-release-finetuning
Commit: 718ff63b5ec1194d138233e7f8481bb205818132
Parents: f46dd81
Author: Dale LaBossiere
Authored: Mon Nov 20 17:21:50 2017 -0500
Committer: Dale LaBossiere
Committed: Mon Nov 20 17:21:50 2017 -0500
--
.../WebSocketClientConnectTestHelper.java | 46
.../javax/websocket/WebSocketClientTest.java| 26 ---
2 files changed, 55 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/718ff63b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
--
diff --git
a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
new file mode 100644
index 000..f6ffc12
--- /dev/null
+++
b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
@@ -0,0 +1,46 @@
+package org.apache.edgent.test.connectors.wsclient.javax.websocket;
+
+import java.net.URI;
+import java.util.Properties;
+
+import javax.websocket.ClientEndpoint;
+import javax.websocket.ContainerProvider;
+import javax.websocket.OnError;
+import javax.websocket.Session;
+import javax.websocket.WebSocketContainer;
+
+import org.eclipse.jetty.util.component.LifeCycle;
+
+@ClientEndpoint
+public class WebSocketClientConnectTestHelper {
+
+ @OnError
+ public void onError(Session client, Throwable t) {
+System.err.println("Unable to connect to WebSocket server:
"+t.getMessage());
+ }
+
+ public static void connectToServer(Properties config) throws Exception {
+// Verify we can create a real websocket connection to the server.
+//
+// We do the following instead of a simple socket connect
+// because in at least one location, the websocket connect/upgrade
+// fails with: expecting 101 got 403 (Forbidden).
+// There's something about that location that's not
+// allowing a websocket to be created to the (public) server.
+// Everything works fine from other locations.
+//
+String wsUri = config.getProperty("ws.uri");
+URI uri = new URI(wsUri);
+WebSocketContainer container = ContainerProvider.getWebSocketContainer();
+try {
+ Session session =
container.connectToServer(WebSocketClientConnectTestHelper.class, uri);
+ session.close();
+}
+finally {
+ if (container instanceof LifeCycle) {
+((LifeCycle)container).stop();
+ }
+}
+ }
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/718ff63b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
--
diff --git
a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
index 4ef65c9..b256bfe 100644
---
a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
+++
b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientTest.java
@@ -23,8 +23,6 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeTrue;
-import java.net.InetSocketAddress;
-import java.net.Socket;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
@@ -772,21 +770,15 @@ public class WebSocketClientTest extends
ConnectorTestBase {
}
private void skipTestIfCantConnect(Properties config) throws Exception {
-String wsUri = config.getProperty("ws.uri");
-// Skip tests if the WebSocket server can't be contacted.
-try {
-URI uri = new URI(wsUri);
-int port = uri.getPort();
-if (port == -1)
-port = uri.getScheme().equal
[3/6] incubator-edgent git commit: add nl
add nl
Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/62384ddc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/62384ddc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/62384ddc
Branch: refs/heads/feature/pre-release-finetuning
Commit: 62384ddcef54391167bd4b853bc0d7ea7e25ace7
Parents: cc1864b
Author: Dale LaBossiere
Authored: Mon Nov 20 17:40:02 2017 -0500
Committer: Dale LaBossiere
Committed: Mon Nov 20 17:40:02 2017 -0500
--
.../wsclient/javax/websocket/WebSocketClientConnectTestHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/62384ddc/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
--
diff --git
a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
index aaf3b57..41878f7 100644
---
a/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
+++
b/connectors/websocket/src/test/java/org/apache/edgent/test/connectors/wsclient/javax/websocket/WebSocketClientConnectTestHelper.java
@@ -61,4 +61,4 @@ public class WebSocketClientConnectTestHelper {
}
}
-}
\ No newline at end of file
+}
[incubator-edgent] Git Push Summary
Repository: incubator-edgent Updated Branches: refs/heads/release/1.2 [deleted] 9af292b6f
[incubator-edgent] Git Push Summary
Repository: incubator-edgent Updated Branches: refs/heads/release/1.2 [created] f333bbef6
[1/3] incubator-edgent git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-edgent Updated Branches: refs/heads/develop f333bbef6 -> 7243fa798 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/java7/runtime/jmxcontrol/pom.xml -- diff --git a/platforms/java7/runtime/jmxcontrol/pom.xml b/platforms/java7/runtime/jmxcontrol/pom.xml index d355246..038f7d5 100644 --- a/platforms/java7/runtime/jmxcontrol/pom.xml +++ b/platforms/java7/runtime/jmxcontrol/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-runtime -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-runtime-jmxcontrol @@ -86,12 +86,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.java7 edgent-api-function - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/java7/runtime/jobregistry/pom.xml -- diff --git a/platforms/java7/runtime/jobregistry/pom.xml b/platforms/java7/runtime/jobregistry/pom.xml index 937b60c..effdc5e 100644 --- a/platforms/java7/runtime/jobregistry/pom.xml +++ b/platforms/java7/runtime/jobregistry/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-runtime -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-runtime-jobregistry @@ -82,12 +82,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.java7 edgent-api-topology - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/java7/runtime/jsoncontrol/pom.xml -- diff --git a/platforms/java7/runtime/jsoncontrol/pom.xml b/platforms/java7/runtime/jsoncontrol/pom.xml index 5235d6d..bdeb4ca 100644 --- a/platforms/java7/runtime/jsoncontrol/pom.xml +++ b/platforms/java7/runtime/jsoncontrol/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-runtime -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-runtime-jsoncontrol @@ -86,12 +86,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.java7 edgent-api-function - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/java7/runtime/pom.xml -- diff --git a/platforms/java7/runtime/pom.xml b/platforms/java7/runtime/pom.xml index 481106f..2101598 100644 --- a/platforms/java7/runtime/pom.xml +++ b/platforms/java7/runtime/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-platforms-java7 -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-runtime http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/java7/spi/graph/pom.xml -- diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml index afd9a52..b07bba1 100644 --- a/platforms/java7/spi/graph/pom.xml +++ b/platforms/java7/spi/graph/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-spi -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-spi-graph @@ -86,12 +86,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.java7 edgent-api-graph - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/java7/spi/pom.xml -- diff --git a/platforms/java7/spi/pom.xml b/platforms/java7/spi/pom.xml index 0d78431..32963ad 100644 --- a/platforms/java7/spi/pom.xml +++ b/platforms/java7/spi/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-platforms-java7 -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-spi http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/java7/spi/topology/pom.xml -- diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml index b193ce3..5481b9b 100644 --- a/platforms/java7/spi/topology/pom.xml +++ b/platforms/java7/spi/topology/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-spi -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-spi-topology @@ -86,7 +86,7 @@ org.apache.edgent.java7 edgent-api-topology - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edg
[2/3] incubator-edgent git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/android/connectors/websocket-misc/pom.xml -- diff --git a/platforms/android/connectors/websocket-misc/pom.xml b/platforms/android/connectors/websocket-misc/pom.xml index 231b0ad..4d303f1 100644 --- a/platforms/android/connectors/websocket-misc/pom.xml +++ b/platforms/android/connectors/websocket-misc/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.android edgent-connectors -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-connectors-websocket-misc http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/android/connectors/websocket-server/pom.xml -- diff --git a/platforms/android/connectors/websocket-server/pom.xml b/platforms/android/connectors/websocket-server/pom.xml index 580ce3d..3b4cb63 100644 --- a/platforms/android/connectors/websocket-server/pom.xml +++ b/platforms/android/connectors/websocket-server/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.android edgent-connectors -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-connectors-websocket-server @@ -67,7 +67,7 @@ org.apache.edgent.android edgent-connectors-websocket-jetty - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.eclipse.jetty.websocket http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/android/connectors/websocket/pom.xml -- diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml index f770cf2..0b586ea 100644 --- a/platforms/android/connectors/websocket/pom.xml +++ b/platforms/android/connectors/websocket/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.android edgent-connectors -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-connectors-websocket @@ -67,17 +67,17 @@ org.apache.edgent.android edgent-connectors-common - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-websocket-misc - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-websocket-base - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT javax.websocket http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/7243fa79/platforms/android/distribution/pom.xml -- diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml index 0084e21..7d33ae0 100644 --- a/platforms/android/distribution/pom.xml +++ b/platforms/android/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.android edgent-platforms-android -1.2.0-SNAPSHOT +1.3.0-SNAPSHOT edgent-distribution @@ -84,120 +84,120 @@ org.apache.edgent.android edgent-providers-direct - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-providers-iot - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-android-hardware - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-android-topology - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-analytics-math3 - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-analytics-sensors - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-utils-metrics - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-utils-streamscope - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-command - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-common - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-csv - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-file - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-http - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-iot - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-iotp - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.android edgent-connectors-jdbc - 1.2.0-SNAPSHOT + 1.3.0-SNAPSHOT org.apache.edgent.andro
[2/2] incubator-edgent git commit: [maven-release-plugin] prepare branch release/1.2
[maven-release-plugin] prepare branch release/1.2 Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/f333bbef Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/f333bbef Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/f333bbef Branch: refs/heads/develop Commit: f333bbef60d1510f2c95a30e3a17732e47aae48a Parents: 92672c0 Author: Christofer Dutz Authored: Wed Nov 29 20:04:17 2017 +0100 Committer: Christofer Dutz Committed: Wed Nov 29 20:04:17 2017 +0100 -- distribution/pom.xml | 3 +-- platforms/android/analytics/math3/pom.xml | 3 +-- platforms/android/analytics/pom.xml | 3 +-- platforms/android/analytics/sensors/pom.xml | 3 +-- platforms/android/android/hardware/pom.xml| 3 +-- platforms/android/android/pom.xml | 3 +-- platforms/android/android/topology/pom.xml| 3 +-- platforms/android/api/execution/pom.xml | 3 +-- platforms/android/api/function/pom.xml| 3 +-- platforms/android/api/graph/pom.xml | 3 +-- platforms/android/api/oplet/pom.xml | 3 +-- platforms/android/api/pom.xml | 3 +-- platforms/android/api/topology/pom.xml| 3 +-- platforms/android/api/window/pom.xml | 3 +-- platforms/android/apps/iot/pom.xml| 3 +-- platforms/android/apps/pom.xml| 3 +-- platforms/android/apps/runtime/pom.xml| 3 +-- platforms/android/connectors/command/pom.xml | 3 +-- platforms/android/connectors/common/pom.xml | 3 +-- platforms/android/connectors/csv/pom.xml | 3 +-- platforms/android/connectors/file/pom.xml | 3 +-- platforms/android/connectors/http/pom.xml | 3 +-- platforms/android/connectors/iot/pom.xml | 3 +-- platforms/android/connectors/iotp/pom.xml | 3 +-- platforms/android/connectors/jdbc/pom.xml | 3 +-- platforms/android/connectors/kafka/pom.xml| 3 +-- platforms/android/connectors/mqtt/pom.xml | 3 +-- platforms/android/connectors/pom.xml | 3 +-- platforms/android/connectors/pubsub/pom.xml | 3 +-- platforms/android/connectors/serial/pom.xml | 3 +-- platforms/android/connectors/websocket-base/pom.xml | 3 +-- platforms/android/connectors/websocket-jetty/pom.xml | 3 +-- platforms/android/connectors/websocket-misc/pom.xml | 3 +-- platforms/android/connectors/websocket-server/pom.xml | 3 +-- platforms/android/connectors/websocket/pom.xml| 3 +-- platforms/android/distribution/pom.xml| 3 +-- platforms/android/pom.xml | 5 ++--- platforms/android/providers/direct/pom.xml| 3 +-- platforms/android/providers/iot/pom.xml | 3 +-- platforms/android/providers/pom.xml | 3 +-- platforms/android/runtime/appservice/pom.xml | 3 +-- platforms/android/runtime/etiao/pom.xml | 3 +-- platforms/android/runtime/jobregistry/pom.xml | 3 +-- platforms/android/runtime/jsoncontrol/pom.xml | 3 +-- platforms/android/runtime/pom.xml | 3 +-- platforms/android/spi/graph/pom.xml | 3 +-- platforms/android/spi/pom.xml | 3 +-- platforms/android/spi/topology/pom.xml| 3 +-- platforms/android/utils/metrics/pom.xml | 3 +-- platforms/android/utils/pom.xml | 3 +-- platforms/android/utils/streamscope/pom.xml | 3 +-- platforms/java7/analytics/math3/pom.xml | 3 +-- platforms/java7/analytics/pom.xml | 3 +-- platforms/java7/analytics/sensors/pom.xml | 3 +-- platforms/java7/api/execution/pom.xml | 3 +-- platforms/java7/api/function/pom.xml | 3 +-- platforms/java7/api/graph/pom.xml | 3 +-- platforms/java7/api/oplet/pom.xml | 3 +-- platforms/java7/api/pom.xml | 3 +-- platforms/java7/api/topology/pom.xml | 3 +-- platforms/java7/api/window/pom.xml| 3 +-- platforms/java7/apps/iot/pom.xml | 3 +-- platforms/java7/apps/pom.xml | 3 +-- platforms/java7/apps/runtime/pom.xml | 3 +-- platforms/java7/connectors/command/pom.xml| 3 +-- platforms/java7/connectors/common/pom.xml | 3 +-- platforms/java7/connectors/csv/pom.xml| 3 +-- platforms/java7/connectors/file/pom.xml | 3 +-- platforms/java7/connectors/http/pom.xml |
[1/2] incubator-edgent git commit: [maven-release-plugin] prepare branch release/1.2
Repository: incubator-edgent Updated Branches: refs/heads/develop 92672c050 -> f333bbef6 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f333bbef/platforms/java7/providers/development/pom.xml -- diff --git a/platforms/java7/providers/development/pom.xml b/platforms/java7/providers/development/pom.xml index 878fae0..f30409d 100644 --- a/platforms/java7/providers/development/pom.xml +++ b/platforms/java7/providers/development/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f333bbef/platforms/java7/providers/direct/pom.xml -- diff --git a/platforms/java7/providers/direct/pom.xml b/platforms/java7/providers/direct/pom.xml index d140684..740b73e 100644 --- a/platforms/java7/providers/direct/pom.xml +++ b/platforms/java7/providers/direct/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f333bbef/platforms/java7/providers/iot/pom.xml -- diff --git a/platforms/java7/providers/iot/pom.xml b/platforms/java7/providers/iot/pom.xml index b302d89..05c2319 100644 --- a/platforms/java7/providers/iot/pom.xml +++ b/platforms/java7/providers/iot/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f333bbef/platforms/java7/providers/pom.xml -- diff --git a/platforms/java7/providers/pom.xml b/platforms/java7/providers/pom.xml index 6f4ce8d..e52a073 100644 --- a/platforms/java7/providers/pom.xml +++ b/platforms/java7/providers/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f333bbef/platforms/java7/runtime/appservice/pom.xml -- diff --git a/platforms/java7/runtime/appservice/pom.xml b/platforms/java7/runtime/appservice/pom.xml index 47187b7..4b1342e 100644 --- a/platforms/java7/runtime/appservice/pom.xml +++ b/platforms/java7/runtime/appservice/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/f333bbef/platforms/java7/runtime/etiao/pom.xml -- diff --git a/platforms/java7/runtime/etiao/pom.xml b/platforms/java7/runtime/etiao/pom.xml index 12380bb..2c7e418 100644 --- a/platforms/java7/runtime/etiao/pom.xml +++ b/platforms/java7/runtime/etiao/pom.xml @@ -17,8 +17,7 @@ limitations under the License. --> -http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/X
[3/3] incubator-edgent git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/7243fa79 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/7243fa79 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/7243fa79 Branch: refs/heads/develop Commit: 7243fa798c6ff667b7b67a8aacc635e4254440ee Parents: f333bbe Author: Christofer Dutz Authored: Wed Nov 29 20:04:29 2017 +0100 Committer: Christofer Dutz Committed: Wed Nov 29 20:04:29 2017 +0100 -- analytics/math3/pom.xml | 10 ++--- analytics/pom.xml | 2 +- analytics/sensors/pom.xml | 10 ++--- api/execution/pom.xml | 4 +- api/function/pom.xml| 2 +- api/graph/pom.xml | 4 +- api/oplet/pom.xml | 8 ++-- api/pom.xml | 2 +- api/topology/pom.xml| 10 ++--- api/window/pom.xml | 4 +- apps/iot/pom.xml| 10 ++--- apps/pom.xml| 2 +- apps/runtime/pom.xml| 10 ++--- connectors/command/pom.xml | 14 +++--- connectors/common/pom.xml | 10 ++--- connectors/csv/pom.xml | 8 ++-- connectors/file/pom.xml | 16 +++ connectors/http/pom.xml | 8 ++-- connectors/iot/pom.xml | 6 +-- connectors/iotp/pom.xml | 8 ++-- connectors/jdbc/pom.xml | 14 +++--- connectors/kafka/pom.xml| 12 ++--- connectors/mqtt/pom.xml | 16 +++ connectors/pom.xml | 2 +- connectors/pubsub/pom.xml | 6 +-- connectors/serial/pom.xml | 4 +- connectors/websocket-base/pom.xml | 4 +- connectors/websocket-jetty/pom.xml | 4 +- connectors/websocket-misc/pom.xml | 2 +- connectors/websocket-server/pom.xml | 4 +- connectors/websocket/pom.xml| 18 console/pom.xml | 2 +- console/server/pom.xml | 4 +- console/servlets/pom.xml| 4 +- distribution/pom.xml| 46 ++-- platforms/android/analytics/math3/pom.xml | 4 +- platforms/android/analytics/pom.xml | 2 +- platforms/android/analytics/sensors/pom.xml | 4 +- platforms/android/android/hardware/pom.xml | 4 +- platforms/android/android/pom.xml | 2 +- platforms/android/android/topology/pom.xml | 6 +-- platforms/android/api/execution/pom.xml | 4 +- platforms/android/api/function/pom.xml | 2 +- platforms/android/api/graph/pom.xml | 4 +- platforms/android/api/oplet/pom.xml | 8 ++-- platforms/android/api/pom.xml | 2 +- platforms/android/api/topology/pom.xml | 10 ++--- platforms/android/api/window/pom.xml| 4 +- platforms/android/apps/iot/pom.xml | 8 ++-- platforms/android/apps/pom.xml | 2 +- platforms/android/apps/runtime/pom.xml | 6 +-- platforms/android/connectors/command/pom.xml| 6 +-- platforms/android/connectors/common/pom.xml | 4 +- platforms/android/connectors/csv/pom.xml| 2 +- platforms/android/connectors/file/pom.xml | 8 ++-- platforms/android/connectors/http/pom.xml | 4 +- platforms/android/connectors/iot/pom.xml| 6 +-- platforms/android/connectors/iotp/pom.xml | 8 ++-- platforms/android/connectors/jdbc/pom.xml | 6 +-- platforms/android/connectors/kafka/pom.xml | 4 +- platforms/android/connectors/mqtt/pom.xml | 8 ++-- platforms/android/connectors/pom.xml| 2 +- platforms/android/connectors/pubsub/pom.xml | 4 +- platforms/android/connectors/serial/pom.xml | 4 +- .../android/connectors/websocket-base/pom.xml | 4 +- .../android/connectors/websocket-jetty/pom.xml | 4 +- .../android/connectors/websocket-misc/pom.xml | 2 +- .../android/connectors/websocket-server/pom.xml | 4 +- platforms/android/connectors/websocket/pom.xml | 8 ++-- platforms/android/distribution/pom.xml | 46 ++-- platforms/android/pom.xml | 2 +- platforms/android/providers/direct/pom.xml | 14 +++--- platforms/android/providers/iot/pom.xml | 16 +++ platforms/android/providers/pom.xml |
incubator-edgent git commit: - Manually updated the version of commented out dependencies.
Repository: incubator-edgent Updated Branches: refs/heads/develop 7243fa798 -> 430c53267 - Manually updated the version of commented out dependencies. Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/430c5326 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/430c5326 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/430c5326 Branch: refs/heads/develop Commit: 430c53267539e00f5571e5eaeb5cc3e71460ad60 Parents: 7243fa7 Author: Christofer Dutz Authored: Wed Nov 29 20:07:09 2017 +0100 Committer: Christofer Dutz Committed: Wed Nov 29 20:07:09 2017 +0100 -- platforms/android/distribution/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/430c5326/platforms/android/distribution/pom.xml -- diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml index 7d33ae0..44bd8e6 100644 --- a/platforms/android/distribution/pom.xml +++ b/platforms/android/distribution/pom.xml @@ -79,7 +79,7 @@ org.apache.edgent.android @@ -209,7 +209,7 @@
[1/3] incubator-edgent git commit: [maven-release-plugin] prepare for next development iteration
Repository: incubator-edgent Updated Branches: refs/heads/release/1.2 e37ca5216 -> 5ec8229e8 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/java7/spi/graph/pom.xml -- diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml index f8a6c8c..f3694f3 100644 --- a/platforms/java7/spi/graph/pom.xml +++ b/platforms/java7/spi/graph/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-spi -1.2.0 +1.2.1-SNAPSHOT edgent-spi-graph @@ -86,12 +86,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-api-graph - 1.2.0 + 1.2.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/java7/spi/pom.xml -- diff --git a/platforms/java7/spi/pom.xml b/platforms/java7/spi/pom.xml index 69415a0..6a21c46 100644 --- a/platforms/java7/spi/pom.xml +++ b/platforms/java7/spi/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-platforms-java7 -1.2.0 +1.2.1-SNAPSHOT edgent-spi http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/java7/spi/topology/pom.xml -- diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml index 107cf03..ec96bf1 100644 --- a/platforms/java7/spi/topology/pom.xml +++ b/platforms/java7/spi/topology/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-spi -1.2.0 +1.2.1-SNAPSHOT edgent-spi-topology @@ -86,7 +86,7 @@ org.apache.edgent.java7 edgent-api-topology - 1.2.0 + 1.2.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/java7/test/appservice-applications/pom.xml -- diff --git a/platforms/java7/test/appservice-applications/pom.xml b/platforms/java7/test/appservice-applications/pom.xml index 6652dac..b3d0cb0 100644 --- a/platforms/java7/test/appservice-applications/pom.xml +++ b/platforms/java7/test/appservice-applications/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-test -1.2.0 +1.2.1-SNAPSHOT edgent-test-appservice-applications @@ -92,7 +92,7 @@ org.apache.edgent.java7 edgent-api-topology - 1.2.0 + 1.2.1-SNAPSHOT http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/java7/test/fvtiot/pom.xml -- diff --git a/platforms/java7/test/fvtiot/pom.xml b/platforms/java7/test/fvtiot/pom.xml index b100be5..4a044f2 100644 --- a/platforms/java7/test/fvtiot/pom.xml +++ b/platforms/java7/test/fvtiot/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-test -1.2.0 +1.2.1-SNAPSHOT edgent-test-fvtiot @@ -100,38 +100,38 @@ org.apache.edgent.java7 edgent-connectors-pubsub - 1.2.0 + 1.2.1-SNAPSHOT test org.apache.edgent.java7 edgent-runtime-jsoncontrol - 1.2.0 + 1.2.1-SNAPSHOT test org.apache.edgent.java7 edgent-providers-direct - 1.2.0 + 1.2.1-SNAPSHOT test org.apache.edgent.java7 edgent-apps-iot - 1.2.0 + 1.2.1-SNAPSHOT test org.apache.edgent.java7 edgent-apps-iot - 1.2.0 + 1.2.1-SNAPSHOT test-jar test org.apache.edgent.java7 edgent-providers-iot - 1.2.0 + 1.2.1-SNAPSHOT test http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/java7/test/pom.xml -- diff --git a/platforms/java7/test/pom.xml b/platforms/java7/test/pom.xml index 3088fde..df7964f 100644 --- a/platforms/java7/test/pom.xml +++ b/platforms/java7/test/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-platforms-java7 -1.2.0 +1.2.1-SNAPSHOT edgent-test http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/java7/test/svt/pom.xml -- diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml index 92c4203..81e6637 100644 --- a/platforms/java7/test/svt/pom.xml +++ b/platforms/java7/test/svt/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-test -1.2.0 +1.2.1-SNAPSHOT edgent-test-svt @@ -86,22 +86,22 @@ org.apache.edgent.java7 edgent-api-topology - 1.2.0 +
[3/3] incubator-edgent git commit: [maven-release-plugin] prepare for next development iteration
[maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/5ec8229e Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/5ec8229e Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/5ec8229e Branch: refs/heads/release/1.2 Commit: 5ec8229e89f2d01b49f7587f19984271b9a78339 Parents: e37ca52 Author: Christofer Dutz Authored: Fri Dec 1 09:54:33 2017 +0100 Committer: Christofer Dutz Committed: Fri Dec 1 09:54:33 2017 +0100 -- analytics/math3/pom.xml | 10 ++--- analytics/pom.xml | 2 +- analytics/sensors/pom.xml | 10 ++--- api/execution/pom.xml | 4 +- api/function/pom.xml| 2 +- api/graph/pom.xml | 4 +- api/oplet/pom.xml | 8 ++-- api/pom.xml | 2 +- api/topology/pom.xml| 10 ++--- api/window/pom.xml | 4 +- apps/iot/pom.xml| 10 ++--- apps/pom.xml| 2 +- apps/runtime/pom.xml| 10 ++--- connectors/command/pom.xml | 14 +++--- connectors/common/pom.xml | 10 ++--- connectors/csv/pom.xml | 8 ++-- connectors/file/pom.xml | 16 +++ connectors/http/pom.xml | 8 ++-- connectors/iot/pom.xml | 6 +-- connectors/iotp/pom.xml | 8 ++-- connectors/jdbc/pom.xml | 14 +++--- connectors/kafka/pom.xml| 12 ++--- connectors/mqtt/pom.xml | 16 +++ connectors/pom.xml | 2 +- connectors/pubsub/pom.xml | 6 +-- connectors/serial/pom.xml | 4 +- connectors/websocket-base/pom.xml | 4 +- connectors/websocket-jetty/pom.xml | 4 +- connectors/websocket-misc/pom.xml | 2 +- connectors/websocket-server/pom.xml | 4 +- connectors/websocket/pom.xml| 18 console/pom.xml | 2 +- console/server/pom.xml | 4 +- console/servlets/pom.xml| 4 +- distribution/pom.xml| 46 ++-- platforms/android/analytics/math3/pom.xml | 4 +- platforms/android/analytics/pom.xml | 2 +- platforms/android/analytics/sensors/pom.xml | 4 +- platforms/android/android/hardware/pom.xml | 4 +- platforms/android/android/pom.xml | 2 +- platforms/android/android/topology/pom.xml | 6 +-- platforms/android/api/execution/pom.xml | 4 +- platforms/android/api/function/pom.xml | 2 +- platforms/android/api/graph/pom.xml | 4 +- platforms/android/api/oplet/pom.xml | 8 ++-- platforms/android/api/pom.xml | 2 +- platforms/android/api/topology/pom.xml | 10 ++--- platforms/android/api/window/pom.xml| 4 +- platforms/android/apps/iot/pom.xml | 8 ++-- platforms/android/apps/pom.xml | 2 +- platforms/android/apps/runtime/pom.xml | 6 +-- platforms/android/connectors/command/pom.xml| 6 +-- platforms/android/connectors/common/pom.xml | 4 +- platforms/android/connectors/csv/pom.xml| 2 +- platforms/android/connectors/file/pom.xml | 8 ++-- platforms/android/connectors/http/pom.xml | 4 +- platforms/android/connectors/iot/pom.xml| 6 +-- platforms/android/connectors/iotp/pom.xml | 8 ++-- platforms/android/connectors/jdbc/pom.xml | 6 +-- platforms/android/connectors/kafka/pom.xml | 4 +- platforms/android/connectors/mqtt/pom.xml | 8 ++-- platforms/android/connectors/pom.xml| 2 +- platforms/android/connectors/pubsub/pom.xml | 4 +- platforms/android/connectors/serial/pom.xml | 4 +- .../android/connectors/websocket-base/pom.xml | 4 +- .../android/connectors/websocket-jetty/pom.xml | 4 +- .../android/connectors/websocket-misc/pom.xml | 2 +- .../android/connectors/websocket-server/pom.xml | 4 +- platforms/android/connectors/websocket/pom.xml | 8 ++-- platforms/android/distribution/pom.xml | 46 ++-- platforms/android/pom.xml | 2 +- platforms/android/providers/direct/pom.xml | 14 +++--- platforms/android/providers/iot/pom.xml | 16 +++ platforms/android/providers/pom.xml
[1/3] incubator-edgent git commit: [maven-release-plugin] prepare release edgent-1.2.0
Repository: incubator-edgent Updated Branches: refs/heads/release/1.2 f333bbef6 -> e37ca5216 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/java7/spi/graph/pom.xml -- diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml index afd9a52..f8a6c8c 100644 --- a/platforms/java7/spi/graph/pom.xml +++ b/platforms/java7/spi/graph/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-spi -1.2.0-SNAPSHOT +1.2.0 edgent-spi-graph @@ -86,12 +86,12 @@ org.apache.edgent.java7 edgent-api-execution - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-api-graph - 1.2.0-SNAPSHOT + 1.2.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/java7/spi/pom.xml -- diff --git a/platforms/java7/spi/pom.xml b/platforms/java7/spi/pom.xml index 0d78431..69415a0 100644 --- a/platforms/java7/spi/pom.xml +++ b/platforms/java7/spi/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-platforms-java7 -1.2.0-SNAPSHOT +1.2.0 edgent-spi http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/java7/spi/topology/pom.xml -- diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml index b193ce3..107cf03 100644 --- a/platforms/java7/spi/topology/pom.xml +++ b/platforms/java7/spi/topology/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-spi -1.2.0-SNAPSHOT +1.2.0 edgent-spi-topology @@ -86,7 +86,7 @@ org.apache.edgent.java7 edgent-api-topology - 1.2.0-SNAPSHOT + 1.2.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/java7/test/appservice-applications/pom.xml -- diff --git a/platforms/java7/test/appservice-applications/pom.xml b/platforms/java7/test/appservice-applications/pom.xml index 9151dbb..6652dac 100644 --- a/platforms/java7/test/appservice-applications/pom.xml +++ b/platforms/java7/test/appservice-applications/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-test -1.2.0-SNAPSHOT +1.2.0 edgent-test-appservice-applications @@ -92,7 +92,7 @@ org.apache.edgent.java7 edgent-api-topology - 1.2.0-SNAPSHOT + 1.2.0 http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/java7/test/fvtiot/pom.xml -- diff --git a/platforms/java7/test/fvtiot/pom.xml b/platforms/java7/test/fvtiot/pom.xml index 21c5de0..b100be5 100644 --- a/platforms/java7/test/fvtiot/pom.xml +++ b/platforms/java7/test/fvtiot/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-test -1.2.0-SNAPSHOT +1.2.0 edgent-test-fvtiot @@ -100,38 +100,38 @@ org.apache.edgent.java7 edgent-connectors-pubsub - 1.2.0-SNAPSHOT + 1.2.0 test org.apache.edgent.java7 edgent-runtime-jsoncontrol - 1.2.0-SNAPSHOT + 1.2.0 test org.apache.edgent.java7 edgent-providers-direct - 1.2.0-SNAPSHOT + 1.2.0 test org.apache.edgent.java7 edgent-apps-iot - 1.2.0-SNAPSHOT + 1.2.0 test org.apache.edgent.java7 edgent-apps-iot - 1.2.0-SNAPSHOT + 1.2.0 test-jar test org.apache.edgent.java7 edgent-providers-iot - 1.2.0-SNAPSHOT + 1.2.0 test http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/java7/test/pom.xml -- diff --git a/platforms/java7/test/pom.xml b/platforms/java7/test/pom.xml index 0150caa..3088fde 100644 --- a/platforms/java7/test/pom.xml +++ b/platforms/java7/test/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-platforms-java7 -1.2.0-SNAPSHOT +1.2.0 edgent-test http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/java7/test/svt/pom.xml -- diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml index 84eacb2..92c4203 100644 --- a/platforms/java7/test/svt/pom.xml +++ b/platforms/java7/test/svt/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.java7 edgent-test -1.2.0-SNAPSHOT +1.2.0 edgent-test-svt @@ -86,22 +86,22 @@ org.apache.edgent.java7 edgent-api-topology - 1.2.0-SNAPSHO
[incubator-edgent] Git Push Summary
Repository: incubator-edgent Updated Tags: refs/tags/edgent-1.2.0 [created] 470833b1d
[3/3] incubator-edgent git commit: [maven-release-plugin] prepare release edgent-1.2.0
[maven-release-plugin] prepare release edgent-1.2.0 Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/e37ca521 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/e37ca521 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/e37ca521 Branch: refs/heads/release/1.2 Commit: e37ca5216e7f4d464cfcd45c9826b6d99791c974 Parents: f333bbe Author: Christofer Dutz Authored: Fri Dec 1 09:54:11 2017 +0100 Committer: Christofer Dutz Committed: Fri Dec 1 09:54:11 2017 +0100 -- analytics/math3/pom.xml | 10 ++--- analytics/pom.xml | 2 +- analytics/sensors/pom.xml | 10 ++--- api/execution/pom.xml | 4 +- api/function/pom.xml| 2 +- api/graph/pom.xml | 4 +- api/oplet/pom.xml | 8 ++-- api/pom.xml | 2 +- api/topology/pom.xml| 10 ++--- api/window/pom.xml | 4 +- apps/iot/pom.xml| 10 ++--- apps/pom.xml| 2 +- apps/runtime/pom.xml| 10 ++--- connectors/command/pom.xml | 14 +++--- connectors/common/pom.xml | 10 ++--- connectors/csv/pom.xml | 8 ++-- connectors/file/pom.xml | 16 +++ connectors/http/pom.xml | 8 ++-- connectors/iot/pom.xml | 6 +-- connectors/iotp/pom.xml | 8 ++-- connectors/jdbc/pom.xml | 14 +++--- connectors/kafka/pom.xml| 12 ++--- connectors/mqtt/pom.xml | 16 +++ connectors/pom.xml | 2 +- connectors/pubsub/pom.xml | 6 +-- connectors/serial/pom.xml | 4 +- connectors/websocket-base/pom.xml | 4 +- connectors/websocket-jetty/pom.xml | 4 +- connectors/websocket-misc/pom.xml | 2 +- connectors/websocket-server/pom.xml | 4 +- connectors/websocket/pom.xml| 18 console/pom.xml | 2 +- console/server/pom.xml | 4 +- console/servlets/pom.xml| 4 +- distribution/pom.xml| 46 ++-- platforms/android/analytics/math3/pom.xml | 4 +- platforms/android/analytics/pom.xml | 2 +- platforms/android/analytics/sensors/pom.xml | 4 +- platforms/android/android/hardware/pom.xml | 4 +- platforms/android/android/pom.xml | 2 +- platforms/android/android/topology/pom.xml | 6 +-- platforms/android/api/execution/pom.xml | 4 +- platforms/android/api/function/pom.xml | 2 +- platforms/android/api/graph/pom.xml | 4 +- platforms/android/api/oplet/pom.xml | 8 ++-- platforms/android/api/pom.xml | 2 +- platforms/android/api/topology/pom.xml | 10 ++--- platforms/android/api/window/pom.xml| 4 +- platforms/android/apps/iot/pom.xml | 8 ++-- platforms/android/apps/pom.xml | 2 +- platforms/android/apps/runtime/pom.xml | 6 +-- platforms/android/connectors/command/pom.xml| 6 +-- platforms/android/connectors/common/pom.xml | 4 +- platforms/android/connectors/csv/pom.xml| 2 +- platforms/android/connectors/file/pom.xml | 8 ++-- platforms/android/connectors/http/pom.xml | 4 +- platforms/android/connectors/iot/pom.xml| 6 +-- platforms/android/connectors/iotp/pom.xml | 8 ++-- platforms/android/connectors/jdbc/pom.xml | 6 +-- platforms/android/connectors/kafka/pom.xml | 4 +- platforms/android/connectors/mqtt/pom.xml | 8 ++-- platforms/android/connectors/pom.xml| 2 +- platforms/android/connectors/pubsub/pom.xml | 4 +- platforms/android/connectors/serial/pom.xml | 4 +- .../android/connectors/websocket-base/pom.xml | 4 +- .../android/connectors/websocket-jetty/pom.xml | 4 +- .../android/connectors/websocket-misc/pom.xml | 2 +- .../android/connectors/websocket-server/pom.xml | 4 +- platforms/android/connectors/websocket/pom.xml | 8 ++-- platforms/android/distribution/pom.xml | 46 ++-- platforms/android/pom.xml | 2 +- platforms/android/providers/direct/pom.xml | 14 +++--- platforms/android/providers/iot/pom.xml | 16 +++ platforms/android/providers/pom.xml | 2 +-
[2/3] incubator-edgent git commit: [maven-release-plugin] prepare release edgent-1.2.0
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/android/connectors/websocket/pom.xml -- diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml index f770cf2..16a0783 100644 --- a/platforms/android/connectors/websocket/pom.xml +++ b/platforms/android/connectors/websocket/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.android edgent-connectors -1.2.0-SNAPSHOT +1.2.0 edgent-connectors-websocket @@ -67,17 +67,17 @@ org.apache.edgent.android edgent-connectors-common - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-websocket-misc - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-websocket-base - 1.2.0-SNAPSHOT + 1.2.0 javax.websocket http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/e37ca521/platforms/android/distribution/pom.xml -- diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml index 0084e21..c58342c 100644 --- a/platforms/android/distribution/pom.xml +++ b/platforms/android/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.android edgent-platforms-android -1.2.0-SNAPSHOT +1.2.0 edgent-distribution @@ -84,120 +84,120 @@ org.apache.edgent.android edgent-providers-direct - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-providers-iot - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-android-hardware - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-android-topology - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-analytics-math3 - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-analytics-sensors - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-utils-metrics - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-utils-streamscope - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-command - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-common - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-csv - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-file - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-http - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-iot - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-iotp - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-jdbc - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-kafka - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-mqtt - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-pubsub - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-serial - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-websocket - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.android edgent-connectors-websocket-jetty - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-analytics-math3 - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-analytics-sensors - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-utils-metrics - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-utils-streamscope - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-connectors-command - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-connectors-common - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-connectors-csv - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-connectors-file - 1.2.0-SNAPSHOT + 1.2.0 org.apache.edgent.java7 edgent-connectors-http - 1.2.0-SNAPSHO
[2/3] incubator-edgent git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/android/connectors/websocket/pom.xml -- diff --git a/platforms/android/connectors/websocket/pom.xml b/platforms/android/connectors/websocket/pom.xml index 16a0783..4ef97f7 100644 --- a/platforms/android/connectors/websocket/pom.xml +++ b/platforms/android/connectors/websocket/pom.xml @@ -23,7 +23,7 @@ org.apache.edgent.android edgent-connectors -1.2.0 +1.2.1-SNAPSHOT edgent-connectors-websocket @@ -67,17 +67,17 @@ org.apache.edgent.android edgent-connectors-common - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-websocket-misc - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-websocket-base - 1.2.0 + 1.2.1-SNAPSHOT javax.websocket http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/5ec8229e/platforms/android/distribution/pom.xml -- diff --git a/platforms/android/distribution/pom.xml b/platforms/android/distribution/pom.xml index c58342c..bc872d9 100644 --- a/platforms/android/distribution/pom.xml +++ b/platforms/android/distribution/pom.xml @@ -24,7 +24,7 @@ org.apache.edgent.android edgent-platforms-android -1.2.0 +1.2.1-SNAPSHOT edgent-distribution @@ -84,120 +84,120 @@ org.apache.edgent.android edgent-providers-direct - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-providers-iot - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-android-hardware - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-android-topology - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-analytics-math3 - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-analytics-sensors - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-utils-metrics - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-utils-streamscope - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-command - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-common - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-csv - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-file - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-http - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-iot - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-iotp - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-jdbc - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-kafka - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-mqtt - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-pubsub - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-serial - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-websocket - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.android edgent-connectors-websocket-jetty - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-analytics-math3 - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-analytics-sensors - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-utils-metrics - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-utils-streamscope - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-connectors-command - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-connectors-common - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-connectors-csv - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-connectors-file - 1.2.0 + 1.2.1-SNAPSHOT org.apache.edgent.java7 edgent-connectors-http - 1.2.0 +
incubator-edgent git commit: - Added documentation on releasing Edgent with Maven.
Repository: incubator-edgent Updated Branches: refs/heads/develop 430c53267 -> ba7e76f11 - Added documentation on releasing Edgent with Maven. Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/ba7e76f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/ba7e76f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/ba7e76f1 Branch: refs/heads/develop Commit: ba7e76f11e527c0ec4a38d0cd3e971912ed83c75 Parents: 430c532 Author: Christofer Dutz Authored: Sun Dec 3 17:09:36 2017 +0100 Committer: Christofer Dutz Committed: Sun Dec 3 17:09:36 2017 +0100 -- src/site/asciidoc/releasing.adoc | 61 ++- 1 file changed, 60 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/ba7e76f1/src/site/asciidoc/releasing.adoc -- diff --git a/src/site/asciidoc/releasing.adoc b/src/site/asciidoc/releasing.adoc index d7a6525..3212d83 100644 --- a/src/site/asciidoc/releasing.adoc +++ b/src/site/asciidoc/releasing.adoc @@ -54,4 +54,63 @@ After this the branches and the changes are committed, but not yet pushed. So as ## Preparing a release -To be continued ... \ No newline at end of file +In this phase on the release branch. The versions are changed to the release versions, a commit is done with this state and tagged. After that the versions are updated to the next development version and this update is committed too. + +mvn release:prepare -DautoVersionSubmodules=true -P platform-android,platform-java7,distribution -Dtag=edgent-1.2.0 -DdevelopmentVersion=1.2.1-SNAPSHOT -DreleaseVersion=1.2.0 + +The plugin doesn't push the changes to the remote repo. So please don't forget to do a git push before continuing. + +git push + +After changing to the release version, the plugin does a full build with all tests prior to tagging and committing the release version. Same happens again after updating to the next development version. + +## Performing a release + +In this phase the previously prepared release is built, tested and deployed to the remote repo configured in the pom. +To be 100% sure the build doesn't require any files eventually omitted from source control, the `release:perform` step checks out the previously created tag to a directory `target/checkout` and runs the build there. + +mvn release:perform -DreleaseProfiles=platform-android,platform-java7,distribution + +After this step is successful, all artifacts are located in a so-called `staging repository` at https://repository.apache.org/ + +Here staging repositories for Edgent have the same name: `apacheedgent-`. It is automatically created when staging new artifacts and the last four digits are automatically counted by Nexus. + +## Closing the staging repository + +Prior to releasing and voting a staging repository has to be closed. +Only then can a repository be released and ony then does the repo get a url assigned that can be used by others to inspect the release. + +In order to close a previously created staging repository. +Please login to https://repository.apache.org/ with your Apache credentials and select `Staging Repositories` in the section `Build Promotion`. + +Here click on the `apacheedgent-` containing the artifacts you are planning to release. + +In the menu above, click on the `Close` button. + +Now Nexus would create a new staging repository as soon as another artifact would be uploaded for an Edgent groupId. Beyond that a number of pre-configured tests are executed automatically: + +- Validate the signatures +- Validate the checksums + +After this you can see the repository url on the staging repositories `Summary` tab. + +## Actions if the vote passed + +If the vote passed and the release candidate should be officially released, all that has to be done, is that the release manager logs in to Apache's Nexus, selects the staging repo and clicks on the `Release` button. + +After this Nexus takes care of all further steps of copying the artifacts to the official release repository, syncing that to Maven central, removing the old staging repository and even cleanup the `SNAPSHOT` versions of the release in the snapshot repo. + +## Actions if the vote failed + +If something popped up during the vote on the release and the release candidate has to be dropped, two things have to be done: + +1. Drop the staging repository in Apache's Nexus +2. Drop/Rename the tag previously set by the release plugin + +Dropping the release is equally simple in Nexus, by logging in, selecting the staging repository and clicking on the `Drop` button instead of the `Release` button. + +After that in Nexus all artifacts are cleaned up an
svn commit: r23402 [2/2] - /dev/incubator/edgent/KEYS
Modified: dev/incubator/edgent/KEYS == --- dev/incubator/edgent/KEYS (original) +++ dev/incubator/edgent/KEYS Wed Dec 6 08:18:34 2017 @@ -89,3 +89,5797 @@ emx2EcqCtaZ4lnJhIHOkuO863hQaPssmZ0CqHcDf 38NGZ0oQ0GKgYrvJhHPUsjMkUqxz =xPxf -END PGP PUBLIC KEY BLOCK- + + +pub rsa4096 2014-09-05 [SC] + F156813FF315007E36BA6C13089127C15C60D6B9 +uid[ ultimativ ] Christofer Dutz (Apache Comitter) +sig 3089127C15C60D6B9 2014-09-05 Christofer Dutz (Apache Comitter) +sig 9DAADC1C9FCC82D0 2015-07-27 Benedikt Ritter (CODE SIGNING KEY) +sig 3E0F28593AEEAD151 2014-11-19 Justin Mclean +sig 388F3CF4C22D7F6EC 2015-07-27 Hendrik Saly +sig 37903F81190910A83 2015-07-27 Hendrik Saly +sig 3ED74488A5707E66B 2017-07-23 Christofer Dutz +uid[ ultimativ ] [jpeg image of size 272202] +sig 3089127C15C60D6B9 2015-07-27 Christofer Dutz (Apache Comitter) +sig 3ED74488A5707E66B 2017-07-23 Christofer Dutz +sub rsa4096 2014-09-05 [E] +sig 089127C15C60D6B9 2014-09-05 Christofer Dutz (Apache Comitter) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFQJ9kwBEAC8+epn6+DNDhx7COxuqtcYeL498od+9wiEDt7fTFX2lQpDzH3e +OI41Dxtlw/2s2guoVvw3cu9PzrI4NCvfWPRMzUhzpOr8wIRURFy+rJ3Xoh4GnASD +GKtLMRt2XTDmIGSPR+EiKm3TGA89dgrG+DF4Bsf+4kpHRvUzWmtlx1Gwf8GpHGIu +Db9J5A2VTg9QqdsQS1lX2Z1NvDkFMC2BEJQDKwAii+wpZ6Ld57MOAJeDVCyG2Tpb +FwgmkggQHxnBmA30ZJrVqLnkaWch10q7mCIHv87l1c0EiGnGKE8MtY3H+Ko6Dt2q +eYEzkn7sR759M42+BNBkK0u4t3j+fxkA+p61dc+6ovMdBzRKXD319HDJjGNJ6ouU +L8KDaSwxN6e3mKtNi+zb6SPpZ17pyS9t0QbT7rIHlkX47aMWIp+jBWXL9gGQeBMx +YhLfoS5Kqq4TSCxtGwFF1q/xd3DA6lfcCp6B4ePOM7pPd2+uowRXyJPRRTowHtXE +HzTj9VTmO08pDd4iqivTQ3YLJdEAlx07VrND8MERG+4SEiiyWWIM7aT2m0K79Fg8 +cDue73isiZ+jmmI0tqe2AJLlhhl3L3Co2VeoLFu1TQuCScK6T8RsKfQ1/h0P6hkQ +w1a0A84S+klBM8LZPXbsYgBMSpwdFQmgc6hY3O2YaY6+3eVT1VxUU26bGQARAQAB +tDRDaHJpc3RvZmVyIER1dHogKEFwYWNoZSBDb21pdHRlcikgPGNkdXR6QGFwYWNo +ZS5vcmc+iQI3BBMBCgAhBQJUCfZMAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheA +AAoJEAiRJ8FcYNa5W2UQAIzN8wjHGwNPBc+AmlOwfuV3RGIxkp01Uhy8fSzPXcbo +N6Cbg8rjPf3VyZ8sj57JrKIjGP5Dpgw6WNUFLqucTxJZhZLSN12+5u3c+B/bALLa +IqjDPRw+IecYaTZdEGncWaLdMK7Tp6AOSZWgTr5wUVxLWjdeLfDc6AbF0PsA5DRQ +BxxRh/1MzEd7CwPyuIEqRpDhwzo684M3vXhOQL2fVsu0ja/NYz+73z8CJItD2Jtz +LlVLrmnsw0SVO93dxUDAQgkzrj9Mymek+KH9hMl0ucT0TT4yXIT91gKpg6yWmHVY +vrbQSwu8jMzuOxOHwpBHEL3BAAzlUA5DxKTGQBJS7YzkZr4iUT+Lm6CgPlJcxNu4 +eP82gT6YDtm5jLflY7UklIvPTWqBc9y93h6Z3VoaMBqGgPqtbmOVG5axBXajaVVU +BZs14KPZozQ0cAGZR7/379IsCymSTkd2LzM3c6c5k4Cgz0Ctlv78vid/1vtHZNCk +XeOlIFU6he1UU3ldsq7eyJ9+rm9RwQV9RvV4OgQUBgcZUtegjKQCJL1vGSJZQSqV +US2P43gbNcyBozypbW9C5KZBdeyIKes6mofA+E1zlkBzxMstg1xRRICwssn2PqB4 +uzxM1oh5b4uCY09XPKHe/OJ15R62xTNBnHqQIo9LrKh5UjYt1GIlMUOIxV15GGKY +iQIcBBABCgAGBQJVthI5AAoJEJ2q3ByfzILQDZIQAMLQ+f3ZUnxHd08EuelCZ0p+ +JD4/aAi6c/6j+hx7qSKTtMVslsRut12lsLmhY7UwZbJjxQXqREEEothe0gQwmb9W +elvs2TLcnFRCA/HBdVd9S0AmwRJFPBemqImtSe8f3R+J2EBfcwiK6MPSf3QxyAMz +is26dzFy24lMRii4zczZLYJg71w75Y/7GBf6ps6gp+X18wxKsypLntL0uo6MOM63 +Qr4fGD1OpA/Lh08d+mdVkR+GPemoY6p71zWjyqzgV4bwdmNGut5BdT0z9r0kqEbb +DkEQJnAeFCcyVMvs44YrKSZWwssrMnyHfdiXy9twO1H3CzXOelhAYJeDAf5rro0T ++Pzc/hJIy3NryBEtS02/J0F5g8utl5K2bG4WtjUSamDDoCQACPJOkOoR4QXCF2/m +e84tD6g9uVSg9A2sdHLt3swi/VeVvODj28x8flqU5tGE0Jtk/o2tMj3B4wdoSIjZ +Qm92vTrHDt4bxBlMkfZ7tD98WeZFFDd8yfNymTlsQLOnHuosRXtH0AL9Z5CJT48d +EDyiDRiOnprEnuAvRk00AlAixd/ktLOz200bX5WK+8xX9w/p6IVyodNCA79xAa3Z +qdEnc/oVDVBV9UD0kqDWyFoW4lU/ENZMHaSUFGkoL5mv4fWiLhn5Nqu8lhie+WWE +8rIXFFrji0qLbWvHUTheiQIcBBMBCgAGBQJUbHLbAAoJEODyhZOu6tFRzMEP/i+b +QDKBSj6DpdGQr7AbeccJ/cMX2WLhyWcCKpEttvvu3g9UhqcWezdjd3lJVtYAX7zE +iae4Is1BUnAZW3gzRB8IO3NCGipc9QD9Wu3DbSY6xLG0w2GvDz9w4E3CNijN3TN0 +8SLXqxDxEyz2CHXCI1iNPEbVtnaOCU8u6RhYaQqMwJcb3KrNZi8mx7JhEgMmWXmZ +ZuzjH5Yp3NoW9ZXLBWYMMUZqcCM3/oyWVIR4p4l+Yrjh0hYMdNoQeZGO6p9BC6wK +zZq5pa+d8pXV/y5K6tlox1y2ehIHTBwpDacbpEjXPZtCl4xMlxaqJNrbUQ8/dE+0 +xTDHa1EL4HYlWCHSLjllFAYxDpXR6YPWgvTi6vEFNX0vW3nkiyC0FIG3kxAn0v5o +yql2NNTq1rThE+Nol6YcUh30zsA20a+xsx+8U5Fbgtlf1R+0+mGSJ++2OCQVb5U0 +lnuwH5f+d6+cbz2MshmTi2v13+WvoICMH21Oiy3GsL4C2GTm2kn8lU1eqSCb+mlc +x04Vt7c4RBJJsuk222MaL86huebuW9v0oZJff6SpuHKPBGCFjCt9yVjWprDLPTx0 +RBrwEmrOIeIAWOiTMa4j+MIEkB8ezLHLBWh394tuIpX79TITkqP4ICX6V6NWXTk4 +7dK5Ib+BLmMLAZ9+sRfq1gWRU7h0+NI8o1qdgiI3iEYEExECAAYFAlW2FxAACgkQ +iPPPTCLX9uzl5ACeOPjk/yuoEoWmBvl5hwZjH9vAT88An0yreBBhX0ZDB12Ijxnh +rVsDe+6oiQEcBBMBCAAGBQJVthb/AAoJEHkD+BGQkQqDmMsH/3/EDrxaNbCovO3v +itAcY57nUehtJF06sLqJcoULKsqo3O3bdNxz3xCumyQua1qdwAjSqPHyriN7va6g +wR1eynM9CQJcnkrgMo31Im07J3uO7Ut2kPCUI8vpH9rQOYipn75K6DRCrXa8k0zj +p/+A4wRDXMp4aVWqhjEiR+j2PDQHLp2KfGsACmkCAgdSh6e4icTjqNdcdjHWBK14 +wpN5Ktq5ZVUpiJB3kr9MwEHShRHLmJlxF8M/IDpJpsXzus4kWq0UrYc66E6MuA8W +Shysv2c/Pqq24FYi88wxnom8+9EprwzHCJiNInT+vRbwyyKA7mKfMu+4WfdCtHWN +oFrFBKeJASIEEwEKAAwFAll0qxEFgweGH4AACgkQ7XRIilcH5murJgf9E0PrLRuj +98dNIma932TeWcXpcJ8SPNdywYL0zds3bUf31vqYoNDi5txFtkA+qK/JWVtiVOnd +chEO/y+fW0XEU1NQueKl5S3MijJlfzOVUbXT6uVGUULa2u6sZKm0LqQzifAld9VB +L457XMa3
svn commit: r23402 [1/2] - /dev/incubator/edgent/KEYS
Author: cdutz Date: Wed Dec 6 08:18:34 2017 New Revision: 23402 Log: Added gpg public key for cd...@apache.org Modified: dev/incubator/edgent/KEYS
svn commit: r23404 - in /dev/incubator/edgent/1.2.0-incubating: ./ rc1/
Author: cdutz Date: Wed Dec 6 08:35:51 2017 New Revision: 23404 Log: Added RC1 for Edgent 1.2.0-incubating Added: dev/incubator/edgent/1.2.0-incubating/ dev/incubator/edgent/1.2.0-incubating/rc1/ dev/incubator/edgent/1.2.0-incubating/rc1/LICENSE dev/incubator/edgent/1.2.0-incubating/rc1/README dev/incubator/edgent/1.2.0-incubating/rc1/RELEASE_NOTES dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz (with props) dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.asc dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.md5 dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 Added: dev/incubator/edgent/1.2.0-incubating/rc1/LICENSE == --- dev/incubator/edgent/1.2.0-incubating/rc1/LICENSE (added) +++ dev/incubator/edgent/1.2.0-incubating/rc1/LICENSE Wed Dec 6 08:35:51 2017 @@ -0,0 +1,239 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-cha
svn commit: r23405 - /dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1
Author: cdutz Date: Wed Dec 6 08:46:51 2017 New Revision: 23405 Log: Updated the SHA1 hash to a 512 bit long version Modified: dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 Modified: dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 == --- dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 (original) +++ dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 Wed Dec 6 08:46:51 2017 @@ -1 +1 @@ -7d4616eefc90786c11388c166fc2620e43dfb857 \ No newline at end of file +1f28479aa1e7fef04a570e266b5f04d4ee460c8cbe527cf4059d431212b0728b55addb10a33010ebc4fec1095bf52dfbf594028cf89b3da92504ab85180ee964 ?apache-edgent-1.2.0-incubating-source-release.tar.gz \ No newline at end of file
svn commit: r23406 - /dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1
Author: cdutz Date: Wed Dec 6 08:50:26 2017 New Revision: 23406 Log: Updated the SHA1 hash to omit the file name Modified: dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 Modified: dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 == --- dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 (original) +++ dev/incubator/edgent/1.2.0-incubating/rc1/apache-edgent-1.2.0-incubating-source-release.tar.gz.sha1 Wed Dec 6 08:50:26 2017 @@ -1 +1 @@ -1f28479aa1e7fef04a570e266b5f04d4ee460c8cbe527cf4059d431212b0728b55addb10a33010ebc4fec1095bf52dfbf594028cf89b3da92504ab85180ee964 ?apache-edgent-1.2.0-incubating-source-release.tar.gz \ No newline at end of file +1f28479aa1e7fef04a570e266b5f04d4ee460c8cbe527cf4059d431212b0728b55addb10a33010ebc4fec1095bf52dfbf594028cf89b3da92504ab85180ee964 \ No newline at end of file
