X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-api%2Fpom.xml;h=3364604cfa1f61eb58d9e55d11c1fd4e5d2ff669;hb=24406504512cf59a7c1fda2766e52ca0ef7c5ffc;hp=894173aadd005abf870934c5ecd25b126903675d;hpb=07de1ed897da9d7dc70c6d550f38c59339ed751e;p=openflowjava.git

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 894173aa..3364604c 100644
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -1,21 +1,18 @@
-<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.6.0-SNAPSHOT</version>
+        <version>0.6.3-Lithium-SR3</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.binding.version>0.7.0-SNAPSHOT</yangtools.binding.version>
-    </properties>
+        <tag>HEAD</tag>
+    </scm>
 
     <build>
         <plugins>
@@ -52,15 +49,55 @@
                     <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.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <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>
+            </plugin>
         </plugins>
         <pluginManagement>
             <plugins>
-                <!--This plugin's configuration is used to store Eclipse
+                <!--This plugin's configuration is used to store Eclipse 
                     m2e settings only. It has no influence on the Maven build itself. -->
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -101,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>