Revert ASM upgrade and Aries Spi Fly introduction

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 1b14b2af5e13abb4c90ae7e74a521e925a29f87d..7a17f19a87c27128ec203f29499d8ba618d2ba29 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -13,8 +13,7 @@
        <bean id="argeo-tp"
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
-               <constructor-arg
-                       value="org.argeo.tp:argeo-tp:2.1.24" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.24" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -57,8 +56,8 @@
                                <ref bean="org.apache.mina.core" />
                                <ref bean="apache/org.apache.sshd" />
                                <ref bean="org.apache.tomcat.jni" />
-                               <ref bean="org.apache.aries.util" />
-                               <ref bean="org.apache.aries.spifly.dynamic.bundle" />
+                               <!-- <ref bean="org.apache.aries.util" /> -->
+                               <!-- <ref bean="org.apache.aries.spifly.dynamic.bundle" /> -->
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index b895d566f9f504490562123633bdb939098f3f83..90b0daf2b67fb96186c7e4f26dd0ef5fab4d2246 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -98,22 +98,22 @@
                </property>
        </bean>
 
-       <!-- <bean id="org.objectweb.asm" p:version="3.1.0" -->
-       <!-- p:sourceCoords="org.eclipse.jetty.orbit:org.objectweb.asm:3.1.0.v200803061910" -->
-       <!-- parent="template.mavenWrapper"> -->
-       <!-- <property name="license"> -->
-       <!-- <util:constant -->
-       <!-- static-field="org.argeo.slc.repo.FreeLicense.BSD" /> -->
-       <!-- </property> -->
-       <!-- </bean> -->
-       <bean id="org.objectweb.asm" p:doNotModify="true"
-               p:sourceCoords="org.ow2.asm:asm-all:5.0.4"
+       <bean id="org.objectweb.asm" p:version="3.1.0"
+               p:sourceCoords="org.eclipse.jetty.orbit:org.objectweb.asm:3.1.0.v200803061910"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant
                                static-field="org.argeo.slc.repo.FreeLicense.BSD" />
                </property>
        </bean>
+       <!-- <bean id="org.objectweb.asm" p:doNotModify="true" -->
+       <!-- p:sourceCoords="org.ow2.asm:asm-all:5.0.4" -->
+       <!-- parent="template.mavenWrapper"> -->
+       <!-- <property name="license"> -->
+       <!-- <util:constant -->
+       <!-- static-field="org.argeo.slc.repo.FreeLicense.BSD" /> -->
+       <!-- </property> -->
+       <!-- </bean> -->
 
        <bean id="org.quartz-scheduler.quartz"
                p:sourceCoords="org.quartz-scheduler:quartz:jar:2.2.1"