commit 344ea7a714bc9dc7116ff8224a5816ac2242c70f
author Brian O'Connor <bocon@onlab.us> Mon Apr 04 14:08:33 2016 -0700
committer Brian O'Connor <bocon@onlab.us> Tue Apr 05 00:28:17 2016 +0000
tree 2048201248b620e04753158ed1f4f07968e2fa6e
parent 47047b2f65450e81269f4f2aab6f95016442cd3d

Removing commons-io and concurrent-trees from onlab-thirdparty

Change-Id: Id65a4e05292d9ca2e7a743c48b96c09767602e1d

core/store/primitives/pom.xml

diff --git a/core/store/primitives/pom.xml b/core/store/primitives/pom.xml
index 0c0fa4a..86fa6a3 100644
--- a/core/store/primitives/pom.xml
+++ b/core/store/primitives/pom.xml
@@ -68,5 +68,10 @@
             <groupId>org.onosproject</groupId>
             <artifactId>onlab-thirdparty</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons.io.version}</version>
+        </dependency>
     </dependencies>
 </project>

features/features.xml

diff --git a/features/features.xml b/features/features.xml
index 5c07f8f..ac8125c 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -54,6 +54,8 @@
         <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
 
         <bundle>mvn:com.typesafe/config/1.2.1</bundle>
+        <bundle>wrap:mvn:com.googlecode.concurrent-trees/concurrent-trees/2.4.0$Bundle-SymbolicName=concurrent-trees&amp;Bundle-Version=2.4.0</bundle>
+        <bundle>mvn:commons-io/commons-io/2.4</bundle>
         <bundle>mvn:org.onosproject/onlab-thirdparty/@ONOS-VERSION</bundle>
 
         <bundle>mvn:org.glassfish.jersey.core/jersey-client/2.22.2</bundle>

utils/thirdparty/pom.xml

diff --git a/utils/thirdparty/pom.xml b/utils/thirdparty/pom.xml
index e227658..a1fbcd4 100644
--- a/utils/thirdparty/pom.xml
+++ b/utils/thirdparty/pom.xml
@@ -33,17 +33,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.googlecode.concurrent-trees</groupId>
-      <artifactId>concurrent-trees</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${commons.io.version}</version>
-    </dependency>
-
-    <dependency>
         <groupId>io.atomix.catalyst</groupId>
         <artifactId>catalyst-transport</artifactId>
         <version>${catalyst.version}</version>
@@ -104,25 +93,11 @@
               <exclude>org.ow2.asm:asm</exclude>
               <exclude>org.objenesis:objenesis</exclude>
               <exclude>io.netty:*</exclude>
+              <exclude>commons-io:commons-io</exclude>
             </excludes>
           </artifactSet>
 
           <filters>
-
-            <filter>
-              <artifact>com.googlecode.concurrent-trees:concurrent-trees</artifact>
-              <includes>
-                <include>com/googlecode/**</include>
-              </includes>
-            </filter>
-
-            <filter>
-              <artifact>commons-io:commons-io</artifact>
-              <includes>
-                <include>org/apache/commons/io/**</include>
-              </includes>
-            </filter>
-
             <filter>
               <artifact>org.onosproject:copycat*</artifact>
                 <includes>
@@ -134,14 +109,6 @@
             </filter>
 
             <filter>
-              <artifact>org.onosproject</artifact>
-                <excludes>
-                  <exclude>org/apache/commons/io/**</exclude>
-                  <exclude>com/googlecode/concurrenttrees/**</exclude>
-                </excludes>
-            </filter>
-
-            <filter>
               <artifact>io.atomix:atomix-all</artifact>
                 <includes>
                   <include>**</include>
@@ -165,7 +132,7 @@
         <configuration>
           <instructions>
             <Export-Package>
-              com.googlecode.concurrenttrees.*;net.kuujo.copycat.*;io.atomix.*;org.apache.commons.io.*
+              net.kuujo.copycat.*;io.atomix.*
             </Export-Package>
             <Import-Package>
               !sun.nio.ch,!sun.misc,*