Fixed the build problem after API refactoring.
diff --git a/apps/iot/pom.xml b/apps/iot/pom.xml
index 0763ee8..595ef23 100644
--- a/apps/iot/pom.xml
+++ b/apps/iot/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/apps/runtime/pom.xml b/apps/runtime/pom.xml
index d558903..dbbd93b 100644
--- a/apps/runtime/pom.xml
+++ b/apps/runtime/pom.xml
@@ -33,7 +33,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/analytics/math3/pom.xml b/platforms/android/analytics/math3/pom.xml
index 045c1df..5bff3d0 100644
--- a/platforms/android/analytics/math3/pom.xml
+++ b/platforms/android/analytics/math3/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/analytics/sensors/pom.xml b/platforms/android/analytics/sensors/pom.xml
index 08f5cb7..5dffef6 100644
--- a/platforms/android/analytics/sensors/pom.xml
+++ b/platforms/android/analytics/sensors/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/android/hardware/pom.xml b/platforms/android/android/hardware/pom.xml
index c832ccb..a0f9442 100644
--- a/platforms/android/android/hardware/pom.xml
+++ b/platforms/android/android/hardware/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/android/topology/pom.xml b/platforms/android/android/topology/pom.xml
index 0a54f06..1ad691e 100644
--- a/platforms/android/android/topology/pom.xml
+++ b/platforms/android/android/topology/pom.xml
@@ -37,12 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-oplet</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/api/execution/pom.xml b/platforms/android/api/execution/pom.xml
deleted file mode 100644
index 578b824..0000000
--- a/platforms/android/api/execution/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>
-
- <parent>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-execution</artifactId>
-
- <name>Apache Edgent (Android): API: Execution</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/android/api/function/pom.xml b/platforms/android/api/function/pom.xml
deleted file mode 100644
index 97379ba..0000000
--- a/platforms/android/api/function/pom.xml
+++ /dev/null
@@ -1,66 +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.android</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-function</artifactId>
-
- <name>Apache Edgent (Android): API: Function</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/platforms/android/api/graph/pom.xml b/platforms/android/api/graph/pom.xml
deleted file mode 100644
index c9cb18a..0000000
--- a/platforms/android/api/graph/pom.xml
+++ /dev/null
@@ -1,74 +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.android</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-graph</artifactId>
-
- <name>Apache Edgent (Android): API: Graph</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/android/api/oplet/pom.xml b/platforms/android/api/oplet/pom.xml
deleted file mode 100644
index 62f4e80..0000000
--- a/platforms/android/api/oplet/pom.xml
+++ /dev/null
@@ -1,84 +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.android</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-oplet</artifactId>
-
- <name>Apache Edgent (Android): API: Oplet</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-window</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/android/api/pom.xml b/platforms/android/api/pom.xml
index fb66045..1d6cd9d 100644
--- a/platforms/android/api/pom.xml
+++ b/platforms/android/api/pom.xml
@@ -27,17 +27,48 @@
</parent>
<artifactId>edgent-api</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>Apache Edgent (Android): API</name>
- <modules>
- <module>execution</module>
- <module>function</module>
- <module>graph</module>
- <module>oplet</module>
- <module>topology</module>
- <module>window</module>
- </modules>
+ <properties>
+ <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent.java7</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/platforms/android/api/topology/pom.xml b/platforms/android/api/topology/pom.xml
deleted file mode 100644
index 4b5cf1e..0000000
--- a/platforms/android/api/topology/pom.xml
+++ /dev/null
@@ -1,89 +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.android</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-topology</artifactId>
-
- <name>Apache Edgent (Android): API: Topology</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-graph</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/android/api/window/pom.xml b/platforms/android/api/window/pom.xml
deleted file mode 100644
index e1030be..0000000
--- a/platforms/android/api/window/pom.xml
+++ /dev/null
@@ -1,74 +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.android</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-window</artifactId>
-
- <name>Apache Edgent (Android): API: Window</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/android/apps/iot/pom.xml b/platforms/android/apps/iot/pom.xml
index 80d1b39..f5e2bb7 100644
--- a/platforms/android/apps/iot/pom.xml
+++ b/platforms/android/apps/iot/pom.xml
@@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/apps/runtime/pom.xml b/platforms/android/apps/runtime/pom.xml
index 2aa615a..88daa47 100644
--- a/platforms/android/apps/runtime/pom.xml
+++ b/platforms/android/apps/runtime/pom.xml
@@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/connectors/command/pom.xml b/platforms/android/connectors/command/pom.xml
index 67248cb..c003d49 100644
--- a/platforms/android/connectors/command/pom.xml
+++ b/platforms/android/connectors/command/pom.xml
@@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/connectors/common/pom.xml b/platforms/android/connectors/common/pom.xml
index 5665c69..2e53a35 100644
--- a/platforms/android/connectors/common/pom.xml
+++ b/platforms/android/connectors/common/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/connectors/file/pom.xml b/platforms/android/connectors/file/pom.xml
index 430c9ee..038e004 100644
--- a/platforms/android/connectors/file/pom.xml
+++ b/platforms/android/connectors/file/pom.xml
@@ -66,17 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/connectors/http/pom.xml b/platforms/android/connectors/http/pom.xml
index 8d9bdea..5f0717b 100644
--- a/platforms/android/connectors/http/pom.xml
+++ b/platforms/android/connectors/http/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/connectors/iot/pom.xml b/platforms/android/connectors/iot/pom.xml
index 4f3dd05..e24509d 100644
--- a/platforms/android/connectors/iot/pom.xml
+++ b/platforms/android/connectors/iot/pom.xml
@@ -66,12 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/connectors/iotp/pom.xml b/platforms/android/connectors/iotp/pom.xml
index 15e05d4..a9f5265 100644
--- a/platforms/android/connectors/iotp/pom.xml
+++ b/platforms/android/connectors/iotp/pom.xml
@@ -66,12 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/connectors/jdbc/pom.xml b/platforms/android/connectors/jdbc/pom.xml
index eec93cd..d73e4c2 100644
--- a/platforms/android/connectors/jdbc/pom.xml
+++ b/platforms/android/connectors/jdbc/pom.xml
@@ -66,12 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/connectors/kafka/pom.xml b/platforms/android/connectors/kafka/pom.xml
index 2aa3e6c..fa85a5c 100644
--- a/platforms/android/connectors/kafka/pom.xml
+++ b/platforms/android/connectors/kafka/pom.xml
@@ -80,7 +80,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/connectors/mqtt/pom.xml b/platforms/android/connectors/mqtt/pom.xml
index ce4081e..f1323ab 100644
--- a/platforms/android/connectors/mqtt/pom.xml
+++ b/platforms/android/connectors/mqtt/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/connectors/pubsub/pom.xml b/platforms/android/connectors/pubsub/pom.xml
index 7d5d058..739752f 100644
--- a/platforms/android/connectors/pubsub/pom.xml
+++ b/platforms/android/connectors/pubsub/pom.xml
@@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/connectors/rabbitmq/pom.xml b/platforms/android/connectors/rabbitmq/pom.xml
index 7c47297..6be426a 100644
--- a/platforms/android/connectors/rabbitmq/pom.xml
+++ b/platforms/android/connectors/rabbitmq/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
diff --git a/platforms/android/connectors/serial/pom.xml b/platforms/android/connectors/serial/pom.xml
index 7988703..86503bc 100644
--- a/platforms/android/connectors/serial/pom.xml
+++ b/platforms/android/connectors/serial/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/connectors/websocket-base/pom.xml b/platforms/android/connectors/websocket-base/pom.xml
index 94e3ea2..1d7b404 100644
--- a/platforms/android/connectors/websocket-base/pom.xml
+++ b/platforms/android/connectors/websocket-base/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/providers/direct/pom.xml b/platforms/android/providers/direct/pom.xml
index d1d693f..d6ff129 100644
--- a/platforms/android/providers/direct/pom.xml
+++ b/platforms/android/providers/direct/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/runtime/appservice/pom.xml b/platforms/android/runtime/appservice/pom.xml
index ae21569..5efa39d 100644
--- a/platforms/android/runtime/appservice/pom.xml
+++ b/platforms/android/runtime/appservice/pom.xml
@@ -62,12 +62,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/runtime/etiao/pom.xml b/platforms/android/runtime/etiao/pom.xml
index e919fc3..3d0eb16 100644
--- a/platforms/android/runtime/etiao/pom.xml
+++ b/platforms/android/runtime/etiao/pom.xml
@@ -66,12 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-graph</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/android/runtime/jobregistry/pom.xml b/platforms/android/runtime/jobregistry/pom.xml
index f50eb40..37973b7 100644
--- a/platforms/android/runtime/jobregistry/pom.xml
+++ b/platforms/android/runtime/jobregistry/pom.xml
@@ -62,12 +62,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/runtime/jsoncontrol/pom.xml b/platforms/android/runtime/jsoncontrol/pom.xml
index 4c2fe28..01d43df 100644
--- a/platforms/android/runtime/jsoncontrol/pom.xml
+++ b/platforms/android/runtime/jsoncontrol/pom.xml
@@ -66,12 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-function</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/spi/graph/pom.xml b/platforms/android/spi/graph/pom.xml
index a9ac2e9..f88a3cf 100644
--- a/platforms/android/spi/graph/pom.xml
+++ b/platforms/android/spi/graph/pom.xml
@@ -66,12 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-graph</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/spi/topology/pom.xml b/platforms/android/spi/topology/pom.xml
index 49a5e30..cfdbb1f 100644
--- a/platforms/android/spi/topology/pom.xml
+++ b/platforms/android/spi/topology/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/utils/metrics/pom.xml b/platforms/android/utils/metrics/pom.xml
index 811a5ea..e2bd543 100644
--- a/platforms/android/utils/metrics/pom.xml
+++ b/platforms/android/utils/metrics/pom.xml
@@ -66,7 +66,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/android/utils/streamscope/pom.xml b/platforms/android/utils/streamscope/pom.xml
index c995081..e7d0772 100644
--- a/platforms/android/utils/streamscope/pom.xml
+++ b/platforms/android/utils/streamscope/pom.xml
@@ -62,7 +62,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.android</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/analytics/math3/pom.xml b/platforms/java7/analytics/math3/pom.xml
index e1a9a61..d059d91 100644
--- a/platforms/java7/analytics/math3/pom.xml
+++ b/platforms/java7/analytics/math3/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -109,7 +109,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/analytics/sensors/pom.xml b/platforms/java7/analytics/sensors/pom.xml
index 0b5def8..573baa7 100644
--- a/platforms/java7/analytics/sensors/pom.xml
+++ b/platforms/java7/analytics/sensors/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -104,7 +104,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/api/execution/pom.xml b/platforms/java7/api/execution/pom.xml
deleted file mode 100644
index 5d98c60..0000000
--- a/platforms/java7/api/execution/pom.xml
+++ /dev/null
@@ -1,97 +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.java7</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-execution</artifactId>
-
- <name>Apache Edgent (Java 7): API: Execution</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-test</id>
- <phase>test-compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/java7/api/function/pom.xml b/platforms/java7/api/function/pom.xml
deleted file mode 100644
index 446440c..0000000
--- a/platforms/java7/api/function/pom.xml
+++ /dev/null
@@ -1,85 +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.java7</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-function</artifactId>
-
- <name>Apache Edgent (Java 7): API: Function</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-test</id>
- <phase>test-compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/platforms/java7/api/graph/pom.xml b/platforms/java7/api/graph/pom.xml
deleted file mode 100644
index e3fe159..0000000
--- a/platforms/java7/api/graph/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>
-
- <parent>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-graph</artifactId>
-
- <name>Apache Edgent (Java 7): API: Graph</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-test</id>
- <phase>test-compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/java7/api/oplet/pom.xml b/platforms/java7/api/oplet/pom.xml
deleted file mode 100644
index 018c8fe..0000000
--- a/platforms/java7/api/oplet/pom.xml
+++ /dev/null
@@ -1,103 +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.java7</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-oplet</artifactId>
-
- <name>Apache Edgent (Java 7): API: Oplet</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-test</id>
- <phase>test-compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-window</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/java7/api/pom.xml b/platforms/java7/api/pom.xml
index 78e040e..0456073 100644
--- a/platforms/java7/api/pom.xml
+++ b/platforms/java7/api/pom.xml
@@ -27,17 +27,77 @@
</parent>
<artifactId>edgent-api</artifactId>
- <packaging>pom</packaging>
+ <packaging>jar</packaging>
<name>Apache Edgent (Java 7): API</name>
- <modules>
- <module>execution</module>
- <module>function</module>
- <module>graph</module>
- <module>oplet</module>
- <module>topology</module>
- <module>window</module>
- </modules>
+ <!--<modules>-->
+ <!--<module>execution</module>-->
+ <!--<module>function</module>-->
+ <!--<module>graph</module>-->
+ <!--<module>oplet</module>-->
+ <!--<module>topology</module>-->
+ <!--<module>window</module>-->
+ <!--</modules>-->
+
+ <properties>
+ <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources
+ </remote-resources-maven-plugin.remote-resources.dir>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <outputDirectory>${project.build.directory}/classes</outputDirectory>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-test</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/platforms/java7/api/topology/pom.xml b/platforms/java7/api/topology/pom.xml
deleted file mode 100644
index 152275d..0000000
--- a/platforms/java7/api/topology/pom.xml
+++ /dev/null
@@ -1,108 +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.java7</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-topology</artifactId>
-
- <name>Apache Edgent (Java 7): API: Topology</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-test</id>
- <phase>test-compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-graph</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/java7/api/window/pom.xml b/platforms/java7/api/window/pom.xml
deleted file mode 100644
index f221fb6..0000000
--- a/platforms/java7/api/window/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>
-
- <parent>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>edgent-api-window</artifactId>
-
- <name>Apache Edgent (Java 7): API: Window</name>
-
- <properties>
- <remote-resources-maven-plugin.remote-resources.dir>../../../../src/main/ibm-remote-resources</remote-resources-maven-plugin.remote-resources.dir>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
- <id>copy-test</id>
- <phase>test-compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.edgent</groupId>
- <artifactId>${project.artifactId}</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <outputDirectory>${project.build.directory}/test-classes</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/platforms/java7/apps/iot/pom.xml b/platforms/java7/apps/iot/pom.xml
index 612023e..51f94be 100644
--- a/platforms/java7/apps/iot/pom.xml
+++ b/platforms/java7/apps/iot/pom.xml
@@ -81,7 +81,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/java7/apps/runtime/pom.xml b/platforms/java7/apps/runtime/pom.xml
index fada43c..05d6e98 100644
--- a/platforms/java7/apps/runtime/pom.xml
+++ b/platforms/java7/apps/runtime/pom.xml
@@ -81,7 +81,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/java7/connectors/command/pom.xml b/platforms/java7/connectors/command/pom.xml
index 3553b50..fdffbe8 100644
--- a/platforms/java7/connectors/command/pom.xml
+++ b/platforms/java7/connectors/command/pom.xml
@@ -81,7 +81,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/connectors/common/pom.xml b/platforms/java7/connectors/common/pom.xml
index 1fc951a..3ff2ed9 100644
--- a/platforms/java7/connectors/common/pom.xml
+++ b/platforms/java7/connectors/common/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -104,7 +104,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/connectors/csv/pom.xml b/platforms/java7/connectors/csv/pom.xml
index d86314f..2506054 100644
--- a/platforms/java7/connectors/csv/pom.xml
+++ b/platforms/java7/connectors/csv/pom.xml
@@ -99,7 +99,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
diff --git a/platforms/java7/connectors/file/pom.xml b/platforms/java7/connectors/file/pom.xml
index ad48a19..67511b1 100644
--- a/platforms/java7/connectors/file/pom.xml
+++ b/platforms/java7/connectors/file/pom.xml
@@ -85,17 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -121,7 +111,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/connectors/http/pom.xml b/platforms/java7/connectors/http/pom.xml
index 3cd1fa5..871bacb 100644
--- a/platforms/java7/connectors/http/pom.xml
+++ b/platforms/java7/connectors/http/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/java7/connectors/iot/pom.xml b/platforms/java7/connectors/iot/pom.xml
index 43c33bc..d24ba7f 100644
--- a/platforms/java7/connectors/iot/pom.xml
+++ b/platforms/java7/connectors/iot/pom.xml
@@ -85,12 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/connectors/iotp/pom.xml b/platforms/java7/connectors/iotp/pom.xml
index 15d1adb..c7d1c38 100644
--- a/platforms/java7/connectors/iotp/pom.xml
+++ b/platforms/java7/connectors/iotp/pom.xml
@@ -85,12 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/java7/connectors/jdbc/pom.xml b/platforms/java7/connectors/jdbc/pom.xml
index a9cf716..96c75f6 100644
--- a/platforms/java7/connectors/jdbc/pom.xml
+++ b/platforms/java7/connectors/jdbc/pom.xml
@@ -106,18 +106,13 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/connectors/kafka/pom.xml b/platforms/java7/connectors/kafka/pom.xml
index 36d841f..3577a2b 100644
--- a/platforms/java7/connectors/kafka/pom.xml
+++ b/platforms/java7/connectors/kafka/pom.xml
@@ -99,7 +99,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -202,7 +202,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/connectors/mqtt/pom.xml b/platforms/java7/connectors/mqtt/pom.xml
index 96f4143..3a1b73a 100644
--- a/platforms/java7/connectors/mqtt/pom.xml
+++ b/platforms/java7/connectors/mqtt/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -126,7 +126,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/connectors/pubsub/pom.xml b/platforms/java7/connectors/pubsub/pom.xml
index a9c6dc5..fbf05a6 100644
--- a/platforms/java7/connectors/pubsub/pom.xml
+++ b/platforms/java7/connectors/pubsub/pom.xml
@@ -81,7 +81,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
diff --git a/platforms/java7/connectors/rabbitmq/pom.xml b/platforms/java7/connectors/rabbitmq/pom.xml
index 1218377..c1dd0ed 100644
--- a/platforms/java7/connectors/rabbitmq/pom.xml
+++ b/platforms/java7/connectors/rabbitmq/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -117,7 +117,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/connectors/serial/pom.xml b/platforms/java7/connectors/serial/pom.xml
index 10718b4..1c467ee 100644
--- a/platforms/java7/connectors/serial/pom.xml
+++ b/platforms/java7/connectors/serial/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/connectors/websocket-base/pom.xml b/platforms/java7/connectors/websocket-base/pom.xml
index 015c23f..8f51a19 100644
--- a/platforms/java7/connectors/websocket-base/pom.xml
+++ b/platforms/java7/connectors/websocket-base/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/connectors/websocket/pom.xml b/platforms/java7/connectors/websocket/pom.xml
index 8565524..83f5948 100644
--- a/platforms/java7/connectors/websocket/pom.xml
+++ b/platforms/java7/connectors/websocket/pom.xml
@@ -150,7 +150,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/providers/development/pom.xml b/platforms/java7/providers/development/pom.xml
index 7a541af..21a2ad6 100644
--- a/platforms/java7/providers/development/pom.xml
+++ b/platforms/java7/providers/development/pom.xml
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/providers/direct/pom.xml b/platforms/java7/providers/direct/pom.xml
index b06757d..ad5adeb 100644
--- a/platforms/java7/providers/direct/pom.xml
+++ b/platforms/java7/providers/direct/pom.xml
@@ -103,7 +103,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -147,7 +147,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/runtime/appservice/pom.xml b/platforms/java7/runtime/appservice/pom.xml
index bbd9a97..78aac83 100644
--- a/platforms/java7/runtime/appservice/pom.xml
+++ b/platforms/java7/runtime/appservice/pom.xml
@@ -81,12 +81,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
diff --git a/platforms/java7/runtime/etiao/pom.xml b/platforms/java7/runtime/etiao/pom.xml
index 2cecb20..052865f 100644
--- a/platforms/java7/runtime/etiao/pom.xml
+++ b/platforms/java7/runtime/etiao/pom.xml
@@ -85,12 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-graph</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -101,7 +96,7 @@
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-graph</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/runtime/jmxcontrol/pom.xml b/platforms/java7/runtime/jmxcontrol/pom.xml
index 038f7d5..daa6cc5 100644
--- a/platforms/java7/runtime/jmxcontrol/pom.xml
+++ b/platforms/java7/runtime/jmxcontrol/pom.xml
@@ -85,12 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/runtime/jobregistry/pom.xml b/platforms/java7/runtime/jobregistry/pom.xml
index effdc5e..e26207e 100644
--- a/platforms/java7/runtime/jobregistry/pom.xml
+++ b/platforms/java7/runtime/jobregistry/pom.xml
@@ -81,12 +81,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/runtime/jsoncontrol/pom.xml b/platforms/java7/runtime/jsoncontrol/pom.xml
index bdeb4ca..984ad61 100644
--- a/platforms/java7/runtime/jsoncontrol/pom.xml
+++ b/platforms/java7/runtime/jsoncontrol/pom.xml
@@ -85,12 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-function</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/spi/graph/pom.xml b/platforms/java7/spi/graph/pom.xml
index b07bba1..9e3ecd1 100644
--- a/platforms/java7/spi/graph/pom.xml
+++ b/platforms/java7/spi/graph/pom.xml
@@ -85,12 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-graph</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/spi/topology/pom.xml b/platforms/java7/spi/topology/pom.xml
index 5481b9b..8a1c431 100644
--- a/platforms/java7/spi/topology/pom.xml
+++ b/platforms/java7/spi/topology/pom.xml
@@ -85,7 +85,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/test/appservice-applications/pom.xml b/platforms/java7/test/appservice-applications/pom.xml
index 93ec217..8097ecc 100644
--- a/platforms/java7/test/appservice-applications/pom.xml
+++ b/platforms/java7/test/appservice-applications/pom.xml
@@ -96,7 +96,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/platforms/java7/test/svt/pom.xml b/platforms/java7/test/svt/pom.xml
index f812c55..b93cae3 100644
--- a/platforms/java7/test/svt/pom.xml
+++ b/platforms/java7/test/svt/pom.xml
@@ -93,7 +93,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/platforms/java7/utils/metrics/pom.xml b/platforms/java7/utils/metrics/pom.xml
index 9f28b46..a072602 100644
--- a/platforms/java7/utils/metrics/pom.xml
+++ b/platforms/java7/utils/metrics/pom.xml
@@ -85,14 +85,14 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/platforms/java7/utils/streamscope/pom.xml b/platforms/java7/utils/streamscope/pom.xml
index c2c8aac..3c840a8 100644
--- a/platforms/java7/utils/streamscope/pom.xml
+++ b/platforms/java7/utils/streamscope/pom.xml
@@ -81,14 +81,14 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<!-- TODO: This is only required because of a dependency to TopologyAbstractTest -> Would suggest to move test-util stutt into a dedicated test-utils artifact -->
<dependency>
<groupId>org.apache.edgent.java7</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
diff --git a/runtime/jmxcontrol/pom.xml b/runtime/jmxcontrol/pom.xml
index 3c6151c..364183b 100644
--- a/runtime/jmxcontrol/pom.xml
+++ b/runtime/jmxcontrol/pom.xml
@@ -37,12 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-execution</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-function</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/test/svt/pom.xml b/test/svt/pom.xml
index 06dd1a3..f5b8f82 100644
--- a/test/svt/pom.xml
+++ b/test/svt/pom.xml
@@ -37,7 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
