Fix generator path inconsistent

The generator path of build-helper-plugin is inconsistent with
odl-parent, this caused the Eclipse build path to be missing.

Change-Id: I6d1fa45abaef49d0995549230b7337892abec8ba
Signed-off-by: xsir <xujinchuan@huawei.com>

diff --git a/aaa-authn-mdsal-store/aaa-authn-mdsal-api/pom.xml b/aaa-authn-mdsal-store/aaa-authn-mdsal-api/pom.xml
index 861d53487e1521f687de497d2b5a72626e4b6542..3b2436b08f0f6660b4cfa3c67ccd2e6997d0a389 100644 (file)
--- a/aaa-authn-mdsal-store/aaa-authn-mdsal-api/pom.xml
+++ b/aaa-authn-mdsal-store/aaa-authn-mdsal-api/pom.xml
@@ -75,7 +75,7 @@
                                     <codeGeneratorClass>
                                         org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
-                                    <outputBaseDir>target/generated-sources/sal</outputBaseDir>
+                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                                 </generator>
                             </codeGenerators>
                             <inspectDependencies>true</inspectDependencies>
@@ -92,23 +92,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/generated-sources/sal</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <packaging>bundle</packaging>

diff --git a/aaa-authz/aaa-authz-model/pom.xml b/aaa-authz/aaa-authz-model/pom.xml
index 754074e3fe50b72f8f32862f6adc1d074138e726..b04dbe1798f57fbd749254f5c3da0ff3594022e7 100644 (file)
--- a/aaa-authz/aaa-authz-model/pom.xml
+++ b/aaa-authz/aaa-authz-model/pom.xml
@@ -71,7 +71,7 @@
                                     <codeGeneratorClass>
                                         org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
-                                    <outputBaseDir>target/generated-sources/sal</outputBaseDir>
+                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
                                 </generator>
                             </codeGenerators>
                             <inspectDependencies>true</inspectDependencies>
@@ -88,23 +88,6 @@
                     </dependency>
                 </dependencies>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>add-source</goal>
-                        </goals>
-                        <configuration>
-                            <sources>
-                                <source>target/generated-sources/sal</source>
-                            </sources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <packaging>bundle</packaging>

diff --git a/parent/pom.xml b/parent/pom.xml
index 62a9c03adbb2dcf08c22498e712874b1f3f8db02..e2e454b28c232e1a1430d107b468787ed4675006 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -228,6 +228,24 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>${jmxGeneratorPath}</source>
+                                <source>${salGeneratorPath}</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>