BUG-7813: remove spring from base distribution

We do not use spring anywhere in the project, hence we can safely
remove it from the distribution, cutting it down by 35MB.

Change-Id: I07e6c8f0996d0d9cc9b0d6c50195a9fbb9f448b7
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/features4-test/pom.xml b/features4-test/pom.xml
index cd2409bb28c3a2414d2badc124455824b6ccbece..44d3908d1705c1036ece2af613ab0236cbba79fe 100644 (file)
--- a/features4-test/pom.xml
+++ b/features4-test/pom.xml
@@ -74,12 +74,6 @@
             <version>${karaf4.version}</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.deployer</groupId>
-            <artifactId>org.apache.karaf.deployer.spring</artifactId>
-            <version>${karaf4.version}</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>org.ops4j.pax.url</groupId>
             <artifactId>pax-url-wrap</artifactId>

diff --git a/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/CustomBundleUrlStreamHandlerFactory.java b/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/CustomBundleUrlStreamHandlerFactory.java
index 2cb221158304312348a3388a8e4d7535f33503a0..9e17d67b86b88b38ef04d528c458047d8817443d 100644 (file)
--- a/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/CustomBundleUrlStreamHandlerFactory.java
+++ b/features4-test/src/main/java/org/opendaylight/odlparent/featuretest/CustomBundleUrlStreamHandlerFactory.java
@@ -26,14 +26,12 @@ import java.net.URLStreamHandlerFactory;
 
 import org.apache.karaf.deployer.blueprint.BlueprintURLHandler;
 import org.apache.karaf.deployer.features.FeatureURLHandler;
-import org.apache.karaf.deployer.spring.SpringURLHandler;
 
 public class CustomBundleUrlStreamHandlerFactory implements URLStreamHandlerFactory {
 
     private static final String MVN_URI_PREFIX = "mvn";
     private static final String WRAP_URI_PREFIX = "wrap";
     private static final String FEATURE_URI_PREFIX = "feature";
-    private static final String SPRING_URI_PREFIX = "spring";
     private static final String BLUEPRINT_URI_PREFIX = "blueprint";
 
     @Override
@@ -45,8 +43,6 @@ public class CustomBundleUrlStreamHandlerFactory implements URLStreamHandlerFact
                 return new org.ops4j.pax.url.wrap.Handler();
             case FEATURE_URI_PREFIX:
                 return new FeatureURLHandler();
-            case SPRING_URI_PREFIX:
-                return new SpringURLHandler();
             case BLUEPRINT_URI_PREFIX:
                 return new BlueprintURLHandler();
             default:

diff --git a/karaf/karaf4-parent/pom.xml b/karaf/karaf4-parent/pom.xml
index e38a3fa22326fa09749438ef25a812025bea1870..dda7f578a8352205ff96ff220ddd7f941779b2d8 100644 (file)
--- a/karaf/karaf4-parent/pom.xml
+++ b/karaf/karaf4-parent/pom.xml
@@ -51,13 +51,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.apache.karaf.features</groupId>
-                <artifactId>spring</artifactId>
-                <version>${karaf4.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -81,13 +74,6 @@
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.features</groupId>
-            <artifactId>spring</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
 
         <!-- ODL Branding -->
         <dependency>