From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Thu, 9 Apr 2015 14:33:48 +0000 (+0200)
Subject: Bug 2926 - API yangs hidden
X-Git-Tag: release/lithium~38
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=e6856ada13f0d5b06e0f6fdf74edd45b512b31fc;hp=93508e494455287d9d9489c47cce2eae87de1ff9;p=openflowjava.git

Bug 2926 - API yangs hidden

Change-Id: Icf250c0aab45ccfd0d48361d24828fdb0002ed29
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---

diff --git a/openflow-protocol-api/pom.xml b/openflow-protocol-api/pom.xml
index 1ec8261f..faf463ac 100644
--- a/openflow-protocol-api/pom.xml
+++ b/openflow-protocol-api/pom.xml
@@ -1,4 +1,5 @@
-<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>
@@ -9,8 +10,8 @@
     <packaging>bundle</packaging>
     <name>Openflow Protocol Library - API</name>
     <scm>
-      <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
-      <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/view/Openflow_Protocol_Library:Main</url>
+        <tag>HEAD</tag>
     </scm>
 
     <build>
@@ -53,10 +54,51 @@
                     </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>
+                <version>1.7</version>
+                <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>