Merge "Reduce logged messages during build and concentrate only on the ones needed...

diff --combined opendaylight/distribution/opendaylight/pom.xml
index abfc0648af6afd137d8f10c3732037cab61eb506,9120c840d8bae4eeacb9093bf589e39e509cba18..cc42fefd975662a61da91e5e17f4d45f206c6109
--- 1/opendaylight/distribution/opendaylight/pom.xml
--- 2/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -119,11 -119,6 +119,11 @@@
            <artifactId>model-flow-management</artifactId>
            <version>${mdsal.version}</version>
          </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller.md</groupId>
 +          <artifactId>inventory-manager</artifactId>
 +          <version>${mdsal.version}</version>
 +        </dependency>
  
          <dependency>
            <groupId>org.opendaylight.controller</groupId>
@@@ -286,27 -281,17 +286,27 @@@
           </dependency>
           <dependency>
            <groupId>org.opendaylight.yangtools</groupId>
 -          <artifactId>binding-generator-util</artifactId>
 +          <artifactId>binding-generator-spi</artifactId>
            <version>${yangtools.binding.version}</version>
           </dependency>
           <dependency>
            <groupId>org.opendaylight.yangtools</groupId>
 -          <artifactId>binding-model-api</artifactId>
 +          <artifactId>binding-generator-api</artifactId>
            <version>${yangtools.binding.version}</version>
           </dependency>
           <dependency>
            <groupId>org.opendaylight.yangtools</groupId>
 -          <artifactId>binding-generator-spi</artifactId>
 +          <artifactId>binding-generator-impl</artifactId>
 +          <version>${yangtools.binding.version}</version>
 +         </dependency>
 +         <dependency>
 +          <groupId>org.opendaylight.yangtools</groupId>
 +          <artifactId>binding-generator-util</artifactId>
 +          <version>${yangtools.binding.version}</version>
 +         </dependency>
 +         <dependency>
 +          <groupId>org.opendaylight.yangtools</groupId>
 +          <artifactId>binding-model-api</artifactId>
            <version>${yangtools.binding.version}</version>
           </dependency>
           <dependency>
@@@ -373,6 -358,67 +373,67 @@@
          </dependency>
        </dependencies>
      </profile>
