<scope>test</scope>
</dependency>
- <!-- Features -->
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>features-controller-experimental</artifactId>
- <version>${project.version}</version>
- <classifier>features</classifier>
- <type>xml</type>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>features-mdsal</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
+
+ <!-- CSIT and other testing Features -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>features-controller-testing</artifactId>
+ <version>${project.version}</version>
+ <classifier>features</classifier>
+ <type>xml</type>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>odl-mdsal-benchmark</artifactId>
+ <version>${project.version}</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-clustering-test-app</artifactId>
<!-- Benchmarks -->
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>${project.groupId}</groupId>
<artifactId>benchmark-api</artifactId>
<version>1.10.0-SNAPSHOT</version>
</dependency>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>benchmark-features</artifactId>
+ <artifactId>ntfbenchmark</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>rpcbenchmark</artifactId>
+ <version>1.10.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>odl-controller-test-benchmark</artifactId>
<version>1.10.0-SNAPSHOT</version>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </dependency>
+
+ <!-- Expertimental Features -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>features-controller-experimental</artifactId>
+ <version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
+ <scope>runtime</scope>
</dependency>
<!-- Config remnants -->
</parent>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>features-mdsal-benchmark</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <artifactId>features-controller-testing</artifactId>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>feature</packaging>
+ <name>OpenDaylight :: Controller :: Features to support CSIT testing</name>
+ <description>Controller CSIT Features</description>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>controller-artifacts</artifactId>
+ <version>1.12.0-SNAPSHOT</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>odl-benchmark-api</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>odl-dsbenchmark</artifactId>
- <version>${project.version}</version>
+ <groupId>org.opendaylight.controller</groupId>
+ <artifactId>odl-clustering-test-app</artifactId>
<type>xml</type>
<classifier>features</classifier>
</dependency>
<dependency>
- <groupId>${project.groupId}</groupId>
+ <groupId>org.opendaylight.controller</groupId>
<artifactId>odl-mdsal-benchmark</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>odl-ntfbenchmark</artifactId>
- <version>${project.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
</dependencies>
-
</project>
<packaging>feature</packaging>
<dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>odl-clustering-test-app</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>odl-mdsal-broker</artifactId>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<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.opendaylight.controller</groupId>
- <artifactId>single-feature-parent</artifactId>
- <version>1.12.0-SNAPSHOT</version>
- <relativePath>../single-feature-parent</relativePath>
- </parent>
-
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-benchmark-api</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>OpenDaylight :: Benchmark :: API</name>
-
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.mdsal</groupId>
- <artifactId>odl-mdsal-binding-base</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>benchmark-api</artifactId>
- </dependency>
- </dependencies>
-</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<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.opendaylight.controller</groupId>
- <artifactId>single-feature-parent</artifactId>
- <version>1.12.0-SNAPSHOT</version>
- <relativePath>../single-feature-parent</relativePath>
- </parent>
-
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-dsbenchmark</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>OpenDaylight :: dsbenchmark</name>
-
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-mdsal-broker</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-benchmark-api</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>dsbenchmark</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-</project>
<groupId>org.opendaylight.controller</groupId>
<artifactId>odl-mdsal-benchmark</artifactId>
- <version>1.10.0-SNAPSHOT</version>
+ <version>1.12.0-SNAPSHOT</version>
<packaging>feature</packaging>
-
- <name>OpenDaylight :: MD-SAL :: benchmark</name>
+ <name>OpenDaylight :: Controller :: Benchmarks</name>
+ <description>Controller benchmarks</description>
<dependencies>
<dependency>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-benchmark-api</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
+ <artifactId>benchmark-api</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-dsbenchmark</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
+ <artifactId>dsbenchmark</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-ntfbenchmark</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
+ <artifactId>ntfbenchmark</artifactId>
</dependency>
<dependency>
<groupId>org.opendaylight.controller</groupId>
<artifactId>rpcbenchmark</artifactId>
- <version>${project.version}</version>
</dependency>
</dependencies>
</project>
+++ /dev/null
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright © 2016, 2017 Red Hat, Inc. and others.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
- -->
-<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.opendaylight.controller</groupId>
- <artifactId>single-feature-parent</artifactId>
- <version>1.12.0-SNAPSHOT</version>
- <relativePath>../single-feature-parent</relativePath>
- </parent>
-
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-ntfbenchmark</artifactId>
- <version>1.10.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>OpenDaylight :: ntfbenchmark</name>
-
- <dependencies>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-mdsal-broker</artifactId>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>odl-benchmark-api</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.controller</groupId>
- <artifactId>ntfbenchmark</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
-</project>
<module>features-controller-experimental</module>
<module>odl-controller-exp-netty-config</module>
-
+ <!-- CSIT features -->
+ <module>features-controller-testing</module>
+ <module>odl-clustering-test-app</module>
+ <module>odl-mdsal-benchmark</module>
<!-- Single features, to be cleaned up -->
- <module>odl-benchmark-api</module>
- <module>odl-clustering-test-app</module>
<module>odl-controller-blueprint</module>
<module>odl-controller-mdsal-common</module>
<module>odl-controller-model-topology</module>
- <module>odl-dsbenchmark</module>
<module>odl-jolokia</module>
- <module>odl-mdsal-benchmark</module>
<module>odl-mdsal-broker-local</module>
<module>odl-mdsal-broker</module>
<module>odl-mdsal-clustering-commons</module>
<module>odl-mdsal-model-inventory</module>
<module>odl-mdsal-remoterpc-connector</module>
<module>odl-message-bus-collector</module>
- <module>odl-ntfbenchmark</module>
<module>odl-toaster</module>
<!-- Repositories, to be cleaned up -->
<module>features-extras</module>
<module>features-mdsal</module>
- <module>features-mdsal-benchmark</module>
</modules>
</project>