X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fdistribution%2Fopendaylight%2Fsrc%2Fassemble%2Fbin.xml;h=6f8878bee950b87a3b234f00e19570a8b6256cfc;hp=7a2be8f099e7db3ec33e223caeebff50c542a4a1;hb=91d7c1ee52322acad08e9f81228ac36b3aa684f5;hpb=d78e985bc4ed590407c8c7800ba796d5ea55aa6c

diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 7a2be8f099..6f8878bee9 100644
--- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@ -7,43 +7,6 @@
     <format>zip</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
-  <moduleSets>
-    <moduleSet>
-      <excludes>
-        <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>
-        <exclude>org.opendaylight.controller:containermanager.it.implementation</exclude>
-        <exclude>org.opendaylight.controller:hosttracker_new</exclude>
-        <exclude>org.opendaylight.controller:hosttracker_new.implementation</exclude>
-        <exclude>org.opendaylight.controller:checkstyle</exclude>
-        <exclude>org.opendaylight.controller:sanitytest</exclude>
-      </excludes>
-      <binaries>
-        <outputDirectory>opendaylight/plugins</outputDirectory>
-        <outputFileNameMapping>
-          ${module.groupId}.${module.artifactId}-${module.version}${dashClassifier?}.${module.extension}
-        </outputFileNameMapping>
-        <unpack>false</unpack>
-        <includeDependencies>false</includeDependencies>
-      </binaries>
-    </moduleSet>
-    <moduleSet>
-      <includes>
-        <include>org.opendaylight.controller:logging.bridge</include>
-      </includes>
-      <binaries>
-        <outputDirectory>opendaylight/lib</outputDirectory>
-        <outputFileNameMapping>
-          ${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
-        </outputFileNameMapping>
-        <unpack>false</unpack>
-        <includeDependencies>false</includeDependencies>
-      </binaries>
-    </moduleSet>
-  </moduleSets>
   <dependencySets>
     <dependencySet>
       <outputDirectory>opendaylight/plugins</outputDirectory>
@@ -61,8 +24,9 @@
         <exclude>ch.qos.logback:logback-core</exclude>
         <exclude>ch.qos.logback:logback-classic</exclude>
         <exclude>com.sun.jersey:jersey-core</exclude>
-        <exclude>com.sun.jersey:jersey-json</exclude>
         <exclude>com.sun.jersey:jersey-server</exclude>
+        <exclude>org.opendaylight.controller:logging.bridge</exclude>
+        <exclude>org.opendaylight.controller:sanitytest</exclude>
       </excludes>
       <outputFileNameMapping>
         ${artifact.groupId}.${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}
@@ -87,8 +51,8 @@
         <include>ch.qos.logback:logback-core</include>
         <include>ch.qos.logback:logback-classic</include>
         <include>com.sun.jersey:jersey-core</include>
-        <include>com.sun.jersey:jersey-json</include>
         <include>com.sun.jersey:jersey-server</include>
+        <include>org.opendaylight.controller:logging.bridge</include>
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputFileNameMapping>