Argeo TP v2.1.23; adding freemarker and tomcat-jni

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 9863ac79950961ae5fd0a740951d08ed4b2db198..91b312750ded306cea7b73627934ccca7c7c3905 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.22.r201901311524\r
+Bundle-Version: 2.1.23.r201903191635\r
 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version\r
  ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi\r
  ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or\r

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 57579fb95ed5459bcd96f587a3f680a432b0c5e2..b75407e895e48dd30193022f7588edbef61a0285 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>

diff --git a/META-INF/spring/bouncycastle.xml b/META-INF/spring/bouncycastle.xml
index 840ac58d6a4d8466a52607412be786349c7db41f..8cfc632689497ffa61d900cef48d018db544d87c 100644 (file)
--- a/META-INF/spring/bouncycastle.xml
+++ b/META-INF/spring/bouncycastle.xml
@@ -11,9 +11,9 @@
 
        <!-- REGISTER -->
        <flow:flow name="misc/org.bouncycastle" spec="spec.version">
-               <flow:arg name="version" value="1.60" />
+               <flow:arg name="version" value="1.61" />
                <bean id="bcprov"
-                       p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-160.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-161.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -24,7 +24,7 @@
                        </property>
                </bean>
                <bean id="bcpkix"
-                       p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-160.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-161.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -35,7 +35,7 @@
                        </property>
                </bean>
                <bean id="bcmail"
-                       p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-160.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-161.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -46,7 +46,7 @@
                        </property>
                </bean>
                <bean id="bcpg"
-                       p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-160.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-161.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 2c222e6cd8fd70cdca9efa701dc35ce1c3b36c8d..9f55b2ea8cedd401796fdc65043a0142e3eba3f4 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -14,7 +14,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp:2.1.22" />
+                       value="org.argeo.tp:argeo-tp:2.1.23" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -57,6 +57,7 @@
                                <ref bean="apache/org.apache.httpcomponents.httpclient" />
                                <ref bean="org.apache.mina.core" />
                                <ref bean="apache/org.apache.sshd" />
+                               <ref bean="org.apache.tomcat.jni" />
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -109,6 +110,7 @@
                                <ref bean="apache/org.apache.poi" />
                                <ref bean="org.jsoup" />
                                <ref bean="misc/com.vladsch.flexmark" />
+                               <ref bean="org.freemarker" />
                                
                                <!-- Databases -->
                                <ref bean="org.postgresql.jdbc42" />
@@ -126,7 +128,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.22" />
+                       value="org.argeo.tp:argeo-tp-rap-e4:2.1.23" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.e4" />
@@ -138,7 +140,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.22" />
+                       value="org.argeo.tp:argeo-tp-rcp-e4:2.1.23" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rcp.e4" />
@@ -150,7 +152,7 @@
                class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
                <constructor-arg
-                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.22" />
+                       value="org.argeo.tp:argeo-tp-rap-e3:2.1.23" />
                <property name="modules">
                        <list>
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 939011afdcf75c53bd139fba851cba07e5de256f..0cdf1ead4ff50bb8a3a5a90efae45f31f20b03ce 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -353,6 +353,15 @@
                <property name="doNotModify" value="true" />
        </bean>
 
+       <bean id="org.freemarker" p:sourceCoords="org.freemarker:freemarker:2.3.28"
+               parent="template.mavenWrapper">
+               <property name="license">
+                       <util:constant
+                               static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="doNotModify" value="true" />
+       </bean>
+
        <bean id="org.postgresql.jdbc42"
                p:sourceCoords="org.postgresql:postgresql:42.2.5"
                parent="template.mavenWrapper">

diff --git a/pom.xml b/pom.xml
index 0309a8933dc4c8b8099f900ba637dd55b8bb0cca..eb6058671bbaf13194b1ba27bf94b351b7d246b8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.22</version>
+       <version>2.1.23</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>