Argeo TP v2.1.18

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 83272896058d393dfa914801e5bb9dbd10fe76aa..b64e0c2f767c20d7e81be7ffd8c8d1c0e4461c61 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.18.SNAPSHOT-r201610061600\r
+Bundle-Version: 2.1.18.r201708261305\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
@@ -20,24 +20,24 @@ Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version
  g.springframework.beans.factory.config;version="[3.2,4)",org.springfram\r
  ework.core.io;version="[3.2,4)",javax.security.auth.callback;resolution\r
  :=optional\r
-Include-Resource: META-INF/spring/eclipse.gemini.xml=META-INF/spring/ecl\r
- ipse.gemini.xml,META-INF/spring/bouncycastle.xml=META-INF/spring/bouncy\r
- castle.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclipse.\r
- equinox.xml,META-INF/spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/sp\r
- ring/templates.xml=META-INF/spring/templates.xml,META-INF/spring/eclips\r
- e.rap.xml=META-INF/spring/eclipse.rap.xml,META-INF/spring/apache.tomcat\r
- .xml=META-INF/spring/apache.tomcat.xml,META-INF/spring/apache.commons.x\r
- ml=META-INF/spring/apache.commons.xml,META-INF/spring/distribution.xml=\r
- META-INF/spring/distribution.xml,META-INF/spring/misc.xml=META-INF/spri\r
- ng/misc.xml,META-INF/spring/spring.security.xml=META-INF/spring/spring.\r
- security.xml,META-INF/spring/apache.xml=META-INF/spring/apache.xml,META\r
- -INF/spring/aether.xml=META-INF/spring/aether.xml,META-INF/spring/osgi.\r
- xml=META-INF/spring/osgi.xml,META-INF/spring/javax.xml=META-INF/spring/\r
- javax.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spring/eclipse.jet\r
- ty.xml,META-INF/spring/apache.felix.xml=META-INF/spring/apache.felix.xm\r
- l,META-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-IN\r
- F/spring/spring.xml=META-INF/spring/spring.xml,META-INF/spring/apache.j\r
- ackrabbit.xml=META-INF/spring/apache.jackrabbit.xml\r
+Include-Resource: META-INF/spring/spring.xml=META-INF/spring/spring.xml,\r
+ META-INF/spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/spring.\r
+ security.xml=META-INF/spring/spring.security.xml,META-INF/spring/apache\r
+ .jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,META-INF/spring/m\r
+ isc.xml=META-INF/spring/misc.xml,META-INF/spring/apache.tomcat.xml=META\r
+ -INF/spring/apache.tomcat.xml,META-INF/spring/eclipse.jetty.xml=META-IN\r
+ F/spring/eclipse.jetty.xml,META-INF/spring/apache.commons.xml=META-INF/\r
+ spring/apache.commons.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi\r
+ .xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml,META-I\r
+ NF/spring/distribution.xml=META-INF/spring/distribution.xml,META-INF/sp\r
+ ring/aether.xml=META-INF/spring/aether.xml,META-INF/spring/apache.felix\r
+ .xml=META-INF/spring/apache.felix.xml,META-INF/spring/eclipse.equinox.x\r
+ ml=META-INF/spring/eclipse.equinox.xml,META-INF/spring/bouncycastle.xml\r
+ =META-INF/spring/bouncycastle.xml,META-INF/spring/eclipse.rap.xml=META-\r
+ INF/spring/eclipse.rap.xml,META-INF/spring/apache.ant.xml=META-INF/spri\r
+ ng/apache.ant.xml,META-INF/spring/apache.xml=META-INF/spring/apache.xml\r
+ ,META-INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,\r
+ META-INF/spring/javax.xml=META-INF/spring/javax.xml\r
 Private-Package: !*\r
 SLC-Category: org.argeo.tp.factory\r
 SLC-ExecutionModule: default\r

diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml
index 2ac449eec3d39584b9f1426d524ef328842ddd2c..32cf16df3a536d75a7fe738474371b5a8774b3e9 100644 (file)
--- a/META-INF/spring/apache.commons.xml
+++ b/META-INF/spring/apache.commons.xml
@@ -260,35 +260,6 @@
                </bean>
        </flow:flow>
 
