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 <dlab...@us.ibm.com> Authored: Wed Oct 11 15:35:50 2017 -0400 Committer: Dale LaBossiere <dlab...@us.ibm.com> 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";> <modelVersion>4.0.0</modelVersion> + <!-- UPDATE_PLATFORM_POMS_MSG_PLACEHOLDER --> + <parent> <groupId>org.apache.edgent.samples</groupId> <artifactId>edgent-samples</artifactId> <version>1.2.0-SNAPSHOT</version> </parent> - - <groupId>${edgent.base.groupId}.samples</groupId> + + <groupId>org.apache.edgent.samples</groupId> <artifactId>edgent-samples-apps</artifactId> - <name>Apache Edgent: Samples: Apps</name> + <name>Apache Edgent${samples.projname.platform}: Samples: Apps</name> <dependencies> - <!-- parent pom has Edgent provider and SLF4J 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>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-file</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.analytics</groupId> <artifactId>edgent-analytics-math3</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-iot</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-iotp</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-mqtt</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> + <dependency> <groupId>${edgent.base.groupId}.samples</groupId> <artifactId>edgent-samples-utils</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> 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 0000000..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 ---------------------------------------------------------------------- diff --git a/connectors/pom.xml b/connectors/pom.xml index d57b618..9f293c8 100644 --- a/connectors/pom.xml +++ b/connectors/pom.xml @@ -21,60 +21,77 @@ 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> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>${edgent.base.groupId}.samples</groupId> + <groupId>org.apache.edgent.samples</groupId> <artifactId>edgent-samples-connectors</artifactId> - <name>Apache Edgent: Samples: Connectors</name> + <name>Apache Edgent${samples.projname.platform}: Samples: Connectors</name> <dependencies> - <!-- parent pom has Edgent provider and SLF4J 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>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-kafka</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-jdbc</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-serial</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-file</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-iotp</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.analytics</groupId> <artifactId>edgent-analytics-math3</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.samples</groupId> <artifactId>edgent-samples-topology</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/console/pom.xml ---------------------------------------------------------------------- diff --git a/console/pom.xml b/console/pom.xml index 4bde53f..52961e5 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -21,29 +21,46 @@ 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> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>${edgent.base.groupId}.samples</groupId> + <groupId>org.apache.edgent.samples</groupId> <artifactId>edgent-samples-console</artifactId> - <name>Apache Edgent: Samples: Console</name> + <name>Apache Edgent${samples.projname.platform}: Samples: Console</name> <dependencies> - <!-- parent pom has Edgent provider and SLF4J 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>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.utils</groupId> <artifactId>edgent-utils-metrics</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/platforms/java7/apps/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/apps/pom.xml b/platforms/java7/apps/pom.xml new file mode 100644 index 0000000..6a81391 --- /dev/null +++ b/platforms/java7/apps/pom.xml @@ -0,0 +1,93 @@ +<?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/ab768c46/platforms/java7/connectors/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/connectors/pom.xml b/platforms/java7/connectors/pom.xml new file mode 100644 index 0000000..b8c4341 --- /dev/null +++ b/platforms/java7/connectors/pom.xml @@ -0,0 +1,98 @@ +<?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/ab768c46/platforms/java7/console/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/console/pom.xml b/platforms/java7/console/pom.xml new file mode 100644 index 0000000..f2ec5c7 --- /dev/null +++ b/platforms/java7/console/pom.xml @@ -0,0 +1,67 @@ +<?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/ab768c46/platforms/java7/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/pom.xml b/platforms/java7/pom.xml new file mode 100644 index 0000000..a27a837 --- /dev/null +++ b/platforms/java7/pom.xml @@ -0,0 +1,186 @@ +<?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/ab768c46/platforms/java7/scenarios/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/scenarios/pom.xml b/platforms/java7/scenarios/pom.xml new file mode 100644 index 0000000..ae6a18f --- /dev/null +++ b/platforms/java7/scenarios/pom.xml @@ -0,0 +1,102 @@ +<?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/ab768c46/platforms/java7/topology/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/topology/pom.xml b/platforms/java7/topology/pom.xml new file mode 100644 index 0000000..91cb6e6 --- /dev/null +++ b/platforms/java7/topology/pom.xml @@ -0,0 +1,68 @@ +<?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/ab768c46/platforms/java7/utils/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/java7/utils/pom.xml b/platforms/java7/utils/pom.xml new file mode 100644 index 0000000..ef1242e --- /dev/null +++ b/platforms/java7/utils/pom.xml @@ -0,0 +1,78 @@ +<?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/ab768c46/platforms/pom.xml ---------------------------------------------------------------------- diff --git a/platforms/pom.xml b/platforms/pom.xml new file mode 100644 index 0000000..d47411c --- /dev/null +++ b/platforms/pom.xml @@ -0,0 +1,59 @@ +<?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/ab768c46/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 966abf8..d63493a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,12 +32,12 @@ <version>1.2.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Apache Edgent: Samples</name> + <name>Apache Edgent${samples.projname.platform}: Samples</name> <properties> - <edgent.platform/> <!-- set by -Pplatform-* --> - <edgent.base.groupId>org.apache.edgent${edgent.platform}</edgent.base.groupId> - <edgent.version>1.2.0-SNAPSHOT</edgent.version> + <samples.projname.platform> (Java 8)</samples.projname.platform> <!-- tweaked by -Pplatform-* --> + <edgent.base.groupId>org.apache.edgent</edgent.base.groupId> + <edgent.core.version>1.2.0-SNAPSHOT</edgent.core.version> <java.version>1.8</java.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -57,6 +57,7 @@ <module>scenarios</module> <module>topology</module> <module>utils</module> + <module>platforms</module> </modules> <dependencies> @@ -79,150 +80,12 @@ <scope>runtime</scope> </dependency> - <!-- the Edgent provider(s) being used --> - <dependency> - <groupId>${edgent.base.groupId}.providers</groupId> - <artifactId>edgent-providers-direct</artifactId> - <version>${edgent.version}</version> - </dependency> - <dependency> - <groupId>${edgent.base.groupId}.providers</groupId> - <artifactId>edgent-providers-development</artifactId> - <version>${edgent.version}</version> - </dependency> - <dependency> - <groupId>${edgent.base.groupId}.providers</groupId> - <artifactId>edgent-providers-iot</artifactId> - <version>${edgent.version}</version> - </dependency> - <!-- each sample module declares its own connector dependencies, etc --> - </dependencies> - - <profiles> - <!-- - This defines a self-activating profile which is only enabled for - for projects that have a src/main/java directory (effectivley excludes - it from the current pom module. + <!-- 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. --> - <!--profile> - <id>generate-classpath</id> - <activation> - <file> - <exists>src/main/java</exists> - </file> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>dump-dependency-tree</id> - <phase>generate-resources</phase> - <goals> - <goal>tree</goal> - </goals> - <configuration> - <outputFile>${project.build.directory}/dependency-tree.graphml</outputFile> - <outputType>graphml</outputType> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xml-maven-plugin</artifactId> - <version>1.0.1</version> - <executions> - <execution> - <id>transform-dependency-tree</id> - <goals> - <goal>transform</goal> - </goals> - <configuration> - <transformationSets> - <transformationSet> - <file>${project.build.directory}/dependency-tree.graphml</file> - <stylesheet>${project.basedir}/../src/main/xslt/classpath.xsl</stylesheet> - <parameters> - <parameter> - <name>groupId</name> - <value>${project.groupId}</value> - </parameter> - <parameter> - <name>artifactId</name> - <value>${project.artifactId}</value> - </parameter> - <parameter> - <name>version</name> - <value>${project.version}</value> - </parameter> - </parameters> - </transformationSet> - </transformationSets> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile--> - - <profile> - <id>platform-java7</id> - <properties> - <platform.java7>true</platform.java7> - <edgent.platform>.java7</edgent.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> - <!-- Currently, many samples use the DevelopmentProvider, - which doesn't exist for the android platform. - For now don't support building/running the - samples for that context. - --> - <!--profile> - <id>platform-android</id> - <properties> - <platform.android>true</platform.android> - <edgent.platform>.android</edgent.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--> - </profiles> + </dependencies> <build> <pluginManagement> http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/scenarios/pom.xml ---------------------------------------------------------------------- diff --git a/scenarios/pom.xml b/scenarios/pom.xml index cba1c78..c7bab58 100644 --- a/scenarios/pom.xml +++ b/scenarios/pom.xml @@ -21,16 +21,18 @@ 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> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>${edgent.base.groupId}.samples</groupId> + <groupId>org.apache.edgent.samples</groupId> <artifactId>edgent-samples-scenarios</artifactId> - <name>Apache Edgent: Samples: Scenarios</name> + <name>Apache Edgent${samples.projname.platform}: Samples: Scenarios</name> <build> <plugins> @@ -56,24 +58,40 @@ </build> <dependencies> - <!-- parent pom has Edgent provider and SLF4J 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>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.analytics</groupId> <artifactId>edgent-analytics-math3</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.samples</groupId> <artifactId>edgent-samples-connectors</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> + <dependency> <groupId>com.pi4j</groupId> <artifactId>pi4j-core</artifactId> http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/template/pom.xml ---------------------------------------------------------------------- diff --git a/template/pom.xml b/template/pom.xml index fd8e7d4..ab67e31 100644 --- a/template/pom.xml +++ b/template/pom.xml @@ -89,12 +89,12 @@ <!--dependency> <groupId>${edgent.base.groupId}.android</groupId> <artifactId>edgent-android-hardware</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!--dependency> <groupId>${edgent.base.groupId}.android</groupId> <artifactId>edgent-android-topology</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!-- declare Edgent Analytics dependencies @@ -102,12 +102,12 @@ <!--dependency> <groupId>${edgent.base.groupId}.analytics</groupId> <artifactId>edgent-analytics-math3</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!--dependency> <groupId>${edgent.base.groupId}.analytics</groupId> <artifactId>edgent-analytics-sensors</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!-- declare Edgent Utils dependencies @@ -115,7 +115,7 @@ <!--dependency> <groupId>${edgent.base.groupId}.utils</groupId> <artifactId>edgent-utils-metrics</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!-- declare Edgent Connector dependencies @@ -123,37 +123,37 @@ <!--dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-file</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!--dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-iot</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!--dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-iotp</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!--dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-jdbc</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!--dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-kafka</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!--dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-mqtt</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> <!--dependency> <groupId>${edgent.base.groupId}.connectors</groupId> <artifactId>edgent-connectors-serial</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${edgent.version}</version> </dependency--> </dependencies> @@ -178,6 +178,9 @@ <goal>process-main</goal> <goal>process-test</goal> </goals> + <configuration> + <fork>true</fork> + </configuration> </execution> </executions> </plugin> @@ -203,6 +206,9 @@ <goal>process-main</goal> <goal>process-test</goal> </goals> + <configuration> + <fork>true</fork> + </configuration> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/topology/pom.xml ---------------------------------------------------------------------- diff --git a/topology/pom.xml b/topology/pom.xml index 7dd9df3..a47dbd6 100644 --- a/topology/pom.xml +++ b/topology/pom.xml @@ -21,29 +21,47 @@ 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> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>${edgent.base.groupId}.samples</groupId> + <groupId>org.apache.edgent.samples</groupId> <artifactId>edgent-samples-topology</artifactId> - <name>Apache Edgent: Samples: Topology</name> + <name>Apache Edgent${samples.projname.platform}: Samples: Topology</name> <dependencies> - <!-- parent pom has Edgent provider and SLF4J 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>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> + <dependency> <groupId>${edgent.base.groupId}.samples</groupId> <artifactId>edgent-samples-utils</artifactId> - <version>1.2.0-SNAPSHOT</version> + <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/incubator-edgent-samples/blob/ab768c46/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 45bb1dd..a208120 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,40 +21,58 @@ 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> <version>1.2.0-SNAPSHOT</version> </parent> - <groupId>${edgent.base.groupId}.samples</groupId> + <groupId>org.apache.edgent.samples</groupId> <artifactId>edgent-samples-utils</artifactId> - <name>Apache Edgent: Samples: Utils</name> + <name>Apache Edgent${samples.projname.platform}: Samples: Utils</name> <dependencies> - <!-- parent pom has Edgent provider and SLF4J 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>1.2.0-SNAPSHOT</version> + <version>${edgent.core.version}</version> </dependency> <dependency> <groupId>${edgent.base.groupId}.analytics</groupId> <artifactId>edgent-analytics-sensors</artifactId> - <version>1.2.0-SNAPSHOT</version> + <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> - <dependency> - <groupId>${edgent.base.groupId}.console</groupId> - <artifactId>edgent-console-server</artifactId> - <version>1.2.0-SNAPSHOT</version> - </dependency> </dependencies> </project>
