Use distribution 1.1.8-SNAPSHOT

git-svn-id: https://svn.argeo.org/commons/trunk@5237 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/pom.xml b/pom.xml
index fe6cb5deb6fab32bcbe7f5fc5776372d19ed9a47..1b32ddb393e12afd3d6959657d6000d5313bc823 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
        <properties>
                <developmentCycle>0.3</developmentCycle>
                <developmentCycle.startDate>2011-03-24</developmentCycle.startDate>
-               <version.argeo-distribution>1.1.7</version.argeo-distribution>
+               <version.argeo-distribution>1.1.8-SNAPSHOT</version.argeo-distribution>
                <version.argeo-commons>0.3.5-SNAPSHOT</version.argeo-commons>
                <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
@@ -148,6 +148,10 @@ limitations under the License.
                                        <artifactId>maven-resources-plugin</artifactId>
                                        <version>2.5</version>
                                </plugin>
+                               <plugin>
+                                       <artifactId>maven-dependency-plugin</artifactId>
+                                       <version>2.4</version>
+                               </plugin>
                                <plugin>
                                        <artifactId>maven-release-plugin</artifactId>
                                        <version>2.2.2</version>

diff --git a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
index fae182ad73e7e58f76795556c512027b5ca21069..5060b943c58ba48c399029c7e519cdf754349867 100644 (file)
--- a/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
+++ b/server/dep/org.argeo.server.dep.jackrabbit.server/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.commons.server</groupId>
@@ -19,9 +20,18 @@
 
                <!-- Enhancements of Jackrabbit -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.bouncycastle.jdk15</artifactId>
+                       <groupId>org.bouncycastle</groupId>
+                       <artifactId>bcprov-jdk15on</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.bouncycastle</groupId>
+                       <artifactId>bcmail-jdk15on</artifactId>
                </dependency>
+               <!-- Provides org.bouncycastle.cms in v1.47 (bcmail not necessary anymore) -->
+               <!-- <dependency> -->
+               <!-- <groupId>org.bouncycastle</groupId> -->
+               <!-- <artifactId>bcpkix-jdk15on</artifactId> -->
+               <!-- </dependency> -->
                <dependency>
                        <groupId>org.apache.xmlbeans</groupId>
                        <artifactId>com.springsource.org.apache.xmlbeans</artifactId>