From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 8 Oct 2019 16:23:59 +0000 (+0200)
Subject: Introduce Jackson, Jersey and Hamcrest.
X-Git-Tag: v2.3.9~35
X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=ecdf6175f8e4890303ca422102d461a1c2887cbd

Introduce Jackson, Jersey and Hamcrest.
---

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 0196bd0..92b8707 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.25.SNAPSHOT-r201910060708
+Bundle-Version: 2.1.25.SNAPSHOT-r201910081552
 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
@@ -21,20 +21,22 @@ Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version
  g.springframework.beans.factory.config;version="[3.2,4)",org.springfram
  ework.core.io;version="[3.2,4)",javax.security.auth.callback;resolution
  :=optional
-Include-Resource: META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META
- -INF/spring/eclipse.rap.e4.xml=META-INF/spring/eclipse.rap.e4.xml,META-
- INF/spring/distribution.xml=META-INF/spring/distribution.xml,META-INF/s
- pring/apache.xml=META-INF/spring/apache.xml,META-INF/spring/misc.xml=ME
- TA-INF/spring/misc.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/s
- pring/apache.jackrabbit.xml,META-INF/spring/bouncycastle.xml=META-INF/s
- pring/bouncycastle.xml,META-INF/spring/eclipse.rcp.e4.xml=META-INF/spri
- ng/eclipse.rcp.e4.xml,META-INF/spring/javax.xml=META-INF/spring/javax.x
- ml,META-INF/spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/ecli
- pse.jetty.xml=META-INF/spring/eclipse.jetty.xml,META-INF/spring/eclipse
- .rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml,META-INF/spring/eclipse.
- equinox.xml=META-INF/spring/eclipse.equinox.xml,META-INF/spring/templat
- es.xml=META-INF/spring/templates.xml,META-INF/spring/apache.commons.xml
- =META-INF/spring/apache.commons.xml
+Include-Resource: META-INF/spring/jackson.xml=META-INF/spring/jackson.xm
+ l,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META-INF/spring/ecl
+ ipse.rap.e4.xml=META-INF/spring/eclipse.rap.e4.xml,META-INF/spring/dist
+ ribution.xml=META-INF/spring/distribution.xml,META-INF/spring/apache.xm
+ l=META-INF/spring/apache.xml,META-INF/spring/misc.xml=META-INF/spring/m
+ isc.xml,META-INF/spring/apache.jackrabbit.xml=META-INF/spring/apache.ja
+ ckrabbit.xml,META-INF/spring/jersey.xml=META-INF/spring/jersey.xml,META
+ -INF/spring/bouncycastle.xml=META-INF/spring/bouncycastle.xml,META-INF/
+ spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse.rcp.e4.xml,META-INF/s
+ pring/javax.xml=META-INF/spring/javax.xml,META-INF/spring/sdk.xml=META-
+ INF/spring/sdk.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spring/ec
+ lipse.jetty.xml,META-INF/spring/eclipse.rap.e3.xml=META-INF/spring/ecli
+ pse.rap.e3.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/ecli
+ pse.equinox.xml,META-INF/spring/templates.xml=META-INF/spring/templates
+ .xml,META-INF/spring/apache.commons.xml=META-INF/spring/apache.commons.
+ xml
 Private-Package: !*
 SLC-Category: org.argeo.tp.factory
 SLC-ExecutionModule: default
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index fe785f2..c3a0930 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -27,7 +27,6 @@
 				<ref bean="misc/org.slf4j" />
 				<ref bean="slf4j.osgi" />
 				<ref bean="org.aopalliance" />
-				<ref bean="org.junit" />
 				<ref bean="com.jcraft.jsch" />
 				<ref bean="EDU.oswego.cs.dl.util.concurrent" />
 				<ref bean="org.objectweb.asm" />
@@ -66,6 +65,10 @@
 				<ref bean="apache/org.apache.commons.compress" />
 				<ref bean="apache/org.apache.commons.lang3" />
 
+				<!-- Web services -->
+				<ref bean="jackson" />
+				<ref bean="jersey" />
+				
 				<!-- Google -->
 				<ref bean="com.google.guava" />
 				<ref bean="com.google.gson" />
@@ -99,6 +102,8 @@
 				<ref bean="org.h2" />
 
 				<!-- ALM -->
+				<ref bean="org.junit" />
+				<ref bean="org.hamcrest" />
 				<ref bean="org.osgi.annotation.bundle" />
 				<ref bean="biz.aQute.bndlib" />
 				<ref bean="org.redline-rpm" />