-       <flow:flow name="apache/org.apache.httpcomponents.httpclient"
-               spec="spec.version">
-               <flow:arg name="version" value="4.4" />
-               <bean parent="template.archiveWrapper">
-                       <property name="version" value="@{version}.0" />
-                       <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
-                       </property>
-                       <property name="uri"
-                               value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-osgi-bin.zip" />
-                       <property name="includes">
-                               <map>
-                                       <entry
-                                               key="httpcomponents-client-@{version}/org.apache.httpcomponents.httpclient_@{version}.jar"
-                                               value="org.argeo.tp.apache" />
-                               </map>
-                       </property>
-                       <property name="sourcesProvider">
-                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-                                       <property name="uri"
-                                               value="http://archive.apache.org/dist/httpcomponents/httpclient/source/httpcomponents-client-@{version}-src.zip" />
-                                       <property name="base"
-                                               value="httpcomponents-client-@{version}/httpclient/src/main/java/" />
-                                       <property name="osgiFactory" ref="osgiFactory" />
-                               </bean>
-                       </property>
-               </bean>
-       </flow:flow>
-
        <!-- Specs and templates -->
        <flow:spec id="spec.commons">
                <flow:primitive name="version" isParameter="true" />

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 834c17d0a31d1d73d1d4dfd68b346c299db8d9ba..41b57b65a2eef3e1b4df9ddc7f1cea43bf39acea 100644 (file)
--- a/META-INF/spring/apache.jackrabbit.xml
+++ b/META-INF/spring/apache.jackrabbit.xml
@@ -8,7 +8,7 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-1.2.xsd">
 
        <flow:flow name="apache/org.apache.jackrabbit" spec="spec.version">
-               <flow:arg name="version" value="2.12.4" />
+               <flow:arg name="version" value="2.14.2" />
                <bean id="org.apache.jackrabbit.api" parent="template.jackrabbitMaven"
                        p:version="@{version}" p:sourceCoords="org.apache.jackrabbit:jackrabbit-api:@{version}" />
                <bean id="org.apache.jackrabbit.jcr.commons" parent="template.jackrabbitMaven"

diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml
index c6ee694aa7035172770e109e196ab3890840b2a2..1ae55ce7d055ec97f2b08fa781bf3beb7dec27dd 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.13" />
+               <flow:arg name="version" value="1.16" />
                <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"
@@ -72,6 +72,83 @@
                        p:version="@{version}" p:sourceCoords="org.apache.pdfbox:fontbox:@{version}" />
        </flow:flow>
 
+       <flow:flow name="apache/org.apache.batik" spec="spec.version">
+               <flow:arg name="version" value="1.9.1" />
+<!--           <bean id="org.apache.batik.ext" parent="template.apacheMaven" -->
+<!--                   p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-ext:jar:@{version}" /> -->
+               <bean id="org.apache.batik.i18n" parent="template.apacheMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-i18n:jar:@{version}" />
+               <bean id="org.apache.batik.util" parent="template.apacheMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-util:jar:@{version}" />
+               <bean id="org.apache.batik.css" parent="template.apacheMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:batik-css:jar:@{version}" />
+       </flow:flow>
+
+       <flow:flow name="apache/org.apache.xmlgraphics" spec="spec.version">
+               <flow:arg name="version" value="2.2.0" />
+               <bean id="org.apache.xmlgraphics.commons" parent="template.apacheMaven"
+                       p:version="@{version}" p:sourceCoords="org.apache.xmlgraphics:xmlgraphics-commons:jar:2.2" />
+       </flow:flow>
+
+       <flow:flow name="apache/org.apache.httpcomponents.httpclient"
+               spec="spec.version">
+               <flow:arg name="version" value="4.5.3" />
+               <bean parent="template.archiveWrapper">
+                       <property name="version" value="@{version}" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
+                       <property name="uri"
+                               value="http://archive.apache.org/dist/httpcomponents/httpclient/binary/httpcomponents-client-@{version}-osgi-bin.zip" />
+                       <property name="includes">
+                               <map>
+                                       <entry
+                                               key="httpcomponents-client-@{version}/org.apache.httpcomponents.httpclient_@{version}.jar"
+                                               value="org.argeo.tp.apache" />
+                               </map>
+                       </property>
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://archive.apache.org/dist/httpcomponents/httpclient/source/httpcomponents-client-@{version}-src.zip" />
+                                       <property name="base"
+                                               value="httpcomponents-client-@{version}/httpclient/src/main/java/" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+       </flow:flow>
+
+       <flow:flow name="apache/org.apache.httpcomponents.httpcore"
+               spec="spec.version">
+               <flow:arg name="version" value="4.4.6" />
+               <bean parent="template.archiveWrapper">
+                       <property name="version" value="@{version}" />
+                       <property name="license">
+                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+                       </property>
+                       <property name="uri"
+                               value="http://archive.apache.org/dist/httpcomponents/httpcore/binary/httpcomponents-core-@{version}-osgi-bin.zip" />
+                       <property name="includes">
+                               <map>
+                                       <entry
+                                               key="httpcomponents-core-@{version}/org.apache.httpcomponents.httpcore_@{version}.jar"
+                                               value="org.argeo.tp.apache" />
+                               </map>
+                       </property>
+                       <property name="sourcesProvider">
+                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
+                                       <property name="uri"
+                                               value="http://archive.apache.org/dist/httpcomponents/httpcore/source/httpcomponents-core-@{version}-src.zip" />
+                                       <property name="base"
+                                               value="httpcomponents-core-@{version}/httpcore/src/main/java/" />
+                                       <property name="osgiFactory" ref="osgiFactory" />
+                               </bean>
+                       </property>
+               </bean>
+       </flow:flow>
+
+
        <!-- Templates -->
        <bean id="template.apacheMaven" parent="template.mavenWrapper"
                abstract="true">
