Miscelanous fix for Eclipse users

- Make sure the jacoco-maven-plugin is not contemplated by m2e in md-sal.
- Make sure the assembly target runs from the release pom project as
opposed to the distribution as it was done before.
- Silent warning from the module
org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort they
don't seem at all warning rather simple advices

Change-Id: I379274caff84c29c1f815c14b1d8530ac689957d
Signed-off-by: Giovanni Meo <gmeo@cisco.com>

diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit-noclean.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit-noclean.launch
index 6692472a785247492918e23c8851a58d93a141b0..6900327793271c2e49af306fa79565249fd5fbbe 100644 (file)
--- a/opendaylight/distribution/opendaylight/opendaylight-assembleit-noclean.launch
+++ b/opendaylight/distribution/opendaylight/opendaylight-assembleit-noclean.launch
@@ -17,5 +17,5 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>

-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/distribution.opendaylight}"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/releasepom}"/>

 </launchConfiguration>
 </launchConfiguration>

diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit-skiput.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit-skiput.launch
index 3a212790008a8817252eb9a90441a6437d4382b6..15762702a32f1075e68256fd90ea09d2820b5540 100644 (file)
--- a/opendaylight/distribution/opendaylight/opendaylight-assembleit-skiput.launch
+++ b/opendaylight/distribution/opendaylight/opendaylight-assembleit-skiput.launch
@@ -21,5 +21,5 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>

-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/distribution.opendaylight}"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/releasepom}"/>

 </launchConfiguration>
 </launchConfiguration>

diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit-sonar.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit-sonar.launch
index e22976f0a3dfd177c6e5fbd1106a0a0e8846a4d3..9134816463f6c707ca01fb0cc9380d3f60cc5e9c 100644 (file)
--- a/opendaylight/distribution/opendaylight/opendaylight-assembleit-sonar.launch
+++ b/opendaylight/distribution/opendaylight/opendaylight-assembleit-sonar.launch
@@ -19,5 +19,5 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>

-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/distribution.opendaylight}"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/releasepom}"/>

 </launchConfiguration>
 </launchConfiguration>

diff --git a/opendaylight/distribution/opendaylight/opendaylight-assembleit.launch b/opendaylight/distribution/opendaylight/opendaylight-assembleit.launch
index d63bad02cca2be05b9d31416a5d812a1fd19e47b..7d9433399b7fa1cfe6696f5c9feead5fc922904f 100644 (file)
--- a/opendaylight/distribution/opendaylight/opendaylight-assembleit.launch
+++ b/opendaylight/distribution/opendaylight/opendaylight-assembleit.launch
@@ -17,5 +17,5 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>

-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/distribution.opendaylight}"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/releasepom}"/>

 </launchConfiguration>
 </launchConfiguration>

diff --git a/opendaylight/distribution/opendaylight/opendaylight-sonar.launch b/opendaylight/distribution/opendaylight/opendaylight-sonar.launch
index 13fda5ba461d00f894e8fa793663be0522d5b7c2..e63b9f1133879c640a7c6582402e8439eb14a6e7 100644 (file)
--- a/opendaylight/distribution/opendaylight/opendaylight-sonar.launch
+++ b/opendaylight/distribution/opendaylight/opendaylight-sonar.launch
@@ -17,5 +17,5 @@
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx768m -XX:MaxPermSize=256m"/>

-<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/distribution.opendaylight}"/>
+<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/releasepom}"/>

 </launchConfiguration>
 </launchConfiguration>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml
index 7d04a12a14d6143fca2aa7ef9f105a4ec1f3aa56..c61b41c06542a24167fa863474b18198a7c32d3a 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml
@@ -36,6 +36,8 @@
   <!--  Base log level  -->
   <logger name="org.opendaylight" level="INFO"/>
 
   <!--  Base log level  -->
   <logger name="org.opendaylight" level="INFO"/>
 

+  <logger name="org.opendaylight.yangtools.yang.parser.util.ModuleDependencySort" level="ERROR"/>
+

   <!-- Controller log level -->
   <logger name="org.opendaylight.controller" level="INFO"/>
 
   <!-- Controller log level -->
   <logger name="org.opendaylight.controller" level="INFO"/>
 

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index 9646fc8c0aa5488f0a9a589dc66827ac8fd6189c..a6697037da11833f6e71d97eb954f808e55e23f4 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -244,6 +244,34 @@
     <build>
         <pluginManagement>
             <plugins>
     <build>
         <pluginManagement>
             <plugins>

+                <!--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>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                  <pluginExecutionFilter>
+                                    <groupId>org.jacoco</groupId>
+                                    <artifactId>jacoco-maven-plugin</artifactId>
+                                    <versionRange>[0.0,)</versionRange>
+                                    <goals>
+                                      <goal>prepare-agent</goal>
+                                      <goal>pre-test</goal>
+                                      <goal>post-test</goal>
+                                    </goals>
+                                  </pluginExecutionFilter>
+                                  <action>
+                                    <ignore />
+                                  </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>

                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>


@@ -339,6 +367,7 @@
                     </configuration>
                 </plugin>
             </plugins>
                     </configuration>
                 </plugin>
             </plugins>

+

         </pluginManagement>
         <plugins>
             <plugin>
         </pluginManagement>
         <plugins>
             <plugin>