X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fpom.xml;h=78184051ad0d7f1a86e237e57cb2f7b8ec2f76e5;hb=64e2314f2c7a9f3176d85c50f3df3ecb28262f6f;hp=eb6615a9d5958c3ed2814a3fa57d9f02f188ed68;hpb=f9f2b07fad8b5ed6180445a9ff7997ecaffe8cf3;p=openflowjava.git

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index eb6615a9..78184051 100644
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -1,30 +1,24 @@
-<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>
     <parent>
         <groupId>org.opendaylight.openflowjava</groupId>
         <artifactId>openflow-protocol-parent</artifactId>
-        <version>0.5-SNAPSHOT</version>
+        <version>0.6.4-Lithium-SR4</version>
     </parent>
     <artifactId>openflow-protocol-api</artifactId>
     <packaging>bundle</packaging>
     <name>Openflow Protocol Library - API</name>
     <scm>
         <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
-      <tag>HEAD</tag>
-  </scm>
-
-    <properties>
-        <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
-        <yangtools.generator.version>0.6.2-SNAPSHOT</yangtools.generator.version>
-        <yangtools.binding.version>0.6.2-SNAPSHOT</yangtools.binding.version>
-    </properties>
+        <tag>HEAD</tag>
+    </scm>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -38,7 +32,7 @@
                                         org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
-                                        target/generated-sources/sal
+                                        ${salGeneratorPath}
                                     </outputBaseDir>
                                 </generator>
                                 <generator>
@@ -55,25 +49,47 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.generator.version}</version>
+                        <version>${yangtools.version}</version>
                         <type>jar</type>
                     </dependency>
                 </dependencies>
             </plugin>
+
+            <!-- TODO: maven-antrun-plugin deletes yang source files from target.
+                       This is done because otherwise openflowjava models are stored in controller
+                       and exposed for further use - which is not desired.
+                       (https://bugs.opendaylight.org/show_bug.cgi?id=2926)
+
+                       This plugin should be removed after relevant configuration is added into 
+                       yang-maven-plugin - which is supposed to happen in BERYLLIUM release -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-sources</phase>
+                        <phase>prepare-package</phase>
                         <goals>
-                            <goal>add-source</goal>
+                            <goal>run</goal>
                         </goals>
                         <configuration>
-                            <sources>
-                                <source>target/generated-sources/sal</source>
-                            </sources>
+                            <tasks>
+                                <delete>
+                                    <fileset dir="${project.build.directory}/classes/META-INF/yang">
+                                        <include name="*.yang"/>
+                                        <exclude name="openflow-types.yang"/>
+                                        <exclude name="openflow-extensible-match.yang"/>
+                                        <exclude name="openflow-action.yang"/>
+                                        <exclude name="openflow-configuration.yang"/>
+                                    </fileset>
+                                    <fileset dir="${project.build.directory}/generated-sources/yang/META-INF/yang">
+                                        <include name="*.yang"/>
+                                        <exclude name="openflow-types.yang"/>
+                                        <exclude name="openflow-extensible-match.yang"/>
+                                        <exclude name="openflow-action.yang"/>
+                                        <exclude name="openflow-configuration.yang"/>
+                                    </fileset>
+                                </delete>
+                            </tasks>
                         </configuration>
                     </execution>
                 </executions>
@@ -122,12 +138,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-binding</artifactId>
-            <version>${yangtools.binding.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-common</artifactId>
-            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
@@ -138,13 +152,21 @@
             <artifactId>ietf-yang-types</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-service</artifactId>
+            <groupId>org.opendaylight.yangtools.model</groupId>
+            <artifactId>yang-ext</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+        </dependency>
     </dependencies>
 </project>