From: Mathieu Baudier Date: Mon, 22 Apr 2019 12:47:07 +0000 (+0200) Subject: Change source of Jetty, add Aries and Atmosphere X-Git-Tag: v2.3.9~52 X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-tp.git;a=commitdiff_plain;h=7d3bf9314a7f856fa1c7d3a2633a7e30f0688718 Change source of Jetty, add Aries and Atmosphere --- diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF index 91b3127..f2c5e49 100644 --- a/META-INF/MANIFEST.MF +++ b/META-INF/MANIFEST.MF @@ -7,7 +7,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.23.r201903191635 +Bundle-Version: 2.1.24.SNAPSHOT-r201904221028 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 diff --git a/META-INF/spring/apache.xml b/META-INF/spring/apache.xml index b75407e..0a6d3c2 100644 --- a/META-INF/spring/apache.xml +++ b/META-INF/spring/apache.xml @@ -325,6 +325,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml index 9f55b2e..73c60d0 100644 --- a/META-INF/spring/distribution.xml +++ b/META-INF/spring/distribution.xml @@ -14,15 +14,14 @@ class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl" init-method="init" destroy-method="destroy"> + value="org.argeo.tp:argeo-tp:2.1.24-SNAPSHOT" /> - - + @@ -58,6 +57,8 @@ + + @@ -83,12 +84,12 @@ - + - - + + @@ -111,7 +112,7 @@ - + @@ -128,7 +129,7 @@ class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl" init-method="init" destroy-method="destroy"> + value="org.argeo.tp:argeo-tp-rap-e4:2.1.24-SNAPSHOT" /> @@ -140,7 +141,7 @@ class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl" init-method="init" destroy-method="destroy"> + value="org.argeo.tp:argeo-tp-rcp-e4:2.1.24-SNAPSHOT" /> @@ -152,7 +153,7 @@ class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl" init-method="init" destroy-method="destroy"> + value="org.argeo.tp:argeo-tp-rap-e3:2.1.24-SNAPSHOT" /> diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml index 32648af..6cb14a0 100644 --- a/META-INF/spring/eclipse.equinox.xml +++ b/META-INF/spring/eclipse.equinox.xml @@ -36,7 +36,7 @@ - + diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml index d1b48f3..69a4207 100644 --- a/META-INF/spring/eclipse.jetty.xml +++ b/META-INF/spring/eclipse.jetty.xml @@ -1,77 +1,169 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/META-INF/spring/javax.xml b/META-INF/spring/javax.xml index 3f439f7..046b222 100644 --- a/META-INF/spring/javax.xml +++ b/META-INF/spring/javax.xml @@ -70,6 +70,12 @@ + + + + diff --git a/META-INF/spring/misc.xml b/META-INF/spring/misc.xml index 0cdf1ea..204eb3c 100644 --- a/META-INF/spring/misc.xml +++ b/META-INF/spring/misc.xml @@ -98,8 +98,16 @@ - + + + + + + + + - + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index eb60586..3c27ff3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.argeo.tp.factory org.argeo.tp.factory.core - 2.1.23 + 2.1.24-SNAPSHOT Argeo Third Party Factory OSGi packaging of free / open source third party libraries