Merge changes Iaac9f7e2,I9c336a30

[yangtools.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 7a8c3313a67a8a28ff678138211e7587db6fb851..e229268818624987b3e648f535a231bc302d509a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -7,12 +7,13 @@
  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">
+<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.6.1-SNAPSHOT</version>
+    <version>0.6.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <prerequisites>
         <maven>3.0.4</maven>
@@ -28,7 +29,7 @@
 
         <!-- Build Plugin Versions -->
         <maven.bundle.version>2.4.0</maven.bundle.version>
-        <maven.jar.version>2.4</maven.jar.version>
+        <maven.jar.version>2.3.2</maven.jar.version>
         <maven.javadoc.version>2.9.1</maven.javadoc.version>
         <maven.release.version>2.4.2</maven.release.version>
         <maven.source.version>2.2.1</maven.source.version>
@@ -53,12 +54,13 @@
     </scm>
 
     <modules>
-        <module>concepts</module>
-        <module>yang</module>
         <module>code-generator</module>
+        <module>common</module>
+        <module>integration-test</module>
         <module>model</module>
         <module>restconf</module>
-        <module>mockito-configuration</module>
+        <module>websocket</module>
+        <module>yang</module>
         <!-- module>third-party</module -->
     </modules>
 
@@ -169,6 +171,11 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>${commons.lang.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>2.0.3</version>
+            </dependency>
 
             <!-- Plugin integration -->
             <dependency>
@@ -181,13 +188,19 @@
                 <artifactId>plexus-slf4j-logging</artifactId>
                 <version>1.1</version>
             </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.4</version>
+            </dependency>
+
 
-           <!-- Our artifacts -->
-           <dependency>
-                   <groupId>${project.groupId}</groupId>
-                   <artifactId>concepts</artifactId>
-                   <version>${project.version}</version>
-           </dependency>
+            <!-- Our artifacts -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>concepts</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -247,7 +260,9 @@
                     <configuration>
                         <instructions>
                             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                            <Export-Package>*</Export-Package>
+                            <!--
+                                                        <Export-Package>*</Export-Package>
+                            -->
                         </instructions>
                     </configuration>
                 </plugin>
@@ -297,7 +312,7 @@
                                         </goals>
                                     </pluginExecutionFilter>
                                     <action>
-                                        <execute />
+                                        <execute/>
                                     </action>
                                 </pluginExecution>
                             </pluginExecutions>