Change source of Jetty, add Aries and Atmosphere

[gpl/argeo-tp.git] / META-INF / spring / apache.xml

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 57579fb95ed5459bcd96f587a3f680a432b0c5e2..0a6d3c2424a306fc26c49ca91c7ae5b7a8ade6cc 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -54,13 +54,19 @@
        </bean>
 
        <bean id="org.apache.mina.core"
-               p:sourceCoords="org.apache.mina:mina-core:2.0.19"
+               p:sourceCoords="org.apache.mina:mina-core:2.0.20"
                parent="template.apacheMaven">
                <property name="doNotModify" value="true" />
        </bean>
 
+       <!-- Needed by Apache SSHD in order to integrate with Unix agent -->
+       <bean id="org.apache.tomcat.jni"
+               p:sourceCoords="org.apache.tomcat:tomcat-jni:9.0.17"
+               parent="template.apacheMaven">
+       </bean>
+
        <flow:flow name="apache/org.apache.sshd" spec="spec.version">
-               <flow:arg name="version" value="2.1.0" />
+               <flow:arg name="version" value="2.2.0" />
                <bean id="org.apache.sshd.core"
                        p:sourceCoords="org.apache.sshd:sshd-core:@{version}"
                        p:doNotModify="true" parent="template.apacheMaven" />
@@ -70,6 +76,11 @@
                        <property name="bndProperties">
                                <props merge="true">
                                        <prop key="Fragment-Host">org.apache.sshd.core</prop>
+                                       <prop key="Import-Package">
+                                               org.bouncycastle.jce.provider;resolution:=optional,
+                                               net.i2p.crypto.eddsa;resolution:=optional,
+                                               *
+                                       </prop>
                                </props>
                        </property>
                </bean>
@@ -314,6 +325,11 @@
                </bean>
        </flow:flow>
 
+       <bean id="org.apache.aries.util" parent="template.ariesMaven"
+               p:sourceCoords="org.apache.aries:org.apache.aries.util:1.1.3" />
+       <bean id="org.apache.aries.spifly.dynamic.bundle"
+               parent="template.ariesMaven"
+               p:sourceCoords="org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:1.2.1" />
 
        <!-- Templates -->
        <bean id="template.apacheMaven" parent="template.mavenWrapper"
@@ -334,4 +350,14 @@
                                static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                </property>
        </bean>
+
+       <bean id="template.ariesMaven" parent="template.mavenWrapper"
+               abstract="true">
+               <property name="groupId" value="org.argeo.tp.apache" />
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
 </beans>
\ No newline at end of file