@@ -85,5 +162,8 @@
                abstract="true">
                <property name="version" value="@{version}.0" />
                <property name="doNotModify" value="true" />
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
        </bean>
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/bouncycastle.xml b/META-INF/spring/bouncycastle.xml
index 177aa7e3b8e451226178dd373e61da038e2cf8c4..273fa824800118ec677c829b73b0d716607f4a67 100644 (file)
--- a/META-INF/spring/bouncycastle.xml
+++ b/META-INF/spring/bouncycastle.xml
@@ -11,9 +11,9 @@
 
        <!-- REGISTER -->
        <flow:flow name="misc/org.bouncycastle" spec="spec.version">
-               <flow:arg name="version" value="1.55" />
+               <flow:arg name="version" value="1.58" />
                <bean id="bcprov"
-                       p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-155.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-158.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -24,7 +24,7 @@
                        </property>
                </bean>
                <bean id="bcpkix"
-                       p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-155.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-158.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -35,7 +35,7 @@
                        </property>
                </bean>
                <bean id="bcmail"
-                       p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-155.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-158.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -46,7 +46,7 @@
                        </property>
                </bean>
                <bean id="bcpg"
-                       p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-155.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-158.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index 8452672a1e1da70264656b9d6c284b5cbb911d58..b9a4117ac8e5d4200f953e2b8c0fb0edf51bd7eb 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.18.SNAPSHOT" />
+               <constructor-arg value="org.argeo.tp:argeo-tp:2.1.18" />
                <property name="modules">
                        <list>
                                <!-- Javax -->
@@ -21,26 +21,33 @@
 
                                <!-- Builder -->
                                <ref bean="biz.aQute.bnd" />
-                               <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" />
+<!--                           <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" /> -->
 
                                <!-- Standalone projects -->
-                               <ref bean="apache/org.apache.log4j" />
                                <ref bean="misc/org.slf4j" />
                                <ref bean="org.aopalliance" />
                                <ref bean="org.junit" />
-                               <ref bean="org.h2" />
-                               <ref bean="org.joda.time" />
+<!--                           <ref bean="org.joda.time" /> -->
                                <ref bean="com.jcraft.jsch" />
                                <ref bean="EDU.oswego.cs.dl.util.concurrent" />
                                <ref bean="org.objectweb.asm" />
                                <ref bean="org.aspectj.weaver" />
                                <ref bean="misc/org.bouncycastle" />
-                               <ref bean="apache/org.apache.ant" />
-                               <ref bean="org.quartz-scheduler.quartz" />
-                               <ref bean="org.quartz-scheduler.quartz.jobs" />
+<!--                           <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" />
+<!--                           <ref bean="misc/org.w3c.css.sac" /> -->
+<!--                           <ref bean="com.steadystate.css" /> -->
+                               <ref bean="com.googlecode.javaewah.JavaEWAH" />
+                               <ref bean="org.w3c.dom.svg" />
+                               
+                               <!-- Apache -->
+                               <ref bean="apache/org.apache.log4j" />
+                               <ref bean="apache/org.apache.ant" />
+                               <ref bean="apache/org.apache.xmlgraphics" />
+                               <ref bean="apache/org.apache.batik" />
+                               <ref bean="apache/org.apache.httpcomponents.httpcore" />
+                               <ref bean="apache/org.apache.httpcomponents.httpclient" />
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -53,7 +60,7 @@
                                <ref bean="apache/org.apache.commons.vfs" />
                                <ref bean="apache/org.apache.commons.net" />
                                <ref bean="apache/org.apache.commons.exec" />
