From: mbaudier <mbaudier@argeo.org>
Date: Fri, 13 Nov 2015 16:30:27 +0000 (+0100)
Subject: Argeo TP v2.1.12
X-Git-Tag: v2.3.9~91^2~1
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=1e22914984c5a2bb8ded714e29ae09b8e7d88ba4

Argeo TP v2.1.12
- gson and guava
- SAC and CSS parser
---

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 1248247..14329f3 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1444406203867
-Build-Jdk: 1.7.0_85
+Bnd-LastModified: 1447432174714
+Build-Jdk: 1.7.0_91
 Built-By: mbaudier
 Bundle-Description: SLC execution modules for generic tasks, to be used 
  as parent pom
@@ -11,7 +11,7 @@ Bundle-Name: Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-SymbolicName: org.argeo.tp.factory.core
 Bundle-Vendor: Argeo
-Bundle-Version: 2.1.12.SNAPSHOT-r151009_1756
+Bundle-Version: 2.1.12.r151113_1729
 Created-By: Apache Maven Bundle Plugin
 Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback
  ;resolution:=optional,net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 42ef629..71dfa6b 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -39,6 +39,8 @@
 				<ref bean="org.quartz-scheduler.quartz" />
 				<ref bean="org.quartz-scheduler.quartz.jobs" />
 				<ref bean="bitronix.tm" />
+				<ref bean="misc/org.w3c.css.sac"/>
+				<ref bean="com.steadystate.css"/>
 
 				<!-- Apache Commons -->
 				<ref bean="apache/org.apache.commons.io" />
@@ -53,6 +55,10 @@
 				<ref bean="apache/org.apache.commons.exec" />
 				<ref bean="apache/org.apache.commons.jci" />
 				<ref bean="apache/org.apache.commons.compress" />
+				
+				<!-- Google -->
+				<ref bean="com.google.guava" />
+				<ref bean="com.google.gson" />
 
 				<!-- Eclipse -->
 				<ref bean="eclipse/org.argeo.tp.jetty" />
@@ -70,8 +76,6 @@
 				
 				<!-- Spring -->
 				<ref bean="spring/org.springframework" />
-<!-- 				<ref bean="org.springframework.ldap" /> -->
-<!-- 				<ref bean="spring/org.springframework.security" /> -->
 			</list>
 		</property>
 	</bean>
diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 7d98f63..313da40 100644
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -121,7 +121,7 @@
 			</props>
 		</property>
 	</bean>
-	
+
 	<bean id="org.quartz-scheduler.quartz.jobs" p:sourceCoords="org.quartz-scheduler:quartz-jobs:jar:2.2.1"
 		parent="template.mavenWrapper">
 		<property name="license">
@@ -152,7 +152,7 @@
 			</props>
 		</property>
 	</bean>
-	
+
 	<bean id="bitronix.tm" p:sourceCoords="org.codehaus.btm:btm:2.1.4"
 		parent="template.mavenWrapper">
 		<property name="license">
@@ -169,6 +169,29 @@
 		</property>
 	</bean>
 
+	<bean id="com.google.guava" p:sourceCoords="com.google.guava:guava:jar:18.0"
+		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="com.google.gson" p:sourceCoords="com.google.code.gson:gson:jar:2.4"
+		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="com.steadystate.css" p:sourceCoords="net.sourceforge.cssparser:cssparser:jar:0.9.18"
+		parent="template.mavenWrapper">
+		<property name="license">
+			<util:constant static-field="org.argeo.slc.repo.FreeLicense.LGPL" />
+		</property>
+	</bean>
+
 	<flow:flow name="misc/org.slf4j" spec="spec.version">
 		<flow:arg name="version" value="1.7.5" />
 		<bean parent="template.archiveWrapper">
@@ -192,4 +215,32 @@
 			</property>
 		</bean>
 	</flow:flow>
+
+	<flow:flow name="misc/org.w3c.css.sac" spec="spec.version">
+		<flow:arg name="version" value="1.3" />
+		<bean parent="template.archiveWrapper">
+			<property name="uri"
+				value="http://www.w3.org/2002/06/sacjava-@{version}.zip" />
+			<property name="license">
+				<!-- <util:constant static-field="org.argeo.slc.repo.FreeLicense.W3C" 
+					/> -->
+				<util:constant static-field="org.argeo.slc.repo.FreeLicense.MIT" />
+			</property>
+			<property name="wrappers">
+				<map>
+					<entry key="sac-@{version}/sac.jar">
+						<bean id="org.w3c.css.sac" parent="template.bndWrapper" />
+					</entry>
+				</map>
+			</property>
+			<property name="sourcesProvider">
+				<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+					<property name="uri"
+						value="http://www.w3.org/2002/06/sacjava-@{version}.zip" />
+					<property name="osgiFactory" ref="osgiFactory" />
+				</bean>
+			</property>
+		</bean>
+	</flow:flow>
+
 </beans>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cf374b0..8d77f11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	</parent>
 	<groupId>org.argeo.tp.factory</groupId>
 	<artifactId>org.argeo.tp.factory.core</artifactId>
-	<version>2.1.12-SNAPSHOT</version>
+	<version>2.1.12</version>
 	<name>Third Party Factory</name>
 	<properties>
 		<additionalImports.slc-lib>
@@ -23,6 +23,13 @@
 					<include>META-INF/**</include>
 				</includes>
 			</resource>
+			<resource>
+				<directory>.</directory>
+				<filtering>true</filtering>
+				<includes>
+					<include>META-INF/distribution.xml</include>
+				</includes>
+			</resource>
 		</resources>
 		<plugins>
 			<plugin>