From 8374554ca9c5d1be766159674729c074b3037308 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 3 May 2019 08:15:30 +0200
Subject: [PATCH] Revert ASM upgrade and Aries Spi Fly introduction

---
 META-INF/spring/distribution.xml |  7 +++----
 META-INF/spring/misc.xml         | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 1b14b2a..7a17f19 100644
--- 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 b895d56..90b0daf 100644
--- 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"
-- 
2.30.2