OSGi Boot: remove deprecated methods and adapt to Java 7

[lgpl/argeo-commons.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index fcf606785b9a07fbea061083dd3ec4009e470fd5..a29bb72b8e8950c23f0bbc41ee31ea7812ce89ba 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,14 +3,14 @@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.argeo.commons</groupId>
        <artifactId>argeo-commons</artifactId>
-       <version>2.1.28</version>
+       <version>2.1.30-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
-               <version.argeo-commons>2.1.28</version.argeo-commons>
+               <version.argeo-commons>2.1.30-SNAPSHOT</version.argeo-commons>
                <developmentCycle.argeo-commons>2.1</developmentCycle.argeo-commons>
                <developmentCycle.argeo-commons.startDate>2012-12-19</developmentCycle.argeo-commons.startDate>
-               <version.argeo-distribution>2.1.8</version.argeo-distribution>
+               <version.argeo-distribution>2.1.11</version.argeo-distribution>
                <!-- RPM -->
                <rpm.release>6</rpm.release>
                <rpm.stagingRepository>/srv/rpmfactory/argeo-osgi-2-staging/6/x86_64</rpm.stagingRepository>
@@ -41,9 +41,9 @@
                <module>dist</module>
        </modules>
        <scm>
-               <connection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.28</connection>
-               <developerConnection>scm:svn:https://svn.argeo.org/commons/tags/argeo-commons-2.1.28</developerConnection>
-               <url>https://svn.argeo.org/commons/tags/argeo-commons-2.1.28</url>
+               <connection>scm:svn:https://svn.argeo.org/commons/trunk</connection>
+               <developerConnection>scm:svn:https://svn.argeo.org/commons/trunk</developerConnection>
+               <url>https://svn.argeo.org/commons/trunk</url>
        </scm>
        <inceptionYear>2007</inceptionYear>
        <licenses>
@@ -398,6 +398,36 @@ limitations under the License.
                        <artifactId>argeo-tp</artifactId>
                        <version>${version.argeo-distribution}</version>
                        <scope>provided</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring</groupId>
+                                       <artifactId>org.springframework.ldap</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.acls</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.aspects</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.config</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.core</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.ldap</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.spring.security</groupId>
+                                       <artifactId>org.springframework.security.web</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
        </dependencies>
        <repositories>