-                               <ref bean="apache/org.apache.commons.jci" />
+<!--                           <ref bean="apache/org.apache.commons.jci" /> -->
                                <ref bean="apache/org.apache.commons.compress" />
                                <ref bean="apache/org.apache.commons.lang3" />
 
@@ -81,14 +88,14 @@
                                <ref bean="net.sf.jxl" />
                                <ref bean="apache/org.apache.pdfbox" />
                                <!-- Databases -->
-                               <ref bean="org.postgresql.postgresql" />
+                               <ref bean="org.postgresql.jdbc42" />
+                               <ref bean="org.h2" />
                                <ref bean="org.dbunit" />
                                <!-- ALM -->
                                <ref bean="eclipse/org.eclipse.aether" />
                                <ref bean="org.redline-rpm" />
-                               <!-- Needs https://code.google.com/p/javaewah/ -->
-                               <!-- <ref bean="org.eclipse.jgit" /> -->
-                               <ref bean="misc/org.tmatesoft.svnkit" />
+                               <ref bean="org.eclipse.jgit" />
+<!--                           <ref bean="misc/org.tmatesoft.svnkit" /> -->
                        </list>
                </property>
        </bean>

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 29d20feb9bfe3cc0662a7652c0776a0574d5ec65..87cc0c7fe59e43d051a8309ec7c3ec8a7560ce11 100644 (file)
--- a/META-INF/spring/eclipse.equinox.xml
+++ b/META-INF/spring/eclipse.equinox.xml
@@ -8,8 +8,8 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <flow:flow name="eclipse/org.argeo.tp.equinox" parent="template.importEquinox">
-               <flow:arg name="equinoxRelease" value="Neon.1" />
-               <flow:arg name="equinoxTimestamp" value="201609071200" />
+               <flow:arg name="equinoxRelease" value="Oxygen" />
+               <flow:arg name="equinoxTimestamp" value="201706120950" />
        </flow:flow>
 
        <!-- Equinox specs and templates -->
@@ -36,8 +36,9 @@
                                        <entry key="plugins/javax.servlet.source_*.jar" value="org.argeo.tp.javax" />
                                        <entry key="plugins/javax.el*.jar" value="org.argeo.tp.javax" />
 
-                                       <!-- Felix console -->
+                                       <!-- Felix -->
                                        <entry key="plugins/org.apache.felix.gogo.*.jar" value="org.argeo.tp.apache.felix" />
+                                       <entry key="plugins/org.apache.felix.scr_*.jar" value="org.argeo.tp.apache.felix" />
 
                                        <!-- Required by RAP -->
                                        <entry key="plugins/org.eclipse.equinox.app*.jar" value="org.argeo.tp.equinox" />
@@ -69,29 +70,28 @@
                </bean>
        </flow:flow>
 
