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 12482475046c7f2984f73d297fcdb372a039cffd..14329f30964425f4e96b5eae323406c51aebbc28 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1444406203867\r
-Build-Jdk: 1.7.0_85\r
+Bnd-LastModified: 1447432174714\r
+Build-Jdk: 1.7.0_91\r
 Built-By: mbaudier\r
 Bundle-Description: SLC execution modules for generic tasks, to be used \r
  as parent pom\r
@@ -11,7 +11,7 @@ Bundle-Name: Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
 Bundle-Vendor: Argeo\r
-Bundle-Version: 2.1.12.SNAPSHOT-r151009_1756\r
+Bundle-Version: 2.1.12.r151113_1729\r
 Created-By: Apache Maven Bundle Plugin\r
 Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback\r
  ;resolution:=optional,net.sf.cglib.core;version="[2.1,3)",net.sf.cglib.\r

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 42ef629fef317b6493c301d3829b6a879a01a8af..71dfa6b48bb16bcf0a7e9c5d049f3315a38c97e3 100644 (file)
--- 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 7d98f6358725beae40bc76b6e34fad77ba5cc70b..313da4085e4d1f5da84ed66ae355ca9389ccb6d2 100644 (file)
--- 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 cf374b00f9094fbb672fff2cdfed8e6e5ce75e62..8d77f11ca4f2f25111d8c570ad0a06ee90b58ff9 100644 (file)
--- 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>