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.20.SNAPSHOT-r201801061235\r
+Bundle-Version: 2.1.20.r201801071243\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
Include-Resource: META-INF/spring/eclipse.rap.e4.xml=META-INF/spring/ecl\r
ipse.rap.e4.xml,META-INF/spring/apache.commons.xml=META-INF/spring/apac\r
he.commons.xml,META-INF/spring/apache.tomcat.xml=META-INF/spring/apache\r
- .tomcat.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml\r
- ,META-INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,\r
- META-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-INF/\r
- spring/misc.xml=META-INF/spring/misc.xml,META-INF/spring/bouncycastle.x\r
- ml=META-INF/spring/bouncycastle.xml,META-INF/spring/spring.security.xml\r
- =META-INF/spring/spring.security.xml,META-INF/spring/javax.xml=META-INF\r
- /spring/javax.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,MET\r
- A-INF/spring/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF\r
- /spring/eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml,META-IN\r
- F/spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/aether.xml=MET\r
- A-INF/spring/aether.xml,META-INF/spring/eclipse.jetty.xml=META-INF/spri\r
- ng/eclipse.jetty.xml,META-INF/spring/distribution.xml=META-INF/spring/d\r
- istribution.xml,META-INF/spring/eclipse.rap.xml=META-INF/spring/eclipse\r
- .rap.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,META-INF\r
- /spring/apache.jackrabbit.xml=META-INF/spring/apache.jackrabbit.xml,MET\r
- A-INF/spring/apache.xml=META-INF/spring/apache.xml\r
+ .tomcat.xml,META-INF/spring/eclipse.rcp.e4.xml=META-INF/spring/eclipse.\r
+ rcp.e4.xml,META-INF/spring/templates.xml=META-INF/spring/templates.xml,\r
+ META-INF/spring/eclipse.gemini.xml=META-INF/spring/eclipse.gemini.xml,M\r
+ ETA-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-INF/s\r
+ pring/misc.xml=META-INF/spring/misc.xml,META-INF/spring/bouncycastle.xm\r
+ l=META-INF/spring/bouncycastle.xml,META-INF/spring/spring.security.xml=\r
+ META-INF/spring/spring.security.xml,META-INF/spring/javax.xml=META-INF/\r
+ spring/javax.xml,META-INF/spring/osgi.xml=META-INF/spring/osgi.xml,META\r
+ -INF/spring/apache.felix.xml=META-INF/spring/apache.felix.xml,META-INF/\r
+ spring/eclipse.equinox.xml=META-INF/spring/eclipse.equinox.xml,META-INF\r
+ /spring/sdk.xml=META-INF/spring/sdk.xml,META-INF/spring/aether.xml=META\r
+ -INF/spring/aether.xml,META-INF/spring/eclipse.jetty.xml=META-INF/sprin\r
+ g/eclipse.jetty.xml,META-INF/spring/distribution.xml=META-INF/spring/di\r
+ stribution.xml,META-INF/spring/spring.xml=META-INF/spring/spring.xml,ME\r
+ TA-INF/spring/apache.jackrabbit.xml=META-INF/spring/apache.jackrabbit.x\r
+ ml,META-INF/spring/apache.xml=META-INF/spring/apache.xml,META-INF/sprin\r
+ g/eclipse.rap.e3.xml=META-INF/spring/eclipse.rap.e3.xml\r
Private-Package: !*\r
SLC-Category: org.argeo.tp.factory\r
SLC-ExecutionModule: default\r
<flow:flow name="apache/org.apache.commons.codec" spec="spec.commons">
<flow:arg name="project" value="codec" />
<flow:arg name="version" value="1.9" />
- <bean p:version="1.9.0" parent="template.commonsArchiveWrapper" />
+ <bean p:version="@{version}.0" parent="template.commonsArchiveWrapper" />
</flow:flow>
<flow:flow name="apache/org.apache.commons.dbcp" spec="spec.commons">
<flow:arg name="project" value="dbcp" />
<flow:arg name="version" value="1.4" />
- <bean p:version="1.4.0" parent="template.commonsArchiveWrapper" />
+ <bean p:version="@{version}.0" parent="template.commonsArchiveWrapper" />
</flow:flow>
<flow:flow name="apache/org.apache.commons.pool" spec="spec.commons">
<flow:flow name="apache/org.apache.commons.io" spec="spec.commons">
<flow:arg name="project" value="io" />
- <flow:arg name="version" value="2.4" />
+ <flow:arg name="version" value="2.6" />
<bean parent="template.commonsArchiveWrapper">
<property name="version" value="@{version}.0" />
<property name="wrappers">
<property name="bndProperties">
<props merge="true">
<prop key="Export-Package">
- org.apache.commons.io.*;version="2.4"
+ org.apache.commons.io.*;version="2.6"
</prop>
</props>
</property>
<flow:flow name="apache/org.apache.commons.net" spec="spec.commons">
<flow:arg name="project" value="net" />
- <flow:arg name="version" value="3.3" />
- <bean p:version="3.3.0" parent="template.commonsArchiveWrapper" />
+ <flow:arg name="version" value="3.6" />
+ <bean p:version="@{version}.0" parent="template.commonsArchiveWrapper" />
</flow:flow>
<flow:flow name="apache/org.apache.commons.compress" spec="spec.commons">
<flow:arg name="project" value="compress" />
- <flow:arg name="version" value="1.9" />
- <bean p:version="1.9.0" parent="template.commonsArchiveWrapper">
+ <flow:arg name="version" value="1.15" />
+ <bean p:version="@{version}.0" parent="template.commonsArchiveWrapper">
<property name="wrappers">
<map>
<entry
<property name="bndProperties">
<props merge="true">
<prop key="Import-Package">
+ org.brotli.*;resolution:=optional,
org.tukaani.*;resolution:=optional,
*
</prop>
</bean>
</flow:flow>
+ <!-- VFS 2.2 Requires Collections v4 -->
+ <!-- <flow:flow name="apache/org.apache.commons.vfs" spec="spec.commons"> -->
+ <!-- <flow:arg name="project" value="vfs" /> -->
+ <!-- <flow:arg name="version" value="2.2" /> -->
+ <!-- <bean parent="template.commonsArchiveWrapper"> -->
+ <!-- <property name="version" value="@{version}.0" /> -->
+ <!-- <property name="uri" -->
+ <!-- value="http://archive.apache.org/dist/commons/vfs/binaries/commons-vfs2-distribution-@{version}-bin.zip"
+ /> -->
+ <!-- <property name="wrappers"> -->
+ <!-- <map> -->
+ <!-- <entry key="commons-@{project}-@{version}/commons-vfs2-@{version}.jar"> -->
+ <!-- <bean id="org.apache.commons.vfs" parent="template.org.apache.commons"> -->
+ <!-- <property name="bndProperties"> -->
+ <!-- <props merge="true"> -->
+ <!-- <prop key="Import-Package"> -->
+ <!-- org.apache.tools.ant.*;resolution:=optional, -->
+ <!-- * -->
+ <!-- </prop> -->
+ <!-- </props> -->
+ <!-- </property> -->
+ <!-- </bean> -->
+ <!-- </entry> -->
+ <!-- </map> -->
+ <!-- </property> -->
+ <!-- <property name="sourcesProvider"> -->
+ <!-- <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider"> -->
+ <!-- <property name="uri" -->
+ <!-- value="http://archive.apache.org/dist/commons/@{project}/source/commons-vfs2-distribution-@{version}-src.zip"
+ /> -->
+ <!-- <property name="base" -->
+ <!-- value="commons-@{project}-@{version}-src/src/main/java/" /> -->
+ <!-- <property name="osgiFactory" ref="osgiFactory" /> -->
+ <!-- </bean> -->
+ <!-- </property> -->
+ <!-- </bean> -->
+ <!-- </flow:flow> -->
+
<flow:flow name="apache/org.apache.commons.fileupload" spec="spec.commons">
<flow:arg name="project" value="fileupload" />
<flow:arg name="version" value="1.3.1" />
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.14.2" />
+ <flow:arg name="version" value="2.16.0" />
<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"
</property>
</bean>
+ <bean id="org.apache.mina.core" p:sourceCoords="org.apache.mina:mina-core:2.0.16"
+ parent="template.apacheMaven">
+ <property name="doNotModify" value="true" />
+ </bean>
+
+ <bean id="org.apache.sshd.core" p:sourceCoords="org.apache.sshd:sshd-core:1.6.0"
+ parent="template.apacheMaven">
+ <property name="doNotModify" value="true" />
+ </bean>
+
<!-- Log4j12 Factory -->
<flow:flow name="apache/org.apache.log4j" spec="spec.version">
<flow:arg name="version" value="1.2.17" />
<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.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"
<flow:flow name="apache/org.apache.httpcomponents.httpclient"
spec="spec.version">
- <flow:arg name="version" value="4.5.3" />
+ <flow:arg name="version" value="4.5.4" />
<bean parent="template.archiveWrapper">
<property name="version" value="@{version}" />
<property name="license">
<flow:flow name="apache/org.apache.httpcomponents.httpcore"
spec="spec.version">
- <flow:arg name="version" value="4.4.6" />
+ <flow:arg name="version" value="4.4.8" />
<bean parent="template.archiveWrapper">
<property name="version" value="@{version}" />
<property name="license">
<!-- REGISTER -->
<flow:flow name="misc/org.bouncycastle" spec="spec.version">
- <flow:arg name="version" value="1.58" />
+ <flow:arg name="version" value="1.59" />
<bean id="bcprov"
- p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-158.jar"
+ p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-159.jar"
parent="template.bouncycastle">
<property name="sourcesProvider">
<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
</property>
</bean>
<bean id="bcpkix"
- p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-158.jar"
+ p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-159.jar"
parent="template.bouncycastle">
<property name="sourcesProvider">
<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
</property>
</bean>
<bean id="bcmail"
- p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-158.jar"
+ p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-159.jar"
parent="template.bouncycastle">
<property name="sourcesProvider">
<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
</property>
</bean>
<bean id="bcpg"
- p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-158.jar"
+ p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-159.jar"
parent="template.bouncycastle">
<property name="sourcesProvider">
<bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
<!-- 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.20-SNAPSHOT" />
+ <constructor-arg value="org.argeo.tp:argeo-tp:2.1.20" />
<property name="modules">
<list>
<!-- Javax -->
<!-- <ref bean="com.steadystate.css" /> -->
<ref bean="com.googlecode.javaewah.JavaEWAH" />
<ref bean="org.w3c.dom.svg" />
+ <ref bean="org.tukaani.xz" />
<!-- Apache -->
<ref bean="apache/org.apache.log4j" />
<ref bean="apache/org.apache.batik" />
<ref bean="apache/org.apache.httpcomponents.httpcore" />
<ref bean="apache/org.apache.httpcomponents.httpclient" />
+ <ref bean="org.apache.mina.core" />
+ <ref bean="org.apache.sshd.core" />
<!-- Apache Commons -->
<ref bean="apache/org.apache.commons.io" />
<bean id="argeo-tp-rap-e4" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
init-method="init" destroy-method="destroy">
- <constructor-arg value="org.argeo.tp:argeo-tp-rap-e4:2.1.20-SNAPSHOT" />
+ <constructor-arg value="org.argeo.tp:argeo-tp-rap-e4:2.1.20" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.e4" />
<bean id="argeo-tp-rcp-e4" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
init-method="init" destroy-method="destroy">
- <constructor-arg value="org.argeo.tp:argeo-tp-rcp-e4:2.1.20-SNAPSHOT" />
+ <constructor-arg value="org.argeo.tp:argeo-tp-rcp-e4:2.1.20" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rcp.e4" />
<bean id="argeo-tp-rap-e3" class="org.argeo.slc.repo.osgi.ArgeoOsgiDistributionImpl"
init-method="init" destroy-method="destroy">
- <constructor-arg value="org.argeo.tp:argeo-tp-rap-e3:2.1.20-SNAPSHOT" />
+ <constructor-arg value="org.argeo.tp:argeo-tp-rap-e3:2.1.20" />
<property name="modules">
<list>
<ref bean="eclipse/org.argeo.tp.rap.platform" />
<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" />
+ <!-- Apache -->
+ <entry key="plugins/org.apache.jasper.*.jar" value="org.argeo.tp.apache" />
+
<!-- Required by RAP -->
<entry key="plugins/org.eclipse.equinox.app*.jar" value="org.argeo.tp.equinox" />
<entry key="plugins/org.eclipse.equinox.cm*.jar" value="org.argeo.tp.equinox" />
<entry key="plugins/org.eclipse.equinox.servletbridge*.jar"
value="org.argeo.tp.equinox" />
<entry key="plugins/org.eclipse.equinox.util*.jar" value="org.argeo.tp.equinox" />
+ <entry key="plugins/org.eclipse.equinox.jsp.*.jar" value="org.argeo.tp.equinox" />
</map>
</property>
<property name="osgiFactory" ref="osgiFactory" />
</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> -->
+ <!-- <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
</property>
</bean>
- <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.188"
+ <bean id="org.h2" p:sourceCoords="com.h2database:h2:1.4.195"
parent="template.mavenWrapper">
<property name="doNotModify" value="true" />
<!-- <property name="doNotModifySources" value="true" /> -->
</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">
+ <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>
</bean>
+ <bean id="org.tukaani.xz" p:sourceCoords="org.tukaani:xz:1.8"
+ parent="template.mavenWrapper">
+ <property name="license">
+ <util:constant static-field="org.argeo.slc.repo.FreeLicense.PUBLIC_DOMAIN" />
+ </property>
+ </bean>
+
<bean id="org.postgresql.jdbc42" p:sourceCoords="org.postgresql:postgresql:42.1.4"
parent="template.mavenWrapper">
<property name="license">
</parent>
<groupId>org.argeo.tp.factory</groupId>
<artifactId>org.argeo.tp.factory.core</artifactId>
- <version>2.1.20-SNAPSHOT</version>
+ <version>2.1.20</version>
<name>Argeo Third Party Factory</name>
<description>OSGi packaging of free / open source third party libraries</description>
<properties>