diff --git a/META-INF/spring/jackson.xml b/META-INF/spring/jackson.xml
new file mode 100644
index 0000000..b40da9b
--- /dev/null
+++ b/META-INF/spring/jackson.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
+
+	<flow:flow name="jackson" spec="spec.version">
+		<flow:arg name="version" value="2.10.0" />
+		<!-- Jackson Core -->
+		<bean id="com.fasterxml.jackson.core.jackson-core"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.core:jackson-core:@{version}" />
+		<bean id="com.fasterxml.jackson.core.jackson-databind"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.core:jackson-databind:@{version}" />
+		<bean id="com.fasterxml.jackson.core.jackson-annotations"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.core:jackson-annotations:@{version}" />
+		<!-- Jackson Data Types -->
+		<bean id="com.fasterxml.jackson.datatype.jackson-datatype-jsr353"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.datatype:jackson-datatype-jsr353:@{version}" />
+		<bean id="com.fasterxml.jackson.datatype.jackson-datatype-jaxrs"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.datatype:jackson-datatype-jaxrs:@{version}" />
+		<!-- Jackson Data Formats -->
+		<bean id="com.fasterxml.jackson.datatype.jackson-dataformat-csv"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.dataformat:jackson-dataformat-csv:@{version}" />
+		<bean
+			id="com.fasterxml.jackson.dataformat.jackson-dataformat-properties"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.dataformat:jackson-dataformat-properties:@{version}" />
+		<bean
+			id="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:@{version}" />
+		<!-- Jackson JAXRS -->
+		<bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:@{version}" />
+		<bean
+			id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:@{version}" />
+		<bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider:@{version}" />
+	</flow:flow>
+
+	<bean id="template.jacksonMaven" parent="template.mavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.jackson" />
+		<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
diff --git a/META-INF/spring/jersey.xml b/META-INF/spring/jersey.xml
new file mode 100644
index 0000000..d6ec3ae
--- /dev/null
+++ b/META-INF/spring/jersey.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
+
+
+	<flow:flow name="jersey" spec="spec.version">
+		<flow:arg name="version" value="2.29.1" />
+		<bean id="org.glassfish.jersey.core.jersey-common"
+			p:sourceCoords="org.glassfish.jersey.core:jersey-common:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.jersey.core.jersey-client"
+			p:sourceCoords="org.glassfish.jersey.core:jersey-client:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.jersey.core.jersey-server"
+			p:sourceCoords="org.glassfish.jersey.core:jersey-server:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<!-- Containers -->
+		<bean
+			id="org.glassfish.jersey.containers.jersey-container-servlet"
+			p:sourceCoords="org.glassfish.jersey.containers:jersey-container-servlet:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean
+			id="org.glassfish.jersey.containers.jersey-container-servlet-core"
+			p:sourceCoords="org.glassfish.jersey.containers:jersey-container-servlet-core:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean
+			id="org.glassfish.jersey.containers.jersey-container-jetty-http"
+			p:sourceCoords="org.glassfish.jersey.containers:jersey-container-jetty-http:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean
+			id="org.glassfish.jersey.containers.jersey-container-jetty-servlet"
+			p:sourceCoords="org.glassfish.jersey.containers:jersey-container-jetty-servlet:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<!-- Media -->
+		<bean id="org.glassfish.jersey.media.jersey-media-json-jackson"
+			p:sourceCoords="org.glassfish.jersey.media:jersey-media-json-jackson:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+	</flow:flow>
+
+	<bean id="template.jerseyMaven" parent="template.mavenWrapper"
+		abstract="true">
+		<property name="groupId" value="org.argeo.tp.jersey" />
+		<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
diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 1e48dcb..0f887ab 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -417,11 +417,7 @@
 
 	<bean id="org.freemarker"
 		p:sourceCoords="org.freemarker:freemarker:2.3.29"
-		parent="template.mavenWrapper">
-		<property name="license">
-			<util:constant
-				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-		</property>
+		parent="template.mavenWrapperApacheLicense">
 		<property name="doNotModify" value="true" />
 	</bean>
 
diff --git a/META-INF/spring/sdk.xml b/META-INF/spring/sdk.xml
index 49451a0..69801a7 100644
--- a/META-INF/spring/sdk.xml
+++ b/META-INF/spring/sdk.xml
@@ -26,6 +26,15 @@
 		</property>
 	</bean>
 
+	<bean id="org.hamcrest" p:version="2.1.0"
+		p:sourceCoords="org.hamcrest:hamcrest:2.1" parent="template.mavenSdk">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+		</property>
+		<property name="doNotModify" value="true" />
+	</bean>
+
 	<bean id="biz.aQute.bndlib"
 		p:sourceCoords="biz.aQute.bnd:biz.aQute.bndlib:4.2.0"
 		parent="template.mavenSdk">
diff --git a/META-INF/spring/templates.xml b/META-INF/spring/templates.xml
index ff3e528..2a2283f 100644
--- a/META-INF/spring/templates.xml
+++ b/META-INF/spring/templates.xml
@@ -41,6 +41,14 @@
 		<property name="osgiFactory" ref="osgiFactory" />
 	</bean>
 
+	<bean id="template.mavenWrapperApacheLicense"
+		parent="template.mavenWrapper" abstract="true">
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+	</bean>
+
 	<bean id="template.mavenWrapperBSD" parent="template.mavenWrapper"
 		abstract="true">
 		<property name="license">