X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=a661458631e158ec81cc21148af33d61098eac6e;hb=refs%2Fchanges%2F59%2F5259%2F1;hp=ccf244219b2b26546e6b1b8c147272ee96343fb0;hpb=6880f062bfdf31874b20d1f4ead33345e98c4c8e;p=yangtools.git

diff --git a/pom.xml b/pom.xml
index ccf244219b..a661458631 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,22 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2013 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>
     <artifactId>yangtools</artifactId>
     <groupId>org.opendaylight.yangtools</groupId>
-    <version>0.1.1-SNAPSHOT</version>
+    <version>0.6.2-SNAPSHOT</version>
     <packaging>pom</packaging>
+    <prerequisites>
+        <maven>3.0.4</maven>
+    </prerequisites>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -29,14 +40,16 @@
         <slf4j.version>1.7.2</slf4j.version>
         <guava.version>14.0.1</guava.version>
         <xtend.version>2.4.3</xtend.version>
-	<groovy.version>2.1.6</groovy.version>
-	<mockito.version>1.9.5</mockito.version>
+        <groovy.version>2.1.6</groovy.version>
+        <mockito.version>1.9.5</mockito.version>
+        <javassist.version>3.17.1-GA</javassist.version>
     </properties>
 
     <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/yangtools.git</developerConnection>
         <url>https://wiki.opendaylight.org/view/YANG_Tools:Main</url>
+        <tag>HEAD</tag>
     </scm>
 
     <modules>
@@ -44,12 +57,15 @@
         <module>yang</module>
         <module>code-generator</module>
         <module>model</module>
-	<module>restconf</module>
-	<module>mockito-configuration</module>
+        <module>restconf</module>
+        <module>integration-test</module>
+        <module>mockito-configuration</module>
+        <module>websocket</module>
         <!-- module>third-party</module -->
     </modules>
 
     <pluginRepositories>
+        <!-- OpenDayLight Repo Mirror -->
         <pluginRepository>
             <id>opendaylight-mirror</id>
             <name>opendaylight-mirror</name>
@@ -62,9 +78,23 @@
                 <updatePolicy>never</updatePolicy>
             </releases>
         </pluginRepository>
+
+        <!-- OpenDayLight Snapshot artifact -->
+        <pluginRepository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
     </pluginRepositories>
 
     <repositories>
+        <!-- OpenDayLight Repo Mirror -->
         <repository>
             <id>opendaylight-mirror</id>
             <name>opendaylight-mirror</name>
@@ -77,8 +107,20 @@
                 <updatePolicy>never</updatePolicy>
             </releases>
         </repository>
-    </repositories>
 
+        <!-- OpenDayLight Snapshot artifact -->
+        <repository>
+            <id>opendaylight-snapshot</id>
+            <name>opendaylight-snapshot</name>
+            <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
 
     <dependencyManagement>
         <dependencies>
@@ -92,13 +134,19 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>
-		<version>${mockito.version}</version>
+                <version>${mockito.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-core</artifactId>
-		<version>${mockito.version}</version>
+                <version>${mockito.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>${slf4j.version}</version>
                 <scope>test</scope>
             </dependency>
 
@@ -135,9 +183,23 @@
                 <artifactId>plexus-slf4j-logging</artifactId>
                 <version>1.1</version>
             </dependency>
+
+	    <!-- Our artifacts -->
+	    <dependency>
+		    <groupId>${project.groupId}</groupId>
+		    <artifactId>concepts</artifactId>
+		    <version>${project.version}</version>
+	    </dependency>
         </dependencies>
     </dependencyManagement>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+        </dependency>
+    </dependencies>
+
     <distributionManagement>
         <!-- OpenDayLight Released artifact -->
         <repository>
@@ -164,7 +226,7 @@
                     <version>${maven.jar.version}</version>
                     <configuration>
                         <archive>
-                            <!-- Bundle OSGi Manifest created by maven-bundle-plugin 
+                            <!-- Bundle OSGi Manifest created by maven-bundle-plugin
                                 into jar file -->
                             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                         </archive>
@@ -187,7 +249,9 @@
                     <configuration>
                         <instructions>
                             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
+<!--
                             <Export-Package>*</Export-Package>
+-->
                         </instructions>
                     </configuration>
                 </plugin>
@@ -208,7 +272,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>2.4.1</version>
+                    <version>2.5</version>
                     <configuration>
                         <filesets>
                             <fileset>
@@ -270,6 +334,12 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
                     <version>${maven.release.version}</version>
+
+                    <!-- Since we have a maven plugin, we need to install it -->
+                    <configuration>
+                        <preparationGoals>clean install</preparationGoals>
+                        <completionGoals>clean install</completionGoals>
+                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -307,7 +377,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.4.0</version>
+                <version>2.5.3</version>
                 <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>