Release Argeo TP v2.1.17

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index bf88b0f272a653c443edbc54c42d7b72a2bd9165..73bc825bc9992f1307b6e2a46685bd62c1c9436f 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Argeo Third Party Factory\r
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8\r
 Bundle-SymbolicName: org.argeo.tp.factory.core\r
-Bundle-Version: 2.1.16.SNAPSHOT-r201609291156\r
+Bundle-Version: 2.1.17.r201610061532\r
 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version\r
  ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi\r
  ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or\r

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 9276c69b869ce270a81380aa325258542b2e097f..2ac449eec3d39584b9f1426d524ef328842ddd2c 100644 (file)
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -233,6 +233,33 @@
                </bean>
        </flow:flow>
 
+       <flow:flow name="apache/org.apache.commons.lang3" spec="spec.commons">
+               <flow:arg name="project" value="lang3" />
+               <flow:arg name="version" value="3.4" />
+               <bean parent="template.commonsArchiveWrapper">
+                       <property name="version" value="@{version}.0" />
+                       <property name="uri"
+                               value="http://archive.apache.org/dist/commons/lang/binaries/commons-@{project}-@{version}-bin.zip" />
+                       <property name="wrappers">
+                               <map>
+                                       <entry
+                                               key="commons-@{project}-@{version}/commons-@{project}-@{version}.jar">
+                                               <bean id="org.apache.commons.lang3" parent="template.org.apache.commons" />
+                                       </entry>
+                               </map>
+                       </property>
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://archive.apache.org/dist/commons/lang/source/commons-@{project}-@{version}-src.zip" />
+                                       <property name="base"
+                                               value="commons-@{project}-@{version}-src/src/main/java/" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+       </flow:flow>
+
        <flow:flow name="apache/org.apache.httpcomponents.httpclient"
                spec="spec.version">
                <flow:arg name="version" value="4.4" />

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index 5a0d84d6c09c6906758027e88002af2de21965eb..c6ee694aa7035172770e109e196ab3890840b2a2 100644 (file)
--- a/META-INF/spring/apache.xml
+++ b/META-INF/spring/apache.xml
@@ -14,7 +14,7 @@
        </flow:flow>
 
        <flow:flow name="apache/org.apache.tika" spec="spec.version">
-               <flow:arg name="version" value="1.10" />
+               <flow:arg name="version" value="1.13" />
                <bean id="org.apache.tika.core" parent="template.tikaMaven"
                        p:sourceCoords="org.apache.tika:tika-core:@{version}" />
                <bean id="org.apache.tika.parser" parent="template.tikaMaven"
@@ -65,13 +65,11 @@
        </flow:flow>
 
        <flow:flow name="apache/org.apache.pdfbox" spec="spec.version">
-               <flow:arg name="version" value="1.8.8" />
+               <flow:arg name="version" value="2.0.3" />
                <bean id="org.apache.pdfbox" parent="template.apacheMaven"
                        p:version="@{version}" p:sourceCoords="org.apache.pdfbox:pdfbox:@{version}" />
                <bean id="org.apache.pdfbox.fontbox" parent="template.apacheMaven"
                        p:version="@{version}" p:sourceCoords="org.apache.pdfbox:fontbox:@{version}" />
-               <bean id="org.apache.pdfbox.jempbox" parent="template.apacheMaven"
-                       p:version="@{version}" p:sourceCoords="org.apache.pdfbox:jempbox:@{version}" />
        </flow:flow>
 
        <!-- Templates -->

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index ef0f16d476516633c26ca696aa755dddf3cb65a9..9e844f34ee7ee6ff8ac1773d186d9efd066aeef5 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -10,7 +10,7 @@
        <!-- REGISTER -->
        <bean id="argeo-tp" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
                init-method="init" destroy-method="destroy">
-               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.16" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.17" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -39,7 +39,6 @@
                                <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 -->
@@ -55,6 +54,7 @@
                                <ref bean="apache/org.apache.commons.exec" />
                                <ref bean="apache/org.apache.commons.jci" />
                                <ref bean="apache/org.apache.commons.compress" />
+                               <ref bean="apache/org.apache.commons.lang3" />
 
                                <!-- Google -->
                                <ref bean="com.google.guava" />
@@ -67,7 +67,6 @@
 
                                <!-- Eclipse RAP -->
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />
-                               <!-- <ref bean="eclipse/org.argeo.tp.rap.addons" /> -->
 
                                <!-- Jackrabbit -->
                                <ref bean="apache/org.apache.tika" />

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 2888c3e55ec02056cc0824bf1f4df613bae47daa..e96936b6c54150d4fba7f51d0d04de24205d931e 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -183,32 +183,30 @@
                </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>
+<!--   <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.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> -->
 
        <bean id="net.sf.jxl" p:sourceCoords="net.sourceforge.jexcelapi:jxl:2.6.12"
                parent="template.mavenWrapper">

diff --git a/pom.xml b/pom.xml
index 68224070aacb368fdb12e104af5e0407cc839366..78c2473e3f0fe08014306452f059fd2bbb64f33f 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.16-SNAPSHOT</version>
+       <version>2.1.17</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>