Argeo TP v2.1.15
authorMathieu Baudier <mbaudier@argeo.org>
Tue, 7 Jun 2016 18:17:33 +0000 (20:17 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Tue, 7 Jun 2016 18:17:33 +0000 (20:17 +0200)
- Equinox v3.10.102 (Mars SR2)
- RAP v3.0.2
- Jetty v9.3.9
- Jackrabbit v2.12.1

META-INF/MANIFEST.MF
META-INF/spring/apache.jackrabbit.xml
META-INF/spring/distribution.xml
META-INF/spring/eclipse.equinox.xml
META-INF/spring/eclipse.jetty.xml
META-INF/spring/eclipse.rap.xml
pom.xml

index 0157735df2df4f16c0f29aa87ffdf1921269af33..f3158b261ac64e83cc09044f285127b17a8c7d87 100644 (file)
@@ -1,25 +1,31 @@
 Manifest-Version: 1.0\r
-Bundle-Description: SLC execution modules for generic tasks, to be used \r
- as parent pom\r
+Bundle-Description: OSGi packaging of free / open source third party lib\r
+ raries\r
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
 Bundle-ManifestVersion: 2\r
-Bundle-Name: Third Party Factory\r
+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.15.SNAPSHOT-r201606030759\r
-Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback\r
- ;resolution:=optional,org.aopalliance.aop;version="[1.0,2)",org.argeo.s\r
- ecurity.core;version="[2.1,3)",org.argeo.slc.core.execution;version="[2\r
- .1,3)",org.argeo.slc.core.execution.tasks;version="[2.1,3)",org.argeo.s\r
- lc.execution;version="[2.1,3)",org.argeo.slc.osgi;version="[2.1,3)",org\r
- .argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi;version="[2.1\r
- ,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;versi\r
- on="[3.2,4)",org.springframework.aop.framework;version="[3.2,4)",org.sp\r
- ringframework.aop.scope;version="[3.2,4)",org.springframework.beans.fac\r
- tory.config;version="[3.2,4)",org.springframework.cglib.core;version="[\r
- 3.2,4)",org.springframework.cglib.proxy;version="[3.2,4)",org.springfra\r
- mework.cglib.reflect;version="[3.2,4)",org.springframework.core.io;vers\r
- ion="[3.2,4)"\r
+Bundle-Version: 2.1.15.r201606072012\r
+Import-Package: javax.jcr;version="[2.0,3)",\r
+ javax.security.auth.callback;resolution:=optional,\r
+ org.aopalliance.aop;version="[1.0,2)",\r
+ org.argeo.security.core;version="[2.1,3)",\r
+ org.argeo.slc.core.execution;version="[2.1,3)",\r
+ org.argeo.slc.core.execution.tasks;version="[2.1,3)",\r
+ org.argeo.slc.execution;version="[2.1,3)",\r
+ org.argeo.slc.osgi;version="[2.1,3)",\r
+ org.argeo.slc.repo;version="[2.1,3)",\r
+ org.argeo.slc.repo.osgi;version="[2.1,3)",\r
+ org.argeo.slc.test;version="[2.1,3)",\r
+ org.springframework.aop;version="[3.2,4)",\r
+ org.springframework.aop.framework;version="[3.2,4)",\r
+ org.springframework.aop.scope;version="[3.2,4)",\r
+ org.springframework.beans.factory.config;version="[3.2,4)",\r
+ org.springframework.cglib.core;version="[3.2,4)",\r
+ org.springframework.cglib.proxy;version="[3.2,4)",\r
+ org.springframework.cglib.reflect;version="[3.2,4)",\r
+ org.springframework.core.io;version="[3.2,4)"\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
index f3cadf55103e2ed637d9a81895d3fc997d8bd4cb..381c7bcfe65e98bf010be9dfd3549f358ce5a164 100644 (file)
@@ -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.10.1" />
+               <flow:arg name="version" value="2.12.1" />
                <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"
index e457d350bca1e537c653534e6c67d409afcc4ef5..f0d44756a2e753f04f548b53ed0813e91134c08c 100644 (file)
@@ -18,7 +18,7 @@
                                <ref bean="javax.jcr" />
                                <ref bean="javax.mail" />
                                <ref bean="javax.transaction" />
