Adapt to version upgrade

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

diff --git a/pom.xml b/pom.xml
index cdf98d8bd725df6f206f465b936afb97ec4dea56..bcb7caf4f6b27799ad8186ecbbd9ba192b040269 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -181,7 +181,7 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.dep</groupId>
                                <artifactId>versions</artifactId>
-                               <version>1.0.0</version>
+                               <version>1.0.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
index 0b18cd066f045cb9e3f2ddfd0e510001c93cd1a6..ba650560966a8ca4ae75b251e20cd8fe248d45a8 100644 (file)
--- a/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
+++ b/sandbox/runtime/org.argeo.sandbox.jackrabbit/pom.xml
@@ -44,7 +44,6 @@
                <dependency>
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.jackrabbit</artifactId>
-                       <version>1.6.0.0003-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.basic</groupId>
@@ -55,7 +54,6 @@
                <dependency>
                        <groupId>org.apache.derby</groupId>
                        <artifactId>com.springsource.org.apache.derby</artifactId>
-                       <version>10.5.1000001.764942</version>
                </dependency>
 
                <!-- TEST -->

diff --git a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
index 6a5f57b86fe081ced66fada7a20e5f14e5847172..49ad482ce25e5720ae9c9d0cd3bf2bc48f0499ca 100644 (file)
--- a/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
+++ b/security/modules/org.argeo.security.manager.ldap/META-INF/spring/osgi.xml
@@ -7,7 +7,8 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
        <service ref="_authenticationManager"\r
-               interface="org.springframework.security.AuthenticationManager" />\r
+               interface="org.springframework.security.AuthenticationManager"\r
+               context-class-loader="service-provider" />\r
 \r
        <service ref="securityDao" interface="org.argeo.security.ArgeoSecurityDao" />\r
 \r

diff --git a/security/runtime/org.argeo.security.core/pom.xml b/security/runtime/org.argeo.security.core/pom.xml
index cbc54821e5fe78f860f53f6539faf452594838cc..5f9cc85c515489de17521052d6e2723097f2c555 100644 (file)
--- a/security/runtime/org.argeo.security.core/pom.xml
+++ b/security/runtime/org.argeo.security.core/pom.xml
@@ -45,7 +45,6 @@
                <dependency>
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.springframework.ldap</artifactId>
-                       <version>1.3.0.0003</version>
                </dependency>
 
                <!-- Security -->
@@ -72,21 +71,17 @@
                <dependency>
                        <groupId>org.codehaus.jackson</groupId>
                        <artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
-                       <version>1.0.0</version>
                </dependency>
 
                <dependency>
                        <groupId>com.springsource.json</groupId>
                        <artifactId>com.springsource.json</artifactId>
-                       <version>1.0.1.RELEASE</version>
                </dependency>
                <dependency>
                        <groupId>org.antlr</groupId>
                        <artifactId>com.springsource.org.antlr</artifactId>
                </dependency>
 
-
-
                <!-- TEST -->
                <dependency>
                        <groupId>org.junit</groupId>

diff --git a/server/demo/pom.xml b/server/demo/pom.xml
index a7bfd1b0b6d56b5f57bc3071a65e20b14ecb7165..958b9ea48f298bb6f82b67878f4c10dfea3cc199 100644 (file)
--- a/server/demo/pom.xml
+++ b/server/demo/pom.xml
@@ -20,6 +20,9 @@
                                <configuration>
                                        <bundlesPomArtifactId>org.argeo.server.demo</bundlesPomArtifactId>
                                        <execDir>target/exec/server</execDir>
+                                       <argsToAppend>
+                                               <arg>-clean</arg>
+                                       </argsToAppend>
                                        <osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
                                        <systemProperties>
                                                <slc.osgi.start>

diff --git a/server/dep/org.argeo.server.dep.ads/pom.xml b/server/dep/org.argeo.server.dep.ads/pom.xml
index 4b3ba25db1d7d18935ad6b82ffd06b607b205d86..1280a65815bdf784a812c6b6f4d087d3663a40dd 100644 (file)
--- a/server/dep/org.argeo.server.dep.ads/pom.xml
+++ b/server/dep/org.argeo.server.dep.ads/pom.xml
@@ -22,27 +22,22 @@
                <dependency>
                        <groupId>org.apache.directory</groupId>
                        <artifactId>com.springsource.org.apache.directory.server.core</artifactId>
