Merge "Include namespace in output element of json rpc responses" into stable/fluorine

[netconf.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 34b0cdf1634ac9427dd15b07f860709f7fcc2b03..2db6d4269c7c65b5fcf3fd2e370a8e010004f086 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,99 +7,28 @@
  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.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>3.1.5</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
-    <artifactId>netconf-parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <artifactId>netconf-aggregator</artifactId>
+    <version>1.5.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
     <modules>
-        <module>netconf</module>
-        <module>restconf</module>
-
         <module>features</module>
         <module>karaf</module>
+        <module>netconf</module>
+        <module>protocol-framework</module>
+        <module>restconf</module>
     </modules>
 
-    <properties>
-        <config.version>0.7.0-SNAPSHOT</config.version>
-        <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <features.test.version>1.9.0</features.test.version>
-
-        <mdsal.version>2.3.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.11.0-SNAPSHOT</mdsal.model.version>
-        <controller.mdsal.version>1.6.0-SNAPSHOT</controller.mdsal.version>
-        <netconf.version>1.3.0-SNAPSHOT</netconf.version>
-        <restconf.version>1.6.0-SNAPSHOT</restconf.version>
-        <yangtools.version>1.2.0-SNAPSHOT</yangtools.version>
-    </properties>
-
-
-    <dependencyManagement>
-      <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yangtools-artifacts</artifactId>
-            <version>${yangtools.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.mdsal</groupId>
-          <artifactId>mdsal-artifacts</artifactId>
-          <version>${mdsal.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.mdsal.model</groupId>
-          <artifactId>mdsal-model-artifacts</artifactId>
-          <version>${mdsal.model.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.aaa</groupId>
-          <artifactId>aaa-artifacts</artifactId>
-          <version>0.6.0-SNAPSHOT</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>config-artifacts</artifactId>
-          <version>${config.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>mdsal-artifacts</artifactId>
-          <version>${controller.mdsal.version}</version>
-          <type>pom</type>
-          <scope>import</scope>
-        </dependency>
-      </dependencies>
-    </dependencyManagement>
-
-    <profiles>
-        <profile>
-            <id>integrationtests</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <modules>
-                <!-- module>opendaylight/netconf/netconf-it</module -->
-            </modules>
-        </profile>
-    </profiles>
 </project>