-                               
+
                                <!-- Builder -->
                                <ref bean="biz.aQute.bnd" />
                                <ref bean="eclipse/org.eclipse.jdt.core.compiler.batch" />
@@ -39,8 +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"/>
+                               <ref bean="misc/org.w3c.css.sac" />
+                               <ref bean="com.steadystate.css" />
 
                                <!-- Apache Commons -->
                                <ref bean="apache/org.apache.commons.io" />
@@ -55,7 +55,7 @@
                                <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 RAP -->
                                <ref bean="eclipse/org.argeo.tp.rap.platform" />
-                               <ref bean="eclipse/org.argeo.tp.rap.addons" />
+                               <!-- <ref bean="eclipse/org.argeo.tp.rap.addons" /> -->
 
                                <!-- Jackrabbit -->
                                <ref bean="apache/org.apache.tika" />
                                <ref bean="apache/org.apache.lucene" />
                                <ref bean="apache/org.apache.jackrabbit" />
-                               
+
                                <!-- Spring -->
                                <ref bean="spring/org.springframework" />
 
        <!-- Security -->
        <bean
                class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-<!--           <property name="beanNames"> -->
-<!--                   <list> -->
-<!--                           <value>osgiFactory</value> -->
-<!--                           <value>argeo-tp</value> -->
-<!--                   </list> -->
-<!--           </property> -->
+               <!-- <property name="beanNames"> -->
+               <!-- <list> -->
+               <!-- <value>osgiFactory</value> -->
+               <!-- <value>argeo-tp</value> -->
+               <!-- </list> -->
+               <!-- </property> -->
        </bean>
 </beans>
\ No newline at end of file
index 7ff099b3e5b59bb3870b9a9af63cf86fff2299d2..0eae902cb9808887016b28fb290287cefc3c002d 100644 (file)
@@ -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="LunaSR2" />
-               <flow:arg name="equinoxTimestamp" value="201502041700" />
+               <flow:arg name="equinoxRelease" value="Mars.2" />
+               <flow:arg name="equinoxTimestamp" value="201602121500" />
        </flow:flow>
 
        <!-- Equinox specs and templates -->
@@ -47,6 +47,7 @@
                                        <entry key="plugins/org.eclipse.equinox.console.source_*.jar"
                                                value="org.argeo.tp.equinox" />
                                        <entry key="plugins/org.eclipse.equinox.ds*.jar" value="org.argeo.tp.equinox" />
+                                       <entry key="plugins/org.eclipse.equinox.metatype*.jar" value="org.argeo.tp.equinox" />
                                        <entry key="plugins/org.eclipse.equinox.event*.jar" value="org.argeo.tp.equinox" />
                                        <entry key="plugins/org.eclipse.equinox.http.jetty*.jar"
                                                value="org.argeo.tp.equinox" />
index 74c442210e1dc441a0a0075754a2eb6d45276626..e4772310702649b412a89cbd7c024a3add4692c5 100644 (file)
@@ -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="8.1.17.v20150415" />
+               <flow:arg name="jettyVersion" value="9.3.9.v20160517" />
        </flow:flow>
 
        <!-- Jetty specs and templates -->
                                        <entry
                                                key="jetty-distribution-@{jettyVersion}/lib/jetty-continuation-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-http-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-http-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-io-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-jmx-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-security-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-server-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-servlet-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-servlets-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-util-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
-                                       <entry key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
+                                       <entry
+                                               key="jetty-distribution-@{jettyVersion}/lib/jetty-client-@{jettyVersion}.jar"
                                                value="org.argeo.tp.jetty" />
                                </map>
                        </property>
                                        <value><![CDATA[jetty-distribution-@{jettyVersion}/lib/jetty-overlay-deployer-*.jar]]></value>
                                </list>
                        </property>
-                       <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>
+                       <!-- 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="osgiFactory" ref="osgiFactory" />
                </bean>
        </flow:flow>