+     <profile>
+       <id>integrationtests</id>
+       <activation>
+         <activeByDefault>false</activeByDefault>
+       </activation>
+       <build>
+         <plugins>
+           <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-dependency-plugin</artifactId>
+             <version>2.8</version>
+             <executions>
+               <execution>
+                 <id>copy</id>
+                 <phase>package</phase>
+                 <goals>
+                   <goal>copy</goal>
+                 </goals>
+               </execution>
+             </executions>
+             <configuration>
+               <artifactItems>
+                 <artifactItem>
+                   <groupId>org.opendaylight.controller</groupId>
+                   <artifactId>sanitytest</artifactId>
+                   <version>${controller.version}</version>
+                   <type>jar</type>
+                 </artifactItem>
+               </artifactItems>
+             </configuration>
+           </plugin>
+           <plugin>
+             <groupId>org.codehaus.mojo</groupId>
+             <artifactId>exec-maven-plugin</artifactId>
+             <version>1.2.1</version>
+             <executions>
+               <execution>
+                 <id>sanity-test</id>
+                 <phase>package</phase>
+                 <goals>
+                   <goal>exec</goal>
+                 </goals>
+               </execution>
+             </executions>
+             <configuration>
+               <executable>${java.home}/bin/java</executable>
+               <arguments>
+                 <argument>-cp</argument>
+                 <argument>./target/dependency/*</argument>
+                 <argument>org.opendaylight.controller.distribution.Sanity</argument>
+               </arguments>
+               <environmentVariables>
+                 <JAVA_HOME>
+                   ${java.home}
+                 </JAVA_HOME>
+               </environmentVariables>
+             </configuration>
+           </plugin>
+         </plugins>
+       </build>
+     </profile>
    </profiles>
  
    <artifactId>distribution.opendaylight</artifactId>
@@@ -1248,59 -1294,6 +1309,6 @@@
            </execution>
          </executions>
        </plugin>
- 
-       <plugin>
-         <groupId>org.apache.maven.plugins</groupId>
-         <artifactId>maven-dependency-plugin</artifactId>
-         <version>2.8</version>
-           <executions>
-             <execution>
-               <id>copy</id>
-               <phase>package</phase>
-               <goals>
-                 <goal>copy</goal>
-               </goals>
-             </execution>
-           </executions>
-           <configuration>
-             <artifactItems>
-               <artifactItem>
-                 <groupId>org.opendaylight.controller</groupId>
-                 <artifactId>sanitytest</artifactId>
-                 <version>${controller.version}</version>
-                 <type>jar</type>
-               </artifactItem>
-             </artifactItems>
-           </configuration>
-       </plugin>
- 
-       <plugin>
-         <groupId>org.codehaus.mojo</groupId>
-         <artifactId>exec-maven-plugin</artifactId>
-         <version>1.2.1</version>
-         <executions>
-           <execution>
-             <id>sanity-test</id>
-             <phase>package</phase>
-             <goals>
-               <goal>exec</goal>
-             </goals>
-           </execution>
-         </executions>
-           <configuration>
-             <executable>${java.home}/bin/java</executable>
-             <arguments>
-                 <argument>-cp</argument>
-                 <argument>./target/dependency/*</argument>
-                 <argument>org.opendaylight.controller.distribution.Sanity</argument>
-             </arguments>
-             <environmentVariables>
-               <JAVA_HOME>
-                 ${java.home}
-               </JAVA_HOME>
-             </environmentVariables>
-           </configuration>
-       </plugin>
      </plugins>
    </build>
  </project>

diff --combined opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
index 337648ab03d4cea9d9229ffb2eb83b711144157a,02d8231edf245c525a3c75cb524b0d6f09778d90..f42cd01cf78e5bda4e3b0e4b37e9346d076ba565
--- 1/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
--- 2/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
+++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java
@@@ -17,16 -17,13 +17,17 @@@ import static org.ops4j.pax.exam.CoreOp
  import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
  import static org.ops4j.pax.exam.CoreOptions.options;
  import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+ import org.ops4j.pax.exam.util.PathUtils;
  
  @RunWith(PaxExam.class)
  public class ToasterTest {
  
      public static final String ODL = "org.opendaylight.controller";
      public static final String YANG = "org.opendaylight.yangtools";
 +    public static final String CONTROLLER = "org.opendaylight.controller";
 +    public static final String YANGTOOLS = "org.opendaylight.yangtools";
 +    
 +    
      public static final String SAMPLE = "org.opendaylight.controller.samples";
  
      @Test
@@@ -50,10 -47,16 +51,13 @@@
      @Configuration
      public Option[] config() {
          return options(systemProperty("osgi.console").value("2401"), 
+                 systemProperty("logback.configurationFile").value(
+                     "file:" + PathUtils.getBaseDir()
+                     + "/src/test/resources/logback.xml"),
                  mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(), //
                  mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(), //
                  mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(), //
                  mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject(), //
 -                mavenBundle(ODL, "sal-binding-api").versionAsInProject(), //
 -                mavenBundle(ODL, "sal-binding-config").versionAsInProject(), 
 -                mavenBundle(ODL, "sal-binding-broker-impl").versionAsInProject(), //
                  
                  mavenBundle(ODL, "sal-common").versionAsInProject(), //
                  mavenBundle(ODL, "sal-common-api").versionAsInProject(),//
@@@ -63,37 -66,7 +67,37 @@@
                  mavenBundle(ODL, "config-api").versionAsInProject(), //
                  mavenBundle(ODL, "config-manager").versionAsInProject(), //
                  mavenBundle("commons-io", "commons-io").versionAsInProject(),
 +                mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject(),
                  
 +                mavenBundle(CONTROLLER, "sal-binding-api").versionAsInProject(), //
 +                mavenBundle(CONTROLLER, "sal-binding-config").versionAsInProject(),
 +                mavenBundle(CONTROLLER, "sal-binding-broker-impl").versionAsInProject(), //
 +                mavenBundle("org.javassist", "javassist").versionAsInProject(), //
 +                mavenBundle(CONTROLLER, "sal-common-util").versionAsInProject(), //
 +        
 +                mavenBundle(YANGTOOLS, "yang-data-api").versionAsInProject(), //
 +                mavenBundle(YANGTOOLS, "yang-data-impl").versionAsInProject(), //
 +                mavenBundle(YANGTOOLS, "yang-model-api").versionAsInProject(), //
 +                mavenBundle(YANGTOOLS, "yang-model-util").versionAsInProject(), //
 +                mavenBundle(YANGTOOLS, "yang-parser-api").versionAsInProject(),
 +                mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(),
 +                
 +                
 +                mavenBundle(YANGTOOLS, "binding-generator-spi").versionAsInProject(), //
 +                mavenBundle(YANGTOOLS, "binding-model-api").versionAsInProject(), //
 +                mavenBundle(YANGTOOLS, "binding-generator-util").versionAsInProject(),
 +                mavenBundle(YANGTOOLS, "yang-parser-impl").versionAsInProject(),
 +                mavenBundle(YANGTOOLS, "binding-type-provider").versionAsInProject(),
 +                mavenBundle(YANGTOOLS, "binding-generator-api").versionAsInProject(),
 +                mavenBundle(YANGTOOLS, "binding-generator-spi").versionAsInProject(),
 +                mavenBundle(YANGTOOLS, "binding-generator-impl").versionAsInProject(),
 +                
 +                
 +                mavenBundle(CONTROLLER, "sal-core-api").versionAsInProject().update(), //
 +                mavenBundle(CONTROLLER, "sal-broker-impl").versionAsInProject(), //
 +                mavenBundle(CONTROLLER, "sal-core-spi").versionAsInProject().update(), //
 +                
 +                mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), //
                  
                  mavenBundle(SAMPLE, "sample-toaster").versionAsInProject(), //
                  mavenBundle(SAMPLE, "sample-toaster-consumer").versionAsInProject(), //