From 562e0998cf0f62fd5b396c26615836cc17b9104f Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 14 Oct 2019 11:44:36 +0200
Subject: [PATCH] Keep working on new thrid parties.

---
 META-INF/spring/distribution.xml |  13 ++--
 META-INF/spring/jackson.xml      |  18 ++----
 META-INF/spring/jersey.xml       | 106 -------------------------------
 META-INF/spring/misc.xml         |  29 +++++----
 4 files changed, 31 insertions(+), 135 deletions(-)
 delete mode 100644 META-INF/spring/jersey.xml

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 5bb0543..1952aea 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -23,9 +23,9 @@
 				<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.persistence" /> -->
+				<!-- <ref bean="javax.xml.bind" /> -->
+				<!-- <ref bean="javax.ws.rs" /> -->
 				<!-- <ref bean="javax.annotation" /> -->
 
 				<!-- Standalone projects -->
@@ -42,7 +42,7 @@
 				<ref bean="org.w3c.dom.svg" />
 				<ref bean="org.tukaani.xz" />
 				<ref bean="net.i2p.crypto.eddsa" />
-				<ref bean="javassist" />
+				<ref bean="org.yaml.snakeyaml" />
 
 				<!-- Apache -->
 				<ref bean="apache/org.apache.log4j" />
@@ -73,11 +73,12 @@
 
 				<!-- Web services -->
 				<ref bean="ws/jackson" />
-				<ref bean="ws/hk2" />
-				<ref bean="ws/jersey" />
+				<!-- <ref bean="ws/hk2" /> -->
+				<!-- <ref bean="ws/jersey" /> -->
 
 				<!-- Google -->
 				<ref bean="com.google.guava" />
+				<ref bean="com.google.guava.failureaccess" />
 				<ref bean="com.google.gson" />
 
 				<!-- Eclipse -->
diff --git a/META-INF/spring/jackson.xml b/META-INF/spring/jackson.xml
index 72824aa..fef7164 100644
--- a/META-INF/spring/jackson.xml
+++ b/META-INF/spring/jackson.xml
@@ -40,17 +40,13 @@
 			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}" />
+		<!-- 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}" 
+			/> -->
 		<!-- Jackson modules -->
 		<bean
 			id="com.fasterxml.jackson.module.jackson-module-jaxb-annotations"
diff --git a/META-INF/spring/jersey.xml b/META-INF/spring/jersey.xml
deleted file mode 100644
index 4ad1754..0000000
--- a/META-INF/spring/jersey.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?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="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}"
-			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>
-		<!-- 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"
-		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 8f7ad0d..7d56af6 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -36,16 +36,6 @@
 		</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" />
@@ -175,9 +165,18 @@
 	</bean>
 
 	<bean id="com.google.guava"
-		p:sourceCoords="com.google.guava:guava:jar:26.0-jre"
+		p:sourceCoords="com.google.guava:guava:jar:27.1-jre"
+		parent="template.mavenWrapper">
+		<property name="version" value="27.1.0.jre" />
+		<property name="license">
+			<util:constant
+				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+		</property>
+		<property name="doNotModify" value="true" />
+	</bean>
+	<bean id="com.google.guava.failureaccess"
+		p:sourceCoords="com.google.guava:failureaccess:1.0.1"
 		parent="template.mavenWrapper">
-		<property name="version" value="26.0.0" />
 		<property name="license">
 			<util:constant
 				static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
@@ -431,6 +430,12 @@
 		<property name="doNotModify" value="true" />
 	</bean>
 
+	<bean id="org.yaml.snakeyaml"
+		p:sourceCoords="org.yaml:snakeyaml:1.25"
+		parent="template.mavenWrapperApacheLicense">
+		<property name="doNotModify" value="true" />
+	</bean>
+
 	<bean id="org.postgresql.jdbc42"
 		p:sourceCoords="org.postgresql:postgresql:42.2.8"
 		parent="template.mavenWrapper">
-- 
2.30.2