index 4c651242555c1d8a025d27fd5342ffa255fd0fd2..32bbbbc942e9193b141a02f1d198cb304c130834 100644 (file)
@@ -9,8 +9,8 @@
 
        <!-- Eclipse rap platform -->
        <flow:flow name="eclipse/org.argeo.tp.rap.platform" parent="template.importRap">
-               <flow:arg name="rapRelease" value="2.3" />
-               <flow:arg name="rapTimestamp" value="2.3.2-SR2-20150128-1013" />
+               <flow:arg name="rapRelease" value="3.0" />
+               <flow:arg name="rapTimestamp" value="3.0.2-SR2-20160201-1220" />
        </flow:flow>
 
        <!-- Rap specs and templates -->
                                        <entry key="plugins/org.eclipse.rap.rwt_*.jar" value="org.argeo.tp.rap.platform" />
                                        <entry key="plugins/org.eclipse.rap.rwt.source_*.jar" value="org.argeo.tp.rap.platform" />
                                        <entry key="plugins/org.eclipse.rap.rwt.osgi_*.jar" value="org.argeo.tp.rap.platform" />
-                                       <entry key="plugins/org.eclipse.rap.rwt.osgi.source_*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.rap.rwt.osgi.source_*.jar"
+                                               value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.rap.fileupload_*.jar" value="org.argeo.tp.rap.platform" />
+                                       <entry key="plugins/org.eclipse.rap.filedialog_*.jar" value="org.argeo.tp.rap.platform" />
 
                                        <!-- RAP UI with the workbench -->
                                        <entry key="plugins/org.eclipse.rap.ui.workbench*.jar" value="org.argeo.tp.rap.platform" />
        <!-- The corresponding zip must be manually imported in the dist repo at 
                path org/eclipse/www/downloads/rt/rap/addons/@{rapRelease}/ -->
 
-       <flow:flow name="eclipse/org.argeo.tp.rap.addons" parent="template.importRapAddons">
-               <flow:arg name="rapRelease" value="0.6" />
-               <flow:arg name="rapTimestamp" value="0.6.0.v20150207" />
-       </flow:flow>
+       <!-- <flow:flow name="eclipse/org.argeo.tp.rap.addons" parent="template.importRapAddons"> -->
+       <!-- <flow:arg name="rapRelease" value="0.6" /> -->
+       <!-- <flow:arg name="rapTimestamp" value="0.6.0.v20150207" /> -->
+       <!-- </flow:flow> -->
 
-       <flow:flow id="template.importRapAddons" spec="rapVersion.spec"
-               abstract="true">
-               <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
-                       <property name="uri"
-                               value="http://www.eclipse.org/downloads/rt/rap/addons/@{rapRelease}/addons-@{rapTimestamp}.zip" />
-                       <property name="includes">
-                               <map>
-                                       <entry key="plugins/org.eclipse.rap.addons.*.jar" value="org.argeo.tp.rap" />
-                               </map>
-                       </property>
-                       <property name="osgiFactory" ref="osgiFactory" />
-               </bean>
-       </flow:flow>
+       <!-- <flow:flow id="template.importRapAddons" spec="rapVersion.spec" -->
+       <!-- abstract="true"> -->
+       <!-- <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper"> -->
+       <!-- <property name="uri" -->
+       <!-- value="http://www.eclipse.org/downloads/rt/rap/addons/@{rapRelease}/addons-@{rapTimestamp}.zip" 
+               /> -->
+       <!-- <property name="includes"> -->
+       <!-- <map> -->
+       <!-- <entry key="plugins/org.eclipse.rap.addons.*.jar" value="org.argeo.tp.rap" 
+               /> -->
+       <!-- </map> -->
+       <!-- </property> -->
+       <!-- <property name="osgiFactory" ref="osgiFactory" /> -->
+       <!-- </bean> -->
+       <!-- </flow:flow> -->
 </beans>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 24f498040a81c527a6735989c962cf72e24b6fd0..7b34751f75f2556a0c4d2b15031da3203cd9a83f 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.15-SNAPSHOT</version>
+       <version>2.1.15</version>
        <name>Argeo Third Party Factory</name>
        <description>OSGi packaging of free / open source third party libraries</description>
        <properties>