X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=51c4dad6c5b18039f84d61222fac3d0769fa0790;hb=5225ff33e981fb452189eba0b2ce6bb3f2832cc4;hp=51077a81914b108f74b4b3958912907da00b3d18;hpb=87b55db726a03637c53cced0595e1efcf025ed4e;p=netconf.git

diff --git a/pom.xml b/pom.xml
index 51077a8191..51c4dad6c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,53 +4,36 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.7.0-SNAPSHOT</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.1.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>
-        <aaa.version>0.3.0-SNAPSHOT</aaa.version>
-        <akka.version>2.3.14</akka.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.5.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>
-
-        <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>
-        <scala.major.version>2.10</scala.major.version>
-        <scala.minor.version>4</scala.minor.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.7.0-SNAPSHOT</features.test.version>
 
+        <mdsal.version>2.1.0-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
+        <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+        <netconf.version>1.1.0-SNAPSHOT</netconf.version>
+        <restconf.version>1.4.0-SNAPSHOT</restconf.version>
+        <yangtools.version>1.0.0-SNAPSHOT</yangtools.version>
     </properties>
 
 
@@ -80,7 +63,7 @@
         <dependency>
           <groupId>org.opendaylight.aaa</groupId>
           <artifactId>aaa-artifacts</artifactId>
-          <version>${aaa.version}</version>
+          <version>0.4.0-SNAPSHOT</version>
           <type>pom</type>
           <scope>import</scope>
         </dependency>
@@ -107,126 +90,13 @@
                 <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>
+                            <version>0.3.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>
-                <plugin>
-                   <artifactId>maven-clean-plugin</artifactId>
-                   <configuration>
-                       <filesets>
-                         <fileset>
-                            <directory>${jmxGeneratorPath}</directory>
-                            <includes>
-                               <include>**</include>
-                            </includes>
-                         </fileset>
-                         <fileset>
-                            <directory>${salGeneratorPath}</directory>
-                            <includes>
-                               <include>**</include>
-                            </includes>
-                         </fileset>
-                      </filesets>
-                   </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>