Current state.. in the middle of changing all dependencies.
diff --git a/analytics/math3/pom.xml b/analytics/math3/pom.xml
index b2a2b89..f14096d 100644
--- a/analytics/math3/pom.xml
+++ b/analytics/math3/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>
@@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</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/analytics/sensors/pom.xml b/analytics/sensors/pom.xml
index 51059be..d9c1e90 100644
--- a/analytics/sensors/pom.xml
+++ b/analytics/sensors/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>
@@ -54,9 +54,10 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <!--TODO Remove this-->
<dependency>
<groupId>org.apache.edgent</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/connectors/command/pom.xml b/connectors/command/pom.xml
index 56a5ec1..4075d42 100644
--- a/connectors/command/pom.xml
+++ b/connectors/command/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>
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</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/connectors/common/pom.xml b/connectors/common/pom.xml
index 64f218f..8542bed 100644
--- a/connectors/common/pom.xml
+++ b/connectors/common/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>
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</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/connectors/csv/pom.xml b/connectors/csv/pom.xml
index 899b5d1..edda0d1 100644
--- a/connectors/csv/pom.xml
+++ b/connectors/csv/pom.xml
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</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/connectors/file/pom.xml b/connectors/file/pom.xml
index 59830a3..74ebb25 100644
--- a/connectors/file/pom.xml
+++ b/connectors/file/pom.xml
@@ -37,17 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-oplet</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
@@ -73,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</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/connectors/http/pom.xml b/connectors/http/pom.xml
index b841dfd..a83bf4e 100644
--- a/connectors/http/pom.xml
+++ b/connectors/http/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>
diff --git a/connectors/iot/pom.xml b/connectors/iot/pom.xml
index 82254df..cf5102b 100644
--- a/connectors/iot/pom.xml
+++ b/connectors/iot/pom.xml
@@ -37,12 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/connectors/iotp/pom.xml b/connectors/iotp/pom.xml
index e730385..eedc6e8 100644
--- a/connectors/iotp/pom.xml
+++ b/connectors/iotp/pom.xml
@@ -37,12 +37,7 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-function</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- </dependency>
- <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/connectors/jdbc/pom.xml b/connectors/jdbc/pom.xml
index b2f1644..9071a20 100644
--- a/connectors/jdbc/pom.xml
+++ b/connectors/jdbc/pom.xml
@@ -63,18 +63,13 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-topology</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>
<dependency>
<groupId>org.apache.edgent</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/connectors/kafka/pom.xml b/connectors/kafka/pom.xml
index 8a2aee2..a7ff140 100644
--- a/connectors/kafka/pom.xml
+++ b/connectors/kafka/pom.xml
@@ -50,7 +50,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>
@@ -153,7 +153,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</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/connectors/mqtt/pom.xml b/connectors/mqtt/pom.xml
index b5fda3d..7a66b6b 100644
--- a/connectors/mqtt/pom.xml
+++ b/connectors/mqtt/pom.xml
@@ -66,7 +66,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>
@@ -107,7 +107,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</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/connectors/pubsub/pom.xml b/connectors/pubsub/pom.xml
index 4374e76..5734467 100644
--- a/connectors/pubsub/pom.xml
+++ b/connectors/pubsub/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>
diff --git a/providers/development/pom.xml b/providers/development/pom.xml
index 692cf9e..3eae8f6 100644
--- a/providers/development/pom.xml
+++ b/providers/development/pom.xml
@@ -63,7 +63,7 @@
<dependency>
<groupId>org.apache.edgent</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/providers/direct/pom.xml b/providers/direct/pom.xml
index f09f530..047cf99 100644
--- a/providers/direct/pom.xml
+++ b/providers/direct/pom.xml
@@ -66,7 +66,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>
@@ -110,7 +110,7 @@
</dependency>
<dependency>
<groupId>org.apache.edgent</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/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/DirectTopologyTestBase.java b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/DirectTopologyTestBase.java
index f87b563..bb3f5ee 100644
--- a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/DirectTopologyTestBase.java
+++ b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/DirectTopologyTestBase.java
@@ -21,7 +21,7 @@
import org.apache.edgent.execution.Job;
import org.apache.edgent.execution.Submitter;
import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.test.topology.TopologyAbstractTest;
+import org.apache.edgent.topology.TopologyAbstractTest;
import org.apache.edgent.topology.Topology;
public class DirectTopologyTestBase extends TopologyAbstractTest {
diff --git a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectPlumbingTest.java b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectPlumbingTest.java
index 76f0b74..ee0f98b 100644
--- a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectPlumbingTest.java
+++ b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectPlumbingTest.java
@@ -21,7 +21,7 @@
import org.apache.edgent.execution.Job;
import org.apache.edgent.execution.Submitter;
import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.test.topology.PlumbingTest;
+import org.apache.edgent.topology.PlumbingTest;
import org.apache.edgent.topology.Topology;
public class DirectPlumbingTest extends PlumbingTest {
diff --git a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectTStreamTest.java b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectTStreamTest.java
index ea67b07..9a2e536 100644
--- a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectTStreamTest.java
+++ b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectTStreamTest.java
@@ -21,7 +21,7 @@
import org.apache.edgent.execution.Job;
import org.apache.edgent.execution.Submitter;
import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.test.topology.TStreamTest;
+import org.apache.edgent.topology.TStreamTest;
import org.apache.edgent.topology.Topology;
public class DirectTStreamTest extends TStreamTest {
diff --git a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectTopologyTest.java b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectTopologyTest.java
index 9f29a86..7761deb 100644
--- a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectTopologyTest.java
+++ b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectTopologyTest.java
@@ -21,7 +21,7 @@
import org.apache.edgent.execution.Job;
import org.apache.edgent.execution.Submitter;
import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.test.topology.TopologyTest;
+import org.apache.edgent.topology.TopologyTest;
import org.apache.edgent.topology.Topology;
public class DirectTopologyTest extends TopologyTest {
diff --git a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectWindowTest.java b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectWindowTest.java
index eb6953a..1cb0a6b 100644
--- a/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectWindowTest.java
+++ b/providers/direct/src/test/java/org/apache/edgent/test/providers/direct/topology/DirectWindowTest.java
@@ -21,7 +21,7 @@
import org.apache.edgent.execution.Job;
import org.apache.edgent.execution.Submitter;
import org.apache.edgent.providers.direct.DirectProvider;
-import org.apache.edgent.test.topology.TWindowTest;
+import org.apache.edgent.topology.TWindowTest;
import org.apache.edgent.topology.Topology;
public class DirectWindowTest extends TWindowTest {
diff --git a/runtime/appservice/pom.xml b/runtime/appservice/pom.xml
index 5ca2c5e..a36d449 100644
--- a/runtime/appservice/pom.xml
+++ b/runtime/appservice/pom.xml
@@ -33,12 +33,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-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
diff --git a/runtime/etiao/pom.xml b/runtime/etiao/pom.xml
index e7a51be..b38b501 100644
--- a/runtime/etiao/pom.xml
+++ b/runtime/etiao/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-graph</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -50,10 +45,10 @@
<artifactId>edgent-spi-graph</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
-
+ <!--TODO Remove this-->
<dependency>
<groupId>org.apache.edgent</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/runtime/etiao/src/test/java/org/apache/edgent/test/runtime/etiao/EtiaoGraphTest.java b/runtime/etiao/src/test/java/org/apache/edgent/test/runtime/etiao/EtiaoGraphTest.java
index 302e7e0..c9b2ed0 100644
--- a/runtime/etiao/src/test/java/org/apache/edgent/test/runtime/etiao/EtiaoGraphTest.java
+++ b/runtime/etiao/src/test/java/org/apache/edgent/test/runtime/etiao/EtiaoGraphTest.java
@@ -35,7 +35,7 @@
import org.apache.edgent.oplet.functional.SupplierPeriodicSource;
import org.apache.edgent.runtime.etiao.graph.DirectGraph;
import org.apache.edgent.runtime.etiao.graph.model.GraphType;
-import org.apache.edgent.test.graph.GraphTest;
+import org.apache.edgent.graph.GraphTest;
import org.junit.Test;
import com.google.gson.Gson;
diff --git a/runtime/jobregistry/pom.xml b/runtime/jobregistry/pom.xml
index 3a32bb5..670d121 100644
--- a/runtime/jobregistry/pom.xml
+++ b/runtime/jobregistry/pom.xml
@@ -33,12 +33,12 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-execution</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.edgent</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/runtime/jsoncontrol/pom.xml b/runtime/jsoncontrol/pom.xml
index 5733ca1..b7d12d0 100644
--- a/runtime/jsoncontrol/pom.xml
+++ b/runtime/jsoncontrol/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/spi/graph/pom.xml b/spi/graph/pom.xml
index 7e4bd98..319e0e8 100644
--- a/spi/graph/pom.xml
+++ b/spi/graph/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-graph</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/spi/pom.xml b/spi/pom.xml
index ad916e0..3cd0b12 100644
--- a/spi/pom.xml
+++ b/spi/pom.xml
@@ -36,4 +36,12 @@
<module>topology</module>
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.edgent</groupId>
+ <artifactId>edgent-api</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/spi/topology/pom.xml b/spi/topology/pom.xml
index b664cad..0db8364 100644
--- a/spi/topology/pom.xml
+++ b/spi/topology/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>
</dependencies>
diff --git a/test/appservice-applications/pom.xml b/test/appservice-applications/pom.xml
index f4c47d0..e8a358c 100644
--- a/test/appservice-applications/pom.xml
+++ b/test/appservice-applications/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>
</dependencies>
diff --git a/utils/metrics/pom.xml b/utils/metrics/pom.xml
index a3e26d1..65f8b99 100644
--- a/utils/metrics/pom.xml
+++ b/utils/metrics/pom.xml
@@ -37,14 +37,14 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</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</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/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsBaseTest.java b/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsBaseTest.java
index b1be3b8..c7be683 100644
--- a/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsBaseTest.java
+++ b/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsBaseTest.java
@@ -26,7 +26,7 @@
import org.apache.edgent.execution.Job;
import org.apache.edgent.metrics.Metrics;
-import org.apache.edgent.test.topology.TopologyAbstractTest;
+import org.apache.edgent.topology.TopologyAbstractTest;
import org.apache.edgent.topology.TStream;
import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.tester.Condition;
diff --git a/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsConsoleReporterTest.java b/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsConsoleReporterTest.java
index 1104aae..990ca1f 100644
--- a/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsConsoleReporterTest.java
+++ b/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsConsoleReporterTest.java
@@ -31,7 +31,7 @@
import org.apache.edgent.execution.DirectSubmitter;
import org.apache.edgent.metrics.Metrics;
import org.apache.edgent.metrics.MetricsSetup;
-import org.apache.edgent.test.topology.TopologyAbstractTest;
+import org.apache.edgent.topology.TopologyAbstractTest;
import org.apache.edgent.topology.TStream;
import org.apache.edgent.topology.Topology;
import org.apache.edgent.topology.tester.Condition;
diff --git a/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsEverywhereTest.java b/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsEverywhereTest.java
index 9150f0e..0ae4509 100644
--- a/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsEverywhereTest.java
+++ b/utils/metrics/src/test/java/org/apache/edgent/test/metrics/MetricsEverywhereTest.java
@@ -40,7 +40,7 @@
import org.apache.edgent.oplet.Oplet;
import org.apache.edgent.oplet.OpletContext;
import org.apache.edgent.oplet.core.Peek;
-import org.apache.edgent.test.topology.TopologyAbstractTest;
+import org.apache.edgent.topology.TopologyAbstractTest;
import org.apache.edgent.topology.TStream;
import org.apache.edgent.topology.Topology;
import org.junit.Before;
diff --git a/utils/streamscope/pom.xml b/utils/streamscope/pom.xml
index 0e1ab8c..35335b2 100644
--- a/utils/streamscope/pom.xml
+++ b/utils/streamscope/pom.xml
@@ -33,14 +33,14 @@
<dependencies>
<dependency>
<groupId>org.apache.edgent</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</groupId>
- <artifactId>edgent-api-topology</artifactId>
+ <artifactId>edgent-api</artifactId>
<version>1.3.0-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
