Merge "Change target to ${project.build.target} in a bunch of pom file. Add some...
authorGiovanni Meo <gmeo@cisco.com>
Thu, 23 Jan 2014 09:05:39 +0000 (09:05 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 23 Jan 2014 09:05:39 +0000 (09:05 +0000)
opendaylight/config/pom.xml
opendaylight/config/yang-test/pom.xml
opendaylight/md-sal/pom.xml
opendaylight/md-sal/sal-binding-broker/pom.xml
opendaylight/md-sal/sal-dom-broker/pom.xml
opendaylight/md-sal/sal-netconf-connector/pom.xml
opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
opendaylight/netconf/ietf-netconf-monitoring/pom.xml

index ad89a32..ad6ac31 100644 (file)
                             <goal>report</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${basedir}/target/jacoco</outputDirectory>
+                            <outputDirectory>${project.build.directory}/jacoco</outputDirectory>
                             <haltOnFailure>false</haltOnFailure>
                             <check>
                                 <classRatio>80</classRatio>
                                     </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>
index 19e2273..b9f9235 100644 (file)
                                         org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
                                     </codeGeneratorClass>
                                     <outputBaseDir>
-                                        target/generated-sources/sal
+                                        ${project.build.directory}/generated-sources/sal
                                     </outputBaseDir>
                                 </generator>
                             </codeGenerators>
index acbdb9f..a53dadf 100644 (file)
                             <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>
index 6dc91e0..0f490eb 100644 (file)
@@ -76,6 +76,7 @@
                         <configuration>
                             <sources>
                                 <source>${project.build.directory}/generated-sources/config</source>
+                                <source>src/main/xtend-gen</source>
                             </sources>
                         </configuration>
                     </execution>
index 5c53f76..cf2a5b2 100644 (file)
                         <configuration>
                             <sources>
                                 <source>${project.build.directory}/generated-sources/config</source>
+                                <source>src/main/xtend-gen</source>
                             </sources>
                         </configuration>
                     </execution>
index 61a84b6..89f576c 100644 (file)
                         <configuration>
                             <sources>
                                 <source>${project.build.directory}/generated-sources/config</source>
+                                <source>src/main/xtend-gen</source>
                             </sources>
                         </configuration>
                     </execution>
index 986b6ec..d713544 100644 (file)
@@ -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>
index 471830e..eafc835 100644 (file)
@@ -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>