-       <flow:flow name="eclipse/org.eclipse.jdt.core.compiler.batch"
-               spec="equinoxVersion.spec">
-               <flow:arg name="equinoxRelease" value="4.4.1" />
-               <flow:arg name="equinoxTimestamp" value="201409250400" />
-               <bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.repo.osgi.UriWrapper">
-                       <!-- TODO URI wrapper should be able to read OSGi metadata -->
-                       <property name="version" value="3.10.0.v20140902-0626" />
-                       <property name="uri"
-                               value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecj-@{equinoxRelease}.jar" />
-                       <property name="groupId" value="org.argeo.tp.equinox" />
-                       <property name="doNotModify" value="true" />
-                       <property name="license">
-                               <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
-                       </property>
-                       <property name="osgiFactory" ref="osgiFactory" />
-                       <property name="sourcesProvider">
-                               <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
-                                       <property name="uri"
-                                               value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecjsrc-@{equinoxRelease}.jar" />
-                                       <property name="osgiFactory" ref="osgiFactory" />
-                               </bean>
-                       </property>
-               </bean>
-       </flow:flow>
+<!--   <flow:flow name="eclipse/org.eclipse.jdt.core.compiler.batch" -->
+<!--           spec="equinoxVersion.spec"> -->
+<!--           <flow:arg name="equinoxRelease" value="4.4.1" /> -->
+<!--           <flow:arg name="equinoxTimestamp" value="201409250400" /> -->
+<!--           <bean id="org.eclipse.jdt.core.compiler.batch" class="org.argeo.slc.repo.osgi.UriWrapper"> -->
+<!--                   <property name="version" value="3.10.0.v20140902-0626" /> -->
+<!--                   <property name="uri" -->
+<!--                           value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecj-@{equinoxRelease}.jar" /> -->
+<!--                   <property name="groupId" value="org.argeo.tp.equinox" /> -->
+<!--                   <property name="doNotModify" value="true" /> -->
+<!--                   <property name="license"> -->
+<!--                           <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" /> -->
+<!--                   </property> -->
+<!--                   <property name="osgiFactory" ref="osgiFactory" /> -->
+<!--                   <property name="sourcesProvider"> -->
+<!--                           <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
+<!--                                   <property name="uri" -->
+<!--                                           value="http://www.eclipse.org/downloads/eclipse/downloads/drops4/R-@{equinoxRelease}-@{equinoxTimestamp}/ecjsrc-@{equinoxRelease}.jar" /> -->
+<!--                                   <property name="osgiFactory" ref="osgiFactory" /> -->
+<!--                           </bean> -->
+<!--                   </property> -->
+<!--           </bean> -->
+<!--   </flow:flow> -->
 
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index 11a15d70441780f29e1cc5c3b8124749fa546519..23dab080bfe7cbbbb644b31766aac076808c9d2e 100644 (file)
--- a/META-INF/spring/eclipse.jetty.xml
+++ b/META-INF/spring/eclipse.jetty.xml
@@ -8,7 +8,7 @@
        http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
 
        <flow:flow name="eclipse/org.argeo.tp.jetty" parent="template.importJettyZip">
-               <flow:arg name="jettyVersion" value="9.3.12.v20160915" />
+               <flow:arg name="jettyVersion" value="9.4.6.v20170531" />
        </flow:flow>
 
        <!-- Jetty specs and templates -->
@@ -63,15 +63,13 @@
                                        <value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value>
                                </list>
                        </property>