-                       <version>1.0.2</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.directory.shared.asn.codec</artifactId>
-                       <version>0.9.5.5.0001</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.mina.filter.ssl</artifactId>
-                       <version>1.0.2.0001</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.directory</groupId>
                        <artifactId>com.springsource.org.apache.directory.server.jndi</artifactId>
-                       <version>1.0.2</version>
                </dependency>
                <dependency>
                        <groupId>net.sourceforge.jdbm</groupId>
                        <artifactId>com.springsource.jdbm</artifactId>
-                       <version>1.0.0</version>
                </dependency>
                <!--
                        TODO: version 2.4.0 is required by Spring-LDAP while Apache Directory
@@ -51,7 +46,6 @@
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>com.springsource.org.apache.commons.lang</artifactId>
-                       <version>2.4.0</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 698f9ed24bd893d8c9a27b3e4979a1af80ea40a4..7a3cf0447b733ee0a8c14bc1527a72e02f2fa249 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/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>
@@ -23,6 +24,10 @@
                        <groupId>javax.servlet</groupId>
                        <artifactId>com.springsource.javax.servlet</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>javax.servlet</groupId>
+                       <artifactId>com.springsource.javax.servlet.jsp</artifactId>
+               </dependency>
                <dependency>
                        <groupId>javax.annotation</groupId>
                        <artifactId>com.springsource.javax.annotation</artifactId>
@@ -92,16 +97,20 @@
                        <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.catalina</groupId>
-                       <artifactId>com.springsource.org.apache.catalina</artifactId>
+                       <groupId>org.apache.coyote.springsource</groupId>
+                       <artifactId>com.springsource.org.apache.coyote.springsource</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.catalina.springsource</groupId>
+                       <artifactId>com.springsource.org.apache.catalina.springsource</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.jasper</groupId>
-                       <artifactId>com.springsource.org.apache.jasper</artifactId>
+                       <groupId>org.apache.jasper.springsource</groupId>
+                       <artifactId>com.springsource.org.apache.jasper.springsource</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.apache.el</groupId>
-                       <artifactId>com.springsource.org.apache.el</artifactId>
+                       <groupId>org.apache.el.springsource</groupId>
+                       <artifactId>com.springsource.org.apache.el.springsource</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
index e77321ae40aff74e432e7ee11c72c516e329a39e..2b5aa297a1f66cda7b98b4bddb6f4f6950b733d6 100644 (file)
--- a/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.ads.server/META-INF/MANIFEST.MF
@@ -4,5 +4,6 @@ Import-Package: org.apache.directory.server.configuration,
  org.apache.directory.server.core.partition.impl.btree,
  org.apache.directory.server.jndi,
  org.apache.directory.shared.asn1.codec,
+ org.springframework.ldap.core.support,
  org.springframework.security.config,
  org.springframework.security.ldap

diff --git a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
index 7313b4b367aed7565890b4de7eb03d96701c7a7e..bfd6f2b32346640bc1277f6484f59aef50774f22 100644 (file)
--- a/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
+++ b/server/modules/org.argeo.server.catalina/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
-Fragment-Host: com.springsource.org.apache.catalina;bundle-version="[6
+Fragment-Host: com.springsource.org.apache.catalina.springsource;bundle-version="[6
  .0.16,7.0.0)"
 Bundle-Version: 0.1.2.SNAPSHOT
 Bundle-SymbolicName: org.argeo.server.catalina

diff --git a/server/runtime/org.argeo.server.json/pom.xml b/server/runtime/org.argeo.server.json/pom.xml
index 9e63ff94bfd6ba2e08e4e9582b5397af91fc0d1d..9e454636d75aa609aca3a103eeda3b5caa692efa 100644 (file)
--- a/server/runtime/org.argeo.server.json/pom.xml
+++ b/server/runtime/org.argeo.server.json/pom.xml
@@ -48,7 +48,6 @@
                <dependency>
                        <groupId>org.codehaus.jackson</groupId>
                        <artifactId>com.springsource.org.codehaus.jackson.mapper</artifactId>
-                       <version>1.0.0</version>
                </dependency>
 
                <!-- Spring -->