Merge "Prevent stub and integrationtest plugins to go into the distribution of openda...

diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 96ecf13a81cee18c9091d5b51e03e44951c4f1bf..8c00d7f0fcf8b4b9553e3ea0a1e0b93e83158f3a 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@ -13,6 +13,8 @@
         <exclude>org.opendaylight.controller.thirdparty:org.openflow.openflowj</exclude>
         <exclude>org.opendaylight.controller:clustering.stub</exclude>
                <exclude>org.opendaylight.controller:logging.bridge</exclude>
+               <exclude>org.opendaylight.controller:protocol_plugins.stub</exclude>
+               <exclude>org.opendaylight.controller:*.integrationtest</exclude>
       </excludes>
       <binaries>
         <outputDirectory>opendaylight/plugins</outputDirectory>
@@ -82,7 +84,6 @@
                <include>com.sun.jersey:jersey-core</include>
                <include>com.sun.jersey:jersey-json</include>
                <include>com.sun.jersey:jersey-server</include>
-               
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputFileNameMapping>

diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml
index 44746e565393bd333dcbb723b20dc393ee1854ef..dbf3cf2024d0429702eba2beb202974d5a1140f4 100644 (file)
--- a/opendaylight/switchmanager/api/pom.xml
+++ b/opendaylight/switchmanager/api/pom.xml
@@ -18,7 +18,7 @@
     <!-- Sonar properties using jacoco to retrieve integration test results -->
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-    <sonar.jacoco.Reportpath>target/jacobo.exec</sonar.jacoco.Reportpath>
+    <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
     <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <sonar.language>java</sonar.language>
   </properties>

diff --git a/opendaylight/switchmanager/integrationtest/src/test/resources/logback.xml b/opendaylight/switchmanager/integrationtest/src/test/resources/logback.xml
new file mode 100644 (file)
index 0000000..2d63ce5
--- /dev/null
+++ b/opendaylight/switchmanager/integrationtest/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration scan="true">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root level="error">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>