Merge "Change target to ${project.build.target} in a bunch of pom file. Add some...

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index ad89a3237757f869b7705c466b1421ba6d93e48e..ad6ac31860f07750f4a857d7a24db602dd46edc5 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -259,7 +259,7 @@
                             <goal>report</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${basedir}/target/jacoco</outputDirectory>
+                            <outputDirectory>${project.build.directory}/jacoco</outputDirectory>
                             <haltOnFailure>false</haltOnFailure>
                             <check>
                                 <classRatio>80</classRatio>
@@ -301,7 +301,7 @@
                                     </generator>
                                     <generator>
                                         <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
-                                        <outputBaseDir>target/site/models</outputBaseDir>
+                                        <outputBaseDir>${project.build.directory}/site/models</outputBaseDir>
                                     </generator>
                                 </codeGenerators>
                                 <inspectDependencies>true</inspectDependencies>

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index 19e22731161bc3616dee90552510c30eb6ec0f56..b9f9235269e33533faa76150bdc220669678bcb1 100644 (file)
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -104,7 +104,7 @@
                                         org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
-                                        target/generated-sources/sal
+                                        ${project.build.directory}/generated-sources/sal
                                     </outputBaseDir>
                                 </generator>
                             </codeGenerators>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index acbdb9f33d81674e7646aa2f7ea581e45d79c3dd..a53dadf971fa7d13568454f8a4125bc903e2a582 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -460,6 +460,7 @@
                             <sources>
                                 <source>${project.build.directory}/generated-sources/config</source>
                                 <source>${project.build.directory}/generated-sources/sal</source>
+                                <source>src/main/xtend-gen</source>
                             </sources>
                         </configuration>
                     </execution>

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 6dc91e014b5c2bab078a915984abc5f52d510f8b..0f490ebe15db9530302c174cfe07eb2d586c0220 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -76,6 +76,7 @@
                         <configuration>
                             <sources>
                                 <source>${project.build.directory}/generated-sources/config</source>
+                                <source>src/main/xtend-gen</source>
                             </sources>
                         </configuration>
                     </execution>

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 5c53f7685347ae57208ed1aca42a9b379920b05e..cf2a5b2b71834acc33f051af67f9a85330f22a3a 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -149,6 +149,7 @@
                         <configuration>
                             <sources>
                                 <source>${project.build.directory}/generated-sources/config</source>
+                                <source>src/main/xtend-gen</source>
                             </sources>
                         </configuration>
                     </execution>

diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml
index 61a84b636b3ae2c396010e297f3ec65ee154a1da..89f576ccc9d2805cbb31b737633400b297e0b781 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/pom.xml
+++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml
@@ -266,6 +266,7 @@
                         <configuration>
                             <sources>
                                 <source>${project.build.directory}/generated-sources/config</source>
+                                <source>src/main/xtend-gen</source>
                             </sources>
                         </configuration>
                     </execution>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
index 986b6eccc5f2a805ff39bdf146c6b896aeb0ef47..d71354451ebda48a7a75a302ab6d6ced6c5552e6 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
@@ -44,7 +44,7 @@
                                         org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
-                                        target/generated-sources/monitoring
+                                        ${project.build.directory}/generated-sources/monitoring
                                     </outputBaseDir>
                                 </generator>
                             </codeGenerators>
@@ -72,7 +72,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>target/generated-sources/sal</source>
+                                <source>${project.build.directory}/generated-sources/monitoring</source>
                             </sources>
                         </configuration>
                     </execution>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
index 471830e48442cec92377fd9f1c6b48fb34637463..eafc8354a08962f928f61fb0a9f4784ed69cb15b 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
@@ -53,7 +53,7 @@
                                         org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
-                                        target/generated-sources/monitoring
+                                        ${project.build.directory}/generated-sources/monitoring
                                     </outputBaseDir>
                                 </generator>
                             </codeGenerators>
@@ -81,7 +81,7 @@
                         </goals>
                         <configuration>
                             <sources>
-                                <source>target/generated-sources/sal</source>
+                                <source>${project.build.directory}/generated-sources/monitoring</source>
                             </sources>
                         </configuration>
                     </execution>