From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 19 Mar 2019 16:41:34 +0000 (+0100)
Subject: Argeo TP v2.1.23; adding freemarker and tomcat-jni
X-Git-Tag: v2.3.9~53
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=07e2a7f558d540616ef1fe83ae41a39d4c34a07a

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

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 9863ac7..91b3127 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.argeo.tp.factory.core
-Bundle-Version: 2.1.22.r201901311524
+Bundle-Version: 2.1.23.r201903191635
 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version
  ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi
  ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or
diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 57579fb..b75407e 100644
--- 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 840ac58..8cfc632 100644
--- 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 2c222e6..9f55b2e 100644
--- 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 939011a..0cdf1ea 100644
--- 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 0309a89..eb60586 100644
--- 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>