From 70df887e075f3e4d2d67d6e65eb58e2ddc1eea0f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 10 Oct 2019 13:28:18 +0200
Subject: [PATCH] Work on Jersey packaging.

---
 META-INF/spring/distribution.xml | 13 +++++++---
 META-INF/spring/jackson.xml      |  7 ++++-
 META-INF/spring/javax.xml        | 21 +++++++++++++--
 META-INF/spring/jersey.xml       | 44 +++++++++++++++++++++++++++++++-
 META-INF/spring/misc.xml         | 10 ++++++++
 5 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index c3a0930..5bb0543 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -21,7 +21,12 @@
 				<ref bean="javax.jcr" />
 				<ref bean="javax.transaction" />
 				<ref bean="javax.mail" />
+				<!-- Javax4hipsters -->
 				<ref bean="javax.websocket" />
+				<ref bean="javax.persistence" />
+				<ref bean="javax.xml.bind" />
+				<ref bean="javax.ws.rs" />
+				<!-- <ref bean="javax.annotation" /> -->
 
 				<!-- Standalone projects -->
 				<ref bean="misc/org.slf4j" />
@@ -37,6 +42,7 @@
 				<ref bean="org.w3c.dom.svg" />
 				<ref bean="org.tukaani.xz" />
 				<ref bean="net.i2p.crypto.eddsa" />
+				<ref bean="javassist" />
 
 				<!-- Apache -->
 				<ref bean="apache/org.apache.log4j" />
@@ -66,9 +72,10 @@
 				<ref bean="apache/org.apache.commons.lang3" />
 
 				<!-- Web services -->
-				<ref bean="jackson" />
-				<ref bean="jersey" />
-				
+				<ref bean="ws/jackson" />
+				<ref bean="ws/hk2" />
+				<ref bean="ws/jersey" />
+
 				<!-- Google -->
 				<ref bean="com.google.guava" />
 				<ref bean="com.google.gson" />
diff --git a/META-INF/spring/jackson.xml b/META-INF/spring/jackson.xml
index b40da9b..72824aa 100644
--- a/META-INF/spring/jackson.xml
+++ b/META-INF/spring/jackson.xml
@@ -9,7 +9,7 @@
 	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:flow name="ws/jackson" spec="spec.version">
 		<flow:arg name="version" value="2.10.0" />
 		<!-- Jackson Core -->
 		<bean id="com.fasterxml.jackson.core.jackson-core"
@@ -51,6 +51,11 @@
 		<bean id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-xml-provider"
 			parent="template.jacksonMaven"
 			p:sourceCoords="com.fasterxml.jackson.jaxrs:jackson-jaxrs-xml-provider:@{version}" />
+		<!-- Jackson modules -->
+		<bean
+			id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations"
+			parent="template.jacksonMaven"
+			p:sourceCoords="com.fasterxml.jackson.module:jackson-module-jaxb-annotations:@{version}" />
 	</flow:flow>
 
 	<bean id="template.jacksonMaven" parent="template.mavenWrapper"
diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml
index 046b222..1daeb1e 100644
--- a/META-INF/spring/javax.xml
+++ b/META-INF/spring/javax.xml
@@ -60,8 +60,8 @@
 		</property>
 	</bean>
 
-	<bean id="javax.annotation" p:version="1.2.0"
-		p:sourceCoords="javax.annotation:javax.annotation-api:1.2"
+	<bean id="javax.annotation"
+		p:sourceCoords="javax.annotation:javax.annotation-api:1.3.2"
 		parent="template.mavenJavax">
 		<property name="license">
 			<!-- GPL with classpath exception -->
@@ -70,12 +70,29 @@
 		</property>
 	</bean>
 
+	<!-- Hipster technologies -->
 	<bean id="javax.websocket"
 		p:sourceCoords="javax.websocket:javax.websocket-api:1.1"
 		parent="template.mavenJavax">
 		<property name="doNotModify" value="true" />
 	</bean>
 
+	<bean id="javax.persistence"
+		p:sourceCoords="org.eclipse.persistence:javax.persistence:2.2.1"
+		parent="template.mavenJavax">
+		<property name="doNotModify" value="true" />
+	</bean>
+
+	<bean id="javax.ws.rs"
+		p:sourceCoords="javax.ws.rs:javax.ws.rs-api:2.1.1"
+		parent="template.mavenJavax">
+	</bean>
+
+	<bean id="javax.xml.bind" p:version="2.4.0"
+		p:sourceCoords="javax.xml.bind:jaxb-api:2.4.0-b180830.0359"
+		parent="template.mavenJavax">
+	</bean>
+
 	<!-- Templates -->
 	<bean name="template.mavenJavax" p:groupId="org.argeo.tp.javax"
 		abstract="true" parent="template.mavenWrapper" />
diff --git a/META-INF/spring/jersey.xml b/META-INF/spring/jersey.xml
index d6ec3ae..4ad1754 100644
--- a/META-INF/spring/jersey.xml
+++ b/META-INF/spring/jersey.xml
@@ -10,7 +10,7 @@
 	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:flow name="ws/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}"
@@ -50,6 +50,48 @@
 			p:sourceCoords="org.glassfish.jersey.media:jersey-media-json-jackson:@{version}"
 			parent="template.jerseyMaven">
 		</bean>
+		<!-- Inject -->
+		<bean id="org.glassfish.jersey.inject.jersey-hk2"
+			p:sourceCoords="org.glassfish.jersey.inject:jersey-hk2:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<!-- Ext -->
+		<bean id="org.glassfish.jersey.ext.jersey-entity-filtering"
+			p:sourceCoords="org.glassfish.jersey.ext:jersey-entity-filtering:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.jersey.ext.jersey-mvc"
+			p:sourceCoords="org.glassfish.jersey.ext:jersey-mvc:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.jersey.ext.jersey-mvc-freemarker"
+			p:sourceCoords="org.glassfish.jersey.ext:jersey-mvc-freemarker:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+	</flow:flow>
+
+	<flow:flow name="ws/hk2" spec="spec.version">
+		<flow:arg name="version" value="2.6.1" />
+		<bean id="org.glassfish.hk2.utils"
+			p:sourceCoords="org.glassfish.hk2:hk2-utils:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.hk2.api"
+			p:sourceCoords="org.glassfish.hk2:hk2-api:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.hk2.core"
+			p:sourceCoords="org.glassfish.hk2:hk2-core:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.hk2.locator"
+			p:sourceCoords="org.glassfish.hk2:hk2-locator:@{version}"
+			parent="template.jerseyMaven">
+		</bean>
+		<bean id="org.glassfish.hk2.osgi-resource-locator"
+			p:sourceCoords="org.glassfish.hk2:osgi-resource-locator:1.0.3"
+			parent="template.jerseyMaven">
+		</bean>
 	</flow:flow>
 
 	<bean id="template.jerseyMaven" parent="template.mavenWrapper"
diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 0f887ab..8f7ad0d 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -36,6 +36,16 @@
 		</property>
 	</bean>
 
+	<bean id="javassist" p:version="3.26.0"
+		p:sourceCoords="org.javassist:javassist:3.26.0-GA"
+		parent="template.mavenWrapper">
+		<property name="doNotModify" value="true" />
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+	</bean>
+
 	<bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.199"
 		parent="template.mavenWrapper">
 		<property name="doNotModify" value="true" />
-- 
2.30.2