-                       <!-- FIXME sources missing (use git as in http://stackoverflow.com/a/13681834 ?) -->
-                       <!-- <property name="sourcesProvider"> -->
-                       <!-- <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
-                       <!-- <property name="uri" -->
-                       <!-- value="http://repo1.maven.org/maven2/org/eclipse/jetty/aggregate/jetty-all/@{jettyVersion}/jetty-all-@{jettyVersion}-sources.jar" 
-                               /> -->
-                       <!-- <property name="osgiFactory" ref="osgiFactory" /> -->
-                       <!-- </bean> -->
-                       <!-- </property> -->
+<!--                   <property name="sourcesProvider"> -->
+<!--                           <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
+<!--                                   <property name="uri" -->
+<!--                                           value="https://github.com/eclipse/jetty.project/archive/jetty-@{jettyVersion}.zip" /> -->
+<!--                                   <property name="osgiFactory" ref="osgiFactory" /> -->
+<!--                           </bean> -->
+<!--                   </property> -->
                        <property name="osgiFactory" ref="osgiFactory" />
                </bean>
        </flow:flow>

diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
index 775bb819234bcd7bd6b2c7ff06920f78014b97f7..80eb2c6bd4598e6b95c142c630bab4e5601fbc9b 100644 (file)
--- a/META-INF/spring/eclipse.rap.xml
+++ b/META-INF/spring/eclipse.rap.xml
@@ -9,8 +9,8 @@
 
        <!-- Eclipse rap platform -->
        <flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
-               <flow:arg name="rapRelease" value="3.1" />
-               <flow:arg name="rapTimestamp" value="3.1.1-SR1-20160913-0447" />
+               <flow:arg name="rapRelease" value="3.2" />
+               <flow:arg name="rapTimestamp" value="3.2.0-R-20170614-1509" />
        </flow:flow>
 
        <!-- Rap specs and templates -->

diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml
index 0034306de98dcab634d67bc3701b26c70dc24e67..90fcd4128c1c8a6631a1be33b8345b4597e6052d 100644 (file)
--- a/META-INF/spring/misc.xml
+++ b/META-INF/spring/misc.xml
@@ -54,7 +54,7 @@
                </property>
        </bean>
 
-       <bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.51"
+       <bean id="com.jcraft.jsch" p:sourceCoords="com.jcraft:jsch:0.1.54"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
@@ -136,7 +136,7 @@
                </property>
        </bean>
 
-       <bean id="com.google.guava" p:sourceCoords="com.google.guava:guava:jar:18.0"
+       <bean id="com.google.guava" p:sourceCoords="com.google.guava:guava:jar:23.0"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
@@ -144,7 +144,7 @@
                <property name="doNotModify" value="true" />
        </bean>
 
-       <bean id="com.google.gson" p:sourceCoords="com.google.code.gson:gson:jar:2.4"
+       <bean id="com.google.gson" p:sourceCoords="com.google.code.gson:gson:jar:2.8.1"
                parent="template.mavenWrapper">
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
@@ -152,12 +152,12 @@
                <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>
+       <!-- <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" />
@@ -183,44 +183,84 @@
                </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>
+       <!-- <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> -->
+
+       <!-- JGit -->
+       <bean id="com.googlecode.javaewah.JavaEWAH" p:sourceCoords="com.googlecode.javaewah:JavaEWAH:1.1.6"
+               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.eclipse.jgit" p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:4.8.0.201706111038-r"
+               parent="template.mavenWrapper">
+               <property name="doNotModify" value="true" />
+               <property name="license">
+                       <!-- Eclipse Distribution License (EDL) -->
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
+               </property>
+       </bean>
+
+       <bean id="org.w3c.dom.svg" parent="template.mavenWrapper" p:version="1.3.4"
+               p:sourceCoords="xml-apis:xml-apis-ext:1.3.04">
+               <property name="license">
+                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
+               </property>
+               <property name="bndProperties">
+                       <props merge="true">
+                               <prop key="Export-Package">
+                                       org.w3c.dom.*
+                               </prop>
+                       </props>
+               </property>
+       </bean>
 
        <bean id="net.sf.jxl" p:sourceCoords="net.sourceforge.jexcelapi:jxl:2.6.12"
                parent="template.mavenWrapper">
-               <!-- <property name="doNotModify" value="true" /> -->
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.LGPL_v2" />
                </property>
        </bean>
 
-       <bean id="org.postgresql.postgresql" p:sourceCoords="org.postgresql:postgresql:9.3-1102-jdbc41"
-               p:version="9.3.1102.jdbc41" parent="template.mavenWrapper">
+       <bean id="org.postgresql.jdbc42" p:sourceCoords="org.postgresql:postgresql:42.1.4"
+               parent="template.mavenWrapper">
                <property name="license">
                        <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
                </property>
+               <property name="doNotModify" value="true" />
+               <!-- <property name="bndProperties"> -->
+               <!-- <props merge="true"> -->
+               <!-- <prop key="Import-Package"> -->
+               <!-- com.sun.jna.*;resolution:=optional, -->
+               <!-- waffle.*;resolution:=optional, -->
+               <!-- * -->
+               <!-- </prop> -->
+               <!-- </props> -->
+               <!-- </property> -->
        </bean>
 
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/sdk.xml b/META-INF/spring/sdk.xml
index 08bf8a7931d1f466e37c02c21f96ad867127eeda..ab29c5dbb6f17101149595da0c7881436d204075 100644 (file)
--- a/META-INF/spring/sdk.xml
+++ b/META-INF/spring/sdk.xml
@@ -40,16 +40,6 @@
                </property>
        </bean>
 
-       <!-- JGit -->
-       <bean id="org.eclipse.jgit" p:sourceCoords="org.eclipse.jgit:org.eclipse.jgit:3.6.2.201501210735-r"
-               parent="template.mavenSdk">
-               <property name="doNotModify" value="true" />
-               <property name="license">
-                       <!-- Eclipse Distribution License (EDL) -->
-                       <util:constant static-field="org.argeo.slc.repo.FreeLicense.BSD" />
-               </property>
-       </bean>
-
        <bean id="org.dbunit" p:sourceCoords="org.dbunit:dbunit:2.5.0"
                parent="template.mavenSdk">
                <property name="license">

diff --git a/pom.xml b/pom.xml
index a480bbff97d14d2e8201eafd8e8c212189b9324d..fe293ef970eb82ade4bb59b9801309dca7abf257 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,11 +4,11 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.1.5</version>
+               <version>2.1.9</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>
-       <version>2.1.18-SNAPSHOT</version>
+       <version>2.1.18</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>
@@ -64,7 +64,7 @@
        <repositories>
                <repository>
                        <id>argeo</id>
-                       <url>http://forge.argeo.org/data/public/java/argeo-2.1</url>
+                       <url>http://forge.argeo.org/data/java/argeo-2.1</url>
                        <releases>
                                <enabled>true</enabled>
                                <updatePolicy>daily</updatePolicy>