X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=pom.xml;h=fb288d14c7b199d4fa99eeb12c9fb0adfba7ca04;hb=c6a54e7ec2cf3657f6b03f42121be0e2e434d088;hp=c79accee1e2f5b023b8b9d1cde4619d512d66ec7;hpb=112b3bdba0975bc2a35df6dd2548bc863f8cc650;p=netconf.git

diff --git a/pom.xml b/pom.xml
index c79accee1e..fb288d14c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,61 +1,46 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+
+ 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.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.9.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
     <modules>
-        <module>opendaylight/netconf</module>
-        <module>opendaylight/restconf</module>
+        <module>netconf</module>
+        <module>restconf</module>
 
         <module>features</module>
         <module>karaf</module>
     </modules>
 
     <properties>
-        <config.netconf.client.configfile>01-netconf.xml</config.netconf.client.configfile>
-        <config.netconf.topology.configfile>02-netconf-topology.xml</config.netconf.topology.configfile>
-        <config.netconf.mdsal.configfile>08-mdsal-netconf.xml</config.netconf.mdsal.configfile>
-        <config.restconf.configfile>10-rest-connector.xml</config.restconf.configfile>
-         <config.restconf.service.configfile>10-restconf-service.xml</config.restconf.service.configfile>
-        <config.netconf.connector.configfile>99-netconf-connector.xml</config.netconf.connector.configfile>
-
-        <aaa.version>0.3.0-SNAPSHOT</aaa.version>
-        <commons.logback_settings.version>0.2.0-SNAPSHOT</commons.logback_settings.version>
-        <commons.opendaylight.version>1.6.0-SNAPSHOT</commons.opendaylight.version>
-        <config.version>0.4.0-SNAPSHOT</config.version>
+        <config.version>0.7.0-SNAPSHOT</config.version>
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <exi.nagasena.version>0000.0002.0053.0</exi.nagasena.version>
-        <features.test.version>1.6.0-SNAPSHOT</features.test.version>
-        <ietf-inet-types.version>2010.09.24.8-SNAPSHOT</ietf-inet-types.version>
-        <ietf-restconf.version>2013.10.19.8-SNAPSHOT</ietf-restconf.version>
-        <ietf-topology.version>2013.10.21.8-SNAPSHOT</ietf-topology.version>
-        <ietf-yang-types.version>2010.09.24.8-SNAPSHOT</ietf-yang-types.version>
-        <jersey-servlet.version>1.17</jersey-servlet.version>
-
-        <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
-        <controller.mdsal.version>1.3.0-SNAPSHOT</controller.mdsal.version>
-        <netconf.version>1.0.0-SNAPSHOT</netconf.version>
-        <restconf.version>1.3.0-SNAPSHOT</restconf.version>
-        <protocol-framework.version>0.7.0-SNAPSHOT</protocol-framework.version>
-        <sshd-core.version>0.14.0</sshd-core.version>
-        <surefire.version>2.15</surefire.version>
-        <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
-
-        <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
-        <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
+        <features.test.version>1.9.0-SNAPSHOT</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>
 
 
@@ -85,7 +70,7 @@
         <dependency>
           <groupId>org.opendaylight.aaa</groupId>
           <artifactId>aaa-artifacts</artifactId>
-          <version>${aaa.version}</version>
+          <version>0.6.0-SNAPSHOT</version>
           <type>pom</type>
           <scope>import</scope>
         </dependency>
@@ -106,118 +91,6 @@
       </dependencies>
     </dependencyManagement>
 
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <configuration>
-                        <failsOnError>true</failsOnError>
-                        <configLocation>controller/checkstyle.xml</configLocation>
-                        <consoleOutput>true</consoleOutput>
-                        <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                        <sourceDirectory>${project.basedir}</sourceDirectory>
-                        <includes>**\/*.java,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</includes>
-                        <excludes>**\/target\/,**\/bin\/,**\/target-ide\/,**\/${jmxGeneratorPath}\/,**\/${salGeneratorPath}\/,**\/protobuff\/,**\/src\/main\/resources\/archetype-resources\/**\/*.java</excludes>
-                    </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.opendaylight.controller</groupId>
-                            <artifactId>checkstyle</artifactId>
-                            <version>0.2.0-SNAPSHOT</version>
-                        </dependency>
-                    </dependencies>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                            <phase>process-sources</phase>
-                        </execution>
-                    </executions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <instructions>
-                            <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        </instructions>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.opendaylight.yangtools</groupId>
-                    <artifactId>yang-maven-plugin</artifactId>
-                    <version>${yangtools.version}</version>
-                    <executions>
-                        <execution>
-                            <id>config</id>
-                            <goals>
-                                <goal>generate-sources</goal>
-                            </goals>
-                            <configuration>
-                                <codeGenerators>
-                                    <generator>
-                                        <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
-                                        <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
-                                        <additionalConfiguration>
-                                            <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
-                                        </additionalConfiguration>
-                                    </generator>
-                                    <generator>
-                                        <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                        <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                    </generator>
-                                </codeGenerators>
-                                <inspectDependencies>true</inspectDependencies>
-                            </configuration>
-                        </execution>
-                    </executions>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.opendaylight.controller</groupId>
-                            <artifactId>yang-jmx-generator-plugin</artifactId>
-                            <version>${config.version}</version>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.opendaylight.mdsal</groupId>
-                            <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>${yangtools.version}</version>
-                            <type>jar</type>
-                        </dependency>
-                        <dependency>
-                            <groupId>org.opendaylight.mdsal</groupId>
-                            <artifactId>yang-binding</artifactId>
-                            <version>${yangtools.version}</version>
-                            <type>jar</type>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.8</version>
-                    <executions>
-                        <execution>
-                            <id>add-source</id>
-                            <phase>generate-sources</phase>
-                            <goals>
-                                <goal>add-source</goal>
-                            </goals>
-                            <configuration>
-                                <sources>
-                                    <source>${project.build.directory}/generated-sources/config</source>;
-                                </sources>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
     <profiles>
         <profile>
             <id>integrationtests</id>
@@ -228,22 +101,5 @@
                 <!-- module>opendaylight/netconf/netconf-it</module -->
             </modules>
         </profile>
-        <profile>
-            <id>doclint-java8-disable</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <configuration>
-                            <additionalparam>-Xdoclint:none</additionalparam>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>