From dfb02987d6396f3843dd07f9d42ebc6e95230d7b Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 7 Jun 2016 20:17:33 +0200
Subject: [PATCH] Argeo TP v2.1.15 - Equinox v3.10.102 (Mars SR2) - RAP v3.0.2
 - Jetty v9.3.9 - Jackrabbit v2.12.1

---
 META-INF/MANIFEST.MF                  | 40 ++++++++++++++----------
 META-INF/spring/apache.jackrabbit.xml |  2 +-
 META-INF/spring/distribution.xml      | 24 +++++++-------
 META-INF/spring/eclipse.equinox.xml   |  5 +--
 META-INF/spring/eclipse.jetty.xml     | 45 +++++++++++++++++----------
 META-INF/spring/eclipse.rap.xml       | 45 +++++++++++++++------------
 pom.xml                               |  2 +-
 7 files changed, 93 insertions(+), 70 deletions(-)

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 0157735..f3158b2 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,25 +1,31 @@
 Manifest-Version: 1.0
-Bundle-Description: SLC execution modules for generic tasks, to be used 
- as parent pom
+Bundle-Description: OSGi packaging of free / open source third party lib
+ raries
 Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
 Bundle-ManifestVersion: 2
-Bundle-Name: Third Party Factory
+Bundle-Name: Argeo Third Party Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.argeo.tp.factory.core
-Bundle-Version: 2.1.15.SNAPSHOT-r201606030759
-Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback
- ;resolution:=optional,org.aopalliance.aop;version="[1.0,2)",org.argeo.s
- ecurity.core;version="[2.1,3)",org.argeo.slc.core.execution;version="[2
- .1,3)",org.argeo.slc.core.execution.tasks;version="[2.1,3)",org.argeo.s
- lc.execution;version="[2.1,3)",org.argeo.slc.osgi;version="[2.1,3)",org
- .argeo.slc.repo;version="[2.1,3)",org.argeo.slc.repo.osgi;version="[2.1
- ,3)",org.argeo.slc.test;version="[2.1,3)",org.springframework.aop;versi
- on="[3.2,4)",org.springframework.aop.framework;version="[3.2,4)",org.sp
- ringframework.aop.scope;version="[3.2,4)",org.springframework.beans.fac
- tory.config;version="[3.2,4)",org.springframework.cglib.core;version="[
- 3.2,4)",org.springframework.cglib.proxy;version="[3.2,4)",org.springfra
- mework.cglib.reflect;version="[3.2,4)",org.springframework.core.io;vers
- ion="[3.2,4)"
+Bundle-Version: 2.1.15.r201606072012
+Import-Package: javax.jcr;version="[2.0,3)",
+ javax.security.auth.callback;resolution:=optional,
+ org.aopalliance.aop;version="[1.0,2)",
+ org.argeo.security.core;version="[2.1,3)",
+ org.argeo.slc.core.execution;version="[2.1,3)",
+ org.argeo.slc.core.execution.tasks;version="[2.1,3)",
+ org.argeo.slc.execution;version="[2.1,3)",
+ org.argeo.slc.osgi;version="[2.1,3)",
+ org.argeo.slc.repo;version="[2.1,3)",
+ org.argeo.slc.repo.osgi;version="[2.1,3)",
+ org.argeo.slc.test;version="[2.1,3)",
+ org.springframework.aop;version="[3.2,4)",
+ org.springframework.aop.framework;version="[3.2,4)",
+ org.springframework.aop.scope;version="[3.2,4)",
+ org.springframework.beans.factory.config;version="[3.2,4)",
+ org.springframework.cglib.core;version="[3.2,4)",
+ org.springframework.cglib.proxy;version="[3.2,4)",
+ org.springframework.cglib.reflect;version="[3.2,4)",
+ org.springframework.core.io;version="[3.2,4)"
 Include-Resource: META-INF/spring/eclipse.gemini.xml=META-INF/spring/ecl
  ipse.gemini.xml,META-INF/spring/bouncycastle.xml=META-INF/spring/bouncy
  castle.xml,META-INF/spring/eclipse.equinox.xml=META-INF/spring/eclipse.
diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index f3cadf5..381c7bc 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">
 
 	<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"
diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index e457d35..f0d4475 100644
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -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" />
@@ -67,13 +67,13 @@
 
 				<!-- 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" />
 
@@ -142,11 +142,11 @@
 	<!-- 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
diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 7ff099b..0eae902 100644
--- 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="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" />
diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index 74c4422..e477231 100644
--- 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="8.1.17.v20150415" />
+		<flow:arg name="jettyVersion" value="9.3.9.v20160517" />
 	</flow:flow>
 
 	<!-- Jetty specs and templates -->
@@ -29,23 +29,32 @@
 					<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>
@@ -54,13 +63,15 @@
 					<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>
diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
index 4c65124..32bbbbc 100644
--- 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="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 -->
@@ -33,7 +33,10 @@
 					<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" />
@@ -57,22 +60,24 @@
 	<!-- 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 24f4980..7b34751 100644
--- 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>
-- 
2.30.2