Revert to GeoTools 2.6.5

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

diff --git a/gis/runtime/org.argeo.gis.geotools/pom.xml b/gis/runtime/org.argeo.gis.geotools/pom.xml
index 2278658fa8ab071a42351504b0349f507b3eb782..d2533069031ebe25b121965f8e0ab3b2868120c0 100644 (file)
--- a/gis/runtime/org.argeo.gis.geotools/pom.xml
+++ b/gis/runtime/org.argeo.gis.geotools/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.gis</groupId>
@@ -70,6 +71,10 @@
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.geotools</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.geoapi</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.dep.osgi</groupId>
                        <artifactId>org.argeo.dep.osgi.jts</artifactId>

diff --git a/security/features/org.argeo.security.dep.node.rap/pom.xml b/security/features/org.argeo.security.dep.node.rap/pom.xml
index 858e33872b18d00bb2b374cd387160a137c0f9c2..f2eea5f2f62ce4bc0ebc36f8471613c68966533a 100644 (file)
--- a/security/features/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/features/org.argeo.security.dep.node.rap/pom.xml
@@ -67,5 +67,14 @@
                        <artifactId>org.argeo.server.osgi.webapp</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+
+               <!-- LDAP server (target platform generation only) -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dep.ads</artifactId>
+                       <version>0.3.2-SNAPSHOT</version>
+                       <type>pom</type>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
 </project>

diff --git a/security/runtime/org.argeo.security.core/build.properties b/security/runtime/org.argeo.security.core/build.properties
index c2c33828083374433d17fb68dba0b1199f55f341..f9420e76a4946b3245f342b636c162d23cc2b6c6 100644 (file)
--- a/security/runtime/org.argeo.security.core/build.properties
+++ b/security/runtime/org.argeo.security.core/build.properties
@@ -2,14 +2,11 @@ additional.bundles = org.springframework.transaction,\
                      org.springframework.core,\
                      com.springsource.junit,\
                      com.springsource.org.apache.commons.io,\
-                     com.springsource.org.codehaus.jackson,\
                      com.springsource.org.apache.commons.codec,\
                      org.springframework.security.core,\
-                     com.springsource.org.codehaus.jackson.mapper,\
                      com.springsource.org.apache.log4j,\
                      com.springsource.slf4j.api,\
-                     com.springsource.slf4j.org.apache.commons.logging,\
-                     org.argeo.server.json
+                     com.springsource.slf4j.org.apache.commons.logging
 source.. = src/main/java/,\
            src/main/resources/,\
            src/test/java/,\