From: Mathieu Baudier Date: Sun, 7 Jan 2018 12:45:16 +0000 (+0100) Subject: Argeo TP v2.1.20 X-Git-Tag: v2.3.9~61 X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=abfecf8c72b0fe119f6398afaa5aff278ca59456 Argeo TP v2.1.20 --- diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 4985932..0d22015 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Argeo Third Party Factory Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-SymbolicName: org.argeo.tp.factory.core -Bundle-Version: 2.1.20.SNAPSHOT-r201801061235 +Bundle-Version: 2.1.20.r201801071243 Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version ="[2.1,3)",org.argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi ;version="[2.1,3)",org.springframework.cglib.proxy;version="[3.2,4)",or @@ -23,22 +23,23 @@ Import-Package: javax.jcr;version="[2.0,3)",org.argeo.cms.spring;version Include-Resource: META-INF/spring/eclipse.rap.e4.xml=META-INF/spring/ecl ipse.rap.e4.xml,META-INF/spring/apache.commons.xml=META-INF/spring/apac he.commons.xml,META-INF/spring/apache.tomcat.xml=META-INF/spring/apache - .tomcat.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml - ,META-INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml, - META-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-INF/ - spring/misc.xml=META-INF/spring/misc.xml,META-INF/spring/bouncycastle.x - ml=META-INF/spring/bouncycastle.xml,META-INF/spring/spring.security.xml - =META-INF/spring/spring.security.xml,META-INF/spring/javax.xml=META-INF - /spring/javax.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,MET - A-INF/spring/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF - /spring/eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml,META-IN - F/spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/aether.xml=MET - A-INF/spring/aether.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spri - ng/eclipse.jetty.xml,META-INF/spring/distribution.xml=META-INF/spring/d - istribution.xml,META-INF/spring/eclipse.rap.xml=META-INF/spring/eclipse - .rap.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META-INF - /spring/apache.jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,MET - A-INF/spring/apache.xml=META-INF/spring/apache.xml + .tomcat.xml,META-INF/spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse. + rcp.e4.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml, + META-INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,M + ETA-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-INF/s + pring/misc.xml=META-INF/spring/misc.xml,META-INF/spring/bouncycastle.xm + l=META-INF/spring/bouncycastle.xml,META-INF/spring/spring.security.xml= + META-INF/spring/spring.security.xml,META-INF/spring/javax.xml=META-INF/ + spring/javax.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META + -INF/spring/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF/ + spring/eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml,META-INF + /spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/aether.xml=META + -INF/spring/aether.xml,META-INF/spring/eclipse.jetty.xml=META-INF/sprin + g/eclipse.jetty.xml,META-INF/spring/distribution.xml=META-INF/spring/di + stribution.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,ME + TA-INF/spring/apache.jackrabbit.xml=META-INF/spring/apache.jackrabbit.x + ml,META-INF/spring/apache.xml=META-INF/spring/apache.xml,META-INF/sprin + g/eclipse.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml Private-Package: !* SLC-Category: org.argeo.tp.factory SLC-ExecutionModule: default diff --git a/META-INF/spring/apache.commons.xml b/META-INF/spring/apache.commons.xml index 591cc75..cd4161d 100644 --- a/META-INF/spring/apache.commons.xml +++ b/META-INF/spring/apache.commons.xml @@ -10,13 +10,13 @@ - + - + @@ -33,7 +33,7 @@ - + @@ -44,7 +44,7 @@ - org.apache.commons.io.*;version="2.4" + org.apache.commons.io.*;version="2.6" @@ -89,14 +89,14 @@ - - + + - - + + + org.brotli.*;resolution:=optional, org.tukaani.*;resolution:=optional, * @@ -152,6 +153,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml index 41b57b6..8f4ca80 100644 --- 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"> - + + + + + + + + + @@ -74,8 +84,9 @@ - - + + - + @@ -121,7 +132,7 @@ - + diff --git a/META-INF/spring/bouncycastle.xml b/META-INF/spring/bouncycastle.xml index 273fa82..5c8de9b 100644 --- a/META-INF/spring/bouncycastle.xml +++ b/META-INF/spring/bouncycastle.xml @@ -11,9 +11,9 @@ - + @@ -24,7 +24,7 @@ @@ -35,7 +35,7 @@ @@ -46,7 +46,7 @@ diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml index 382236b..48887fc 100644 --- a/META-INF/spring/distribution.xml +++ b/META-INF/spring/distribution.xml @@ -10,7 +10,7 @@ - + @@ -41,6 +41,7 @@ + @@ -49,6 +50,8 @@ + + @@ -103,7 +106,7 @@ - + @@ -113,7 +116,7 @@ - + @@ -123,7 +126,7 @@ - + diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml index c2d5a14..d74d8cf 100644 --- a/META-INF/spring/eclipse.equinox.xml +++ b/META-INF/spring/eclipse.equinox.xml @@ -42,6 +42,9 @@ + + + @@ -66,34 +69,37 @@ + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml index 90fcd41..5b72635 100644 --- a/META-INF/spring/misc.xml +++ b/META-INF/spring/misc.xml @@ -28,7 +28,7 @@ - @@ -225,8 +225,8 @@ - + @@ -246,6 +246,13 @@ + + + + + + diff --git a/pom.xml b/pom.xml index 2236042..206a9ed 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.argeo.tp.factory org.argeo.tp.factory.core - 2.1.20-SNAPSHOT + 2.1.20 Argeo Third Party Factory OSGi packaging of free / open source third party libraries