You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@edgent.apache.org by cd...@apache.org on 2017/11/21 11:51:16 UTC
[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 <dl...@us.ibm.com>
Authored: Mon Oct 16 14:39:58 2017 -0400
Committer: Dale LaBossiere <dl...@us.ibm.com>
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">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-apps</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Apps</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Apps</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
@@ -84,7 +67,7 @@
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
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..0000000
--- 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">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Connectors</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Connectors</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
@@ -89,7 +72,7 @@
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/console/pom.xml
----------------------------------------------------------------------
diff --git a/console/pom.xml b/console/pom.xml
index 52961e5..dfd35c5 100644
--- a/console/pom.xml
+++ b/console/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">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-console</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Console</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Console</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Platforms and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.console</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/apps/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/apps/pom.xml b/platforms/java7/apps/pom.xml
deleted file mode 100644
index 6a81391..0000000
--- a/platforms/java7/apps/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-apps</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Apps</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
- <artifactId>edgent-samples-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/connectors/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/connectors/pom.xml b/platforms/java7/connectors/pom.xml
deleted file mode 100644
index b8c4341..0000000
--- a/platforms/java7/connectors/pom.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-connectors</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Connectors</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-mqtt</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-kafka</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-jdbc</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-serial</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-file</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
- <artifactId>edgent-samples-topology</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/console/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/console/pom.xml b/platforms/java7/console/pom.xml
deleted file mode 100644
index f2ec5c7..0000000
--- a/platforms/java7/console/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-console</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Console</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
- <artifactId>edgent-console-server</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
- <artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml
deleted file mode 100644
index a27a837..0000000
--- a/platforms/java7/pom.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent.samples.platforms</groupId>
- <artifactId>edgent-samples-platforms</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <packaging>pom</packaging>
-
- <name>Apache Edgent${samples.projname.platform}: Samples</name>
-
- <properties>
- <edgent.base.groupId>org.apache.edgent.java7</edgent.base.groupId>
- </properties>
-
- <modules>
- <module>apps</module>
- <module>connectors</module>
- <module>console</module>
- <module>scenarios</module>
- <module>topology</module>
- <module>utils</module>
- </modules>
-
- <build>
- <plugins>
- <!-- Convert the Java8 classes to Java7 classes -->
- <plugin>
- <groupId>net.orfjackal.retrolambda</groupId>
- <artifactId>retrolambda-maven-plugin</artifactId>
- <version>2.5.1</version>
- <executions>
- <execution>
- <goals>
- <goal>process-main</goal>
- <goal>process-test</goal>
- </goals>
- <configuration>
- <!-- I was getting random failures if not running retrolambda in a separate process -->
- <fork>true</fork>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*Test.class</include>
- </includes>
- <testClassesDirectory>${project.build.testOutputDirectory}</testClassesDirectory>
- </configuration>
- </plugin>
- <!-- Check artifacts against Java7 signatures -->
- <!--
- Let the plugin run in the process-test-classes so we immediately know if
- test run problems could be related to using APIs unavailable to Java7.
- -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.15</version>
- <executions>
- <execution>
- <id>check-jdk-signatures</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java17</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <!-- Additionally build the binary distribution package. -->
- <profile>
- <id>distribution</id>
- <modules>
- <module>distribution</module>
- </modules>
- </profile>
- <!-- Switch all default plugins to use Java7 instead of Java8 -->
- <profile>
- <id>toolchain</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-toolchains-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>toolchain</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <toolchains>
- <jdk>
- <version>1.7</version>
- <vendor>oracle</vendor>
- </jdk>
- </toolchains>
- </configuration>
- </plugin>
- <!--
- The retrolambda plugin requires Java 8 to operate, but we set the toolchain
- to Java 7. Therefore we need to provide a path to the Java 8 home directory.
- This check ensures this property is set and provides an understandable error
- message.
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
- <executions>
- <execution>
- <id>enforce-property</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>java8.home</property>
- <message>The retrolambda-maven-plugin requires a path to Java 8. You must set a 'java8.home' property!</message>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>net.orfjackal.retrolambda</groupId>
- <artifactId>retrolambda-maven-plugin</artifactId>
- <version>2.5.1</version>
- <executions>
- <execution>
- <configuration>
- <java8home>${java8.home}</java8home>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/scenarios/pom.xml b/platforms/java7/scenarios/pom.xml
deleted file mode 100644
index ae6a18f..0000000
--- a/platforms/java7/scenarios/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-scenarios</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Scenarios</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>license-check</id>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes combine.children="append">
- <exclude>src/main/resources/**/*.cfg</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.connectors</groupId>
- <artifactId>edgent-connectors-iotp</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
- <artifactId>edgent-samples-connectors</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.pi4j</groupId>
- <artifactId>pi4j-core</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/topology/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/topology/pom.xml b/platforms/java7/topology/pom.xml
deleted file mode 100644
index 91cb6e6..0000000
--- a/platforms/java7/topology/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-topology</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Topology</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-math3</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
- <artifactId>edgent-samples-utils</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/java7/utils/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/java7/utils/pom.xml b/platforms/java7/utils/pom.xml
deleted file mode 100644
index ef1242e..0000000
--- a/platforms/java7/utils/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <!-- DO NOT EDIT - GENERATED BY update_platform_poms.sh -->
-
- <parent>
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.java7.samples</groupId>
- <artifactId>edgent-samples-utils</artifactId>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Utils</name>
-
- <dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${edgent.base.groupId}.utils</groupId>
- <artifactId>edgent-utils-metrics</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.analytics</groupId>
- <artifactId>edgent-analytics-sensors</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.console</groupId>
- <artifactId>edgent-console-server</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-math3</artifactId>
- <version>3.4.1</version>
- </dependency>
- </dependencies>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/platforms/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/pom.xml b/platforms/pom.xml
deleted file mode 100644
index d47411c..0000000
--- a/platforms/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.edgent.samples</groupId>
- <artifactId>edgent-samples</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.edgent.samples.platforms</groupId>
- <artifactId>edgent-samples-platforms</artifactId>
- <packaging>pom</packaging>
-
- <name>Apache Edgent${samples.projname.platform}: Samples: Platforms</name>
-
- <profiles>
- <profile>
- <id>platform-java7</id>
- <modules>
- <module>java7</module>
- </modules>
- <properties>
- <platform.java7>true</platform.java7>
- <samples.projname.platform> (Java 7)</samples.projname.platform>
- </properties>
- </profile>
- <profile>
- <id>platform-android</id>
- <modules>
- <module>android</module>
- </modules>
- <properties>
- <platform.android>true</platform.android>
- <samples.projname.platform> (Android)</samples.projname.platform>
- </properties>
- </profile>
- </profiles>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8bb8727..60c3d06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,8 @@
<properties>
<samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* -->
- <edgent.base.groupId>org.apache.edgent</edgent.base.groupId>
+ <edgent.platform/> <!-- set by -Pplatform-* -->
+ <edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId>
<!-- at least for now, the samples version is lockstep with the core -->
<edgent.core.version>${project.version}</edgent.core.version>
@@ -58,8 +59,38 @@
<module>scenarios</module>
<module>topology</module>
<module>utils</module>
- <module>platforms</module>
</modules>
+
+ <profiles>
+ <profile>
+ <id>platform-java7</id>
+ <properties>
+ <edgent.platform>.java7</edgent.platform>
+ <platform.java7>true</platform.java7>
+ <samples.projname.platform> (Java 7)</samples.projname.platform>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.orfjackal.retrolambda</groupId>
+ <artifactId>retrolambda-maven-plugin</artifactId>
+ <version>${retrolambda.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process-main</goal>
+ <goal>process-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <!-- We don't currently support building samples for Android as many
+ depend on the Development provider / Edgent Console
+ -->
+ </profiles>
<dependencies>
<!--
@@ -81,11 +112,23 @@
<scope>runtime</scope>
</dependency>
- <!-- each sample module declares its own (platform specific) Edgent dependencies, etc -->
- <!-- HEADS UP, NO PLATFORM SPECIFIC EDGENT DEPS HERE
- at they will be inherited by other platform specific
- projects - which will cause problems.
- -->
+ <!-- Other common sample dependencies -->
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-direct</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-development</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${edgent.base.groupId}.providers</groupId>
+ <artifactId>edgent-providers-iot</artifactId>
+ <version>${edgent.core.version}</version>
+ </dependency>
+
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/scenarios/pom.xml
----------------------------------------------------------------------
diff --git a/scenarios/pom.xml b/scenarios/pom.xml
index c7bab58..31ce2fa 100644
--- a/scenarios/pom.xml
+++ b/scenarios/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">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,7 +30,7 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-scenarios</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Scenarios</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Scenarios</name>
<build>
<plugins>
@@ -58,22 +56,7 @@
</build>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.connectors</groupId>
@@ -87,7 +70,7 @@
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-connectors</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/topology/pom.xml
----------------------------------------------------------------------
diff --git a/topology/pom.xml b/topology/pom.xml
index a47dbd6..5259752 100644
--- a/topology/pom.xml
+++ b/topology/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">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-topology</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Topology</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Topology</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.analytics</groupId>
@@ -59,7 +42,7 @@
</dependency>
<dependency>
- <groupId>${edgent.base.groupId}.samples</groupId>
+ <groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/e1812af8/utils/pom.xml
----------------------------------------------------------------------
diff --git a/utils/pom.xml b/utils/pom.xml
index a208120..523a1ae 100644
--- a/utils/pom.xml
+++ b/utils/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">
<modelVersion>4.0.0</modelVersion>
- <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER -->
-
<parent>
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples</artifactId>
@@ -32,25 +30,10 @@
<groupId>org.apache.edgent.samples</groupId>
<artifactId>edgent-samples-utils</artifactId>
- <name>Apache Edgent${samples.projname.platform}: Samples: Utils</name>
+ <name>Apache Edgent Samples${samples.projname.platform}: Utils</name>
<dependencies>
- <!-- parent pom has SLF4J dependencies -->
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-direct</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-development</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
- <dependency>
- <groupId>${edgent.base.groupId}.providers</groupId>
- <artifactId>edgent-providers-iot</artifactId>
- <version>${edgent.core.version}</version>
- </dependency>
+ <!-- parent pom has Providers and SLF4J dependencies -->
<dependency>
<groupId>${edgent.base.groupId}.utils</groupId>