Argeo TP v2.1.16

diff --git a/.gitignore b/.gitignore
index 28c2ca2f70343277911ab685d10f8b1482c17a82..525ff18e775a057b164f75af03a48a713738234e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 
 /target
 /*.target
+/feature.xml
+/modularDistribution.csv

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 2562ba24f2adeeaa04f11e855f2555377f293502..bf88b0f272a653c443edbc54c42d7b72a2bd9165 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -6,20 +6,20 @@ Bundle-ManifestVersion: 2
 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.16.SNAPSHOT-r201606072031\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.16.SNAPSHOT-r201609291156\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
+ g.springframework.cglib.core;version="[3.2,4)",org.springframework.cgli\r
+ b.reflect;version="[3.2,4)",org.aopalliance.aop;version="[1.0,2)",org.a\r
+ rgeo.slc.core.execution;version="[2.1,3)",org.argeo.slc.core.execution.\r
+ tasks;version="[2.1,3)",org.argeo.slc.execution;version="[2.1,3)",org.a\r
+ rgeo.slc.osgi;version="[2.1,3)",org.argeo.slc.test;version="[2.1,3)",or\r
+ g.springframework.aop;version="[3.2,4)",org.springframework.aop.framewo\r
+ rk;version="[3.2,4)",org.springframework.aop.scope;version="[3.2,4)",or\r
+ g.springframework.beans.factory.config;version="[3.2,4)",org.springfram\r
+ ework.core.io;version="[3.2,4)",javax.security.auth.callback;resolution\r
+ :=optional\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
@@ -38,6 +38,6 @@ Include-Resource: META-INF/spring/eclipse.gemini.xml=META-INF/spring/ecl
  l,META-INF/spring/apache.ant.xml=META-INF/spring/apache.ant.xml,META-IN\r
  F/spring/spring.xml=META-INF/spring/spring.xml,META-INF/spring/apache.j\r
  ackrabbit.xml=META-INF/spring/apache.jackrabbit.xml\r
-Private-Package: .\r
+Private-Package: !*\r
 SLC-Category: org.argeo.tp.factory\r
 SLC-ExecutionModule: default\r

diff --git a/META-INF/spring/apache.jackrabbit.xml b/META-INF/spring/apache.jackrabbit.xml
index 381c7bcfe65e98bf010be9dfd3549f358ce5a164..834c17d0a31d1d73d1d4dfd68b346c299db8d9ba 100644 (file)
--- 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.12.1" />
+               <flow:arg name="version" value="2.12.4" />
                <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/bouncycastle.xml b/META-INF/spring/bouncycastle.xml
index 749b8643b450f0d4b24c866ef67c4c610aeeab26..177aa7e3b8e451226178dd373e61da038e2cf8c4 100644 (file)
--- a/META-INF/spring/bouncycastle.xml
+++ b/META-INF/spring/bouncycastle.xml
@@ -11,9 +11,9 @@
 
        <!-- REGISTER -->
        <flow:flow name="misc/org.bouncycastle" spec="spec.version">
-               <flow:arg name="version" value="1.54" />
+               <flow:arg name="version" value="1.55" />
                <bean id="bcprov"
-                       p:uri="http://downloads.bouncycastle.org/java/bcprov-jdk15on-154.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcprov-jdk15on-155.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -24,7 +24,7 @@
                        </property>
                </bean>
                <bean id="bcpkix"
-                       p:uri="http://downloads.bouncycastle.org/java/bcpkix-jdk15on-154.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcpkix-jdk15on-155.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -35,7 +35,7 @@
                        </property>
                </bean>
                <bean id="bcmail"
-                       p:uri="http://downloads.bouncycastle.org/java/bcmail-jdk15on-154.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcmail-jdk15on-155.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
@@ -46,7 +46,7 @@
                        </property>
                </bean>
                <bean id="bcpg"
-                       p:uri="http://downloads.bouncycastle.org/java/bcpg-jdk15on-154.jar"
+                       p:uri="https://downloads.bouncycastle.org/java/bcpg-jdk15on-155.jar"
                        parent="template.bouncycastle">
                        <property name="sourcesProvider">
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">

diff --git a/META-INF/spring/distribution.xml b/META-INF/spring/distribution.xml
index f4b37ebc56366d361ebd3300d714e89965df3a8a..ef0f16d476516633c26ca696aa755dddf3cb65a9 100644 (file)
--- a/META-INF/spring/distribution.xml
+++ b/META-INF/spring/distribution.xml
@@ -115,6 +115,7 @@
                                </entry>
                                <entry key="http://www.eclipse.org/downloads">
                                        <list>
+                                               <value>http://eclipse.mirror.garr.it/mirrors/eclipse</value>
                                                <value>http://mirror.netcologne.de/eclipse</value>
                                                <value>http://mirror.selfnet.de/eclipse</value>
                                                <value><![CDATA[http://www.eclipse.org/downloads/download.php?file=]]></value>
@@ -141,12 +142,5 @@
 
        <!-- Security -->
        <bean
-               class="org.argeo.security.core.AuthenticatedApplicationContextInitialization">
-               <!-- <property name="beanNames"> -->
-               <!-- <list> -->
-               <!-- <value>osgiFactory</value> -->
-               <!-- <value>argeo-tp</value> -->
-               <!-- </list> -->
-               <!-- </property> -->
-       </bean>
+               class="org.argeo.cms.spring.AuthenticatedApplicationContextInitialization" />
 </beans>
\ No newline at end of file

diff --git a/META-INF/spring/eclipse.equinox.xml b/META-INF/spring/eclipse.equinox.xml
index 0eae902cb9808887016b28fb290287cefc3c002d..29d20feb9bfe3cc0662a7652c0776a0574d5ec65 100644 (file)
--- 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="Mars.2" />
-               <flow:arg name="equinoxTimestamp" value="201602121500" />
+               <flow:arg name="equinoxRelease" value="Neon.1" />
+               <flow:arg name="equinoxTimestamp" value="201609071200" />
        </flow:flow>
 
        <!-- Equinox specs and templates -->

diff --git a/META-INF/spring/eclipse.jetty.xml b/META-INF/spring/eclipse.jetty.xml
index e4772310702649b412a89cbd7c024a3add4692c5..11a15d70441780f29e1cc5c3b8124749fa546519 100644 (file)
--- 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="9.3.9.v20160517" />
+               <flow:arg name="jettyVersion" value="9.3.12.v20160915" />
        </flow:flow>
 
        <!-- Jetty specs and templates -->
@@ -20,7 +20,7 @@
                abstract="true">
                <bean class="org.argeo.slc.repo.osgi.ArchiveWrapper">
                        <property name="uri"
-                               value="http://www.eclipse.org/downloads/jetty/@{jettyVersion}/dist/jetty-distribution-@{jettyVersion}.zip" />
+                               value="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/@{jettyVersion}/jetty-distribution-@{jettyVersion}.zip" />
                        <property name="license">
                                <util:constant static-field="org.argeo.slc.repo.FreeLicense.APACHE" />
                        </property>

diff --git a/META-INF/spring/eclipse.rap.xml b/META-INF/spring/eclipse.rap.xml
index 32bbbbc942e9193b141a02f1d198cb304c130834..775bb819234bcd7bd6b2c7ff06920f78014b97f7 100644 (file)
--- 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="3.0" />
-               <flow:arg name="rapTimestamp" value="3.0.2-SR2-20160201-1220" />
+               <flow:arg name="rapRelease" value="3.1" />
+               <flow:arg name="rapTimestamp" value="3.1.1-SR1-20160913-0447" />
        </flow:flow>
 
        <!-- Rap specs and templates -->

diff --git a/META-INF/spring/sdk.xml b/META-INF/spring/sdk.xml
index ce548589ee41edb1dfb84e1f8470e24daf6cb4fe..08bf8a7931d1f466e37c02c21f96ad867127eeda 100644 (file)
--- a/META-INF/spring/sdk.xml
+++ b/META-INF/spring/sdk.xml
@@ -82,10 +82,10 @@
 
        <!-- SVN Kit -->
        <flow:flow name="misc/org.tmatesoft.svnkit" spec="spec.version">
-               <flow:arg name="version" value="1.8.8" />
+               <flow:arg name="version" value="1.8.12" />
                <bean parent="template.archiveWrapper">
                        <property name="uri"
-                               value="http://www.svnkit.com/org.tmatesoft.svn_@{version}.standalone.nojna.zip" />
+                               value="https://svnkit.com/org.tmatesoft.svn_@{version}.standalone.nojna.zip" />
                        <property name="license">
                                <util:constant static-field="org.argeo.slc.repo.FreeLicense.EPL" />
                        </property>
@@ -114,7 +114,7 @@
                                <bean class="org.argeo.slc.repo.osgi.ArchiveSourcesProvider">
                                        <property name="base" value="/svnkit-@{version}/svnkit/src/main/java/" />
                                        <property name="uri"
-                                               value="http://www.svnkit.com/org.tmatesoft.svn_@{version}.src.zip" />
+                                               value="https://svnkit.com/org.tmatesoft.svn_@{version}.src.zip" />
                                        <property name="osgiFactory" ref="osgiFactory" />
                                </bean>
                        </property>

diff --git a/pom.xml b/pom.xml
index 1d8c1ffa7e8801c6b4ae5ed2346e052219749212..68224070aacb368fdb12e104af5e0407cc839366 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>lib</artifactId>
-               <version>2.1.3</version>
+               <version>2.1.5</version>
        </parent>
        <groupId>org.argeo.tp.factory</groupId>
        <artifactId>org.argeo.tp.factory.core</artifactId>