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 ae9126386a7ac38e3e99ccbf772f273ec2eb65b6..0a6d3c2424a306fc26c49ca91c7ae5b7a8ade6cc 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -54,17 +54,53 @@
        </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>
 
-       <bean id="org.apache.sshd.core"
-               p:sourceCoords="org.apache.sshd:sshd-core:2.0.0"
+       <!-- 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">
-               <property name="doNotModify" value="true" />
        </bean>
 
+       <flow:flow name="apache/org.apache.sshd" spec="spec.version">
+               <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" />
+               <bean id="org.apache.sshd.common"
+                       p:sourceCoords="org.apache.sshd:sshd-common:@{version}"
+                       parent="template.apacheMaven">
+                       <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>
+               <bean id="org.apache.sshd.sftp"
+                       p:sourceCoords="org.apache.sshd:sshd-sftp:@{version}"
+                       p:doNotModify="true" parent="template.apacheMaven" />
+               <bean id="org.apache.sshd.cli"
+                       p:sourceCoords="org.apache.sshd:sshd-cli:@{version}"
+                       p:doNotModify="true" parent="template.apacheMaven" />
+               <bean id="org.apache.sshd.scp"
+                       p:sourceCoords="org.apache.sshd:sshd-scp:@{version}"
+                       p:doNotModify="true" parent="template.apacheMaven" />
+               <bean id="org.apache.sshd.putty"
+                       p:sourceCoords="org.apache.sshd:sshd-putty:@{version}"
+                       p:doNotModify="true" parent="template.apacheMaven" />
+               <bean id="org.apache.sshd.git"
+                       p:sourceCoords="org.apache.sshd:sshd-git:@{version}"
+                       p:doNotModify="true" parent="template.apacheMaven" />
+       </flow:flow>
+
        <!-- Log4j12 Factory -->
        <flow:flow name="apache/org.apache.log4j" spec="spec.version">
                <flow:arg name="version" value="1.2.17" />
@@ -289,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"
@@ -309,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