Add equinox support in server and agent

[gpl/argeo-slc.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 3407ebf12714f1e2be8ab00d317b0bde524c627a..c63e2fa70e9ece6dd85e7d1eb79e41fae6173f77 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,18 +16,18 @@
        </modules>
        <properties>
                <developmentCycle>0.11</developmentCycle>
-               <version.spring>2.5.6.A</version.spring>
-               <version.spring>2.5.6.A</version.spring>
-               <version.spring-ws>1.5.5.A</version.spring-ws>
-               <version.spring-osgi>1.1.3.RELEASE</version.spring-osgi>
+               <version.spring>2.5.6.SEC01</version.spring>
+               <version.spring-ws>1.5.7.A</version.spring-ws>
+               <version.spring-osgi>1.2.0</version.spring-osgi>
                <version.maven>2.0.9</version.maven>
                <version.ant>1.7.0</version.ant>
                <version.jetty>6.1.14</version.jetty>
                <version.tomcat>6.0.18</version.tomcat>
                <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
+               <version.slf4j>1.5.6</version.slf4j>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
                <version.activemq>5.2.0.0006</version.activemq>
-               <version.maven-argeo-osgi>0.1.12</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.13</version.maven-argeo-osgi>
                <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
                <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
        </properties>
@@ -82,7 +82,6 @@ limitations under the License.
                                <role>developer</role>
                                <role>QA</role>
                        </roles>
-                       <timezone>+1</timezone>
                </developer>
                <developer>
                        <id>cdujeu</id>
@@ -93,7 +92,6 @@ limitations under the License.
                        <roles>
                                <role>developer</role>
                        </roles>
-                       <timezone>+1</timezone>
                </developer>
                <developer>
                        <id>ocapillo</id>
@@ -104,7 +102,6 @@ limitations under the License.
                        <roles>
                                <role>developer</role>
                        </roles>
-                       <timezone>+1</timezone>
                </developer>
        </developers>
        <contributors>
@@ -117,7 +114,6 @@ limitations under the License.
                                <role>tester</role>
                                <role>sponsor</role>
                        </roles>
-                       <timezone>0</timezone>
                </contributor>
        </contributors>
        <build>
@@ -416,17 +412,17 @@ limitations under the License.
                        <dependency>
                                <groupId>org.slf4j</groupId>
                                <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-                               <version>1.5.3</version>
+                               <version>${version.slf4j}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
                                <artifactId>com.springsource.slf4j.jcl</artifactId>
-                               <version>1.5.3</version>
+                               <version>${version.slf4j}</version>
                        </dependency>
                        <dependency>
                                <groupId>org.slf4j</groupId>
                                <artifactId>com.springsource.slf4j.org.apache.log4j</artifactId>
-                               <version>1.5.3</version>
+                               <version>${version.slf4j}</version>
                        </dependency>
 
                        <!-- Spring -->
@@ -487,11 +483,6 @@ limitations under the License.
                                <artifactId>org.springframework.jms</artifactId>
                                <version>${version.spring}</version>
                        </dependency>
-                       <!--
-                               <dependency> <groupId>org.springframework.ws</groupId>
-                               <artifactId>org.springframework.ws</artifactId>
-                               <version>${version.spring-ws}</version> </dependency>
-                       -->
                        <dependency>
                                <groupId>org.springframework.ws</groupId>
                                <artifactId>org.springframework.oxm</artifactId>
@@ -533,12 +524,12 @@ limitations under the License.
                        <dependency>
                                <groupId>org.aspectj</groupId>
                                <artifactId>com.springsource.org.aspectj.runtime</artifactId>
-                               <version>1.6.2.RELEASE</version>
+                               <version>1.6.3.RELEASE</version>
                        </dependency>
                        <dependency>
                                <groupId>org.aspectj</groupId>
                                <artifactId>com.springsource.org.aspectj.weaver</artifactId>
-                               <version>1.6.2.RELEASE</version>
+                               <version>1.6.3.RELEASE</version>
                        </dependency>
                        <dependency>
                                <groupId>org.aopalliance</groupId>
@@ -565,7 +556,7 @@ limitations under the License.
                        <dependency>
                                <groupId>org.apache.ant</groupId>
                                <artifactId>com.springsource.org.apache.tools.ant</artifactId>
-                               <version>1.7.0</version>
+                               <version>1.7.1</version>
                        </dependency>
 
                        <!-- Required by specific Ant tasks -->
@@ -608,6 +599,11 @@ limitations under the License.
                                <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
                                <version>1.1</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.dep.osgi</groupId>
+                               <artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
+                               <version>1.0.0.argeo1</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.apache.commons</groupId>
                                <artifactId>com.springsource.org.apache.commons.pool</artifactId>
@@ -1033,7 +1029,7 @@ limitations under the License.
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-report-plugin</artifactId>
                                <inherited>false</inherited>
-                               <configuration>
+                               <configuration>
                                        <aggregate>true</aggregate>
                                </configuration>
                        </plugin>
@@ -1054,16 +1050,35 @@ limitations under the License.
                                </configuration>
                        </plugin>
                        <!--
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
+                               <plugin> <groupId>org.codehaus.mojo</groupId>
                                <artifactId>clirr-maven-plugin</artifactId>
+                               <inherited>false</inherited> </plugin>
+                       -->
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-changelog-plugin</artifactId>
                                <inherited>false</inherited>
                        </plugin>
-                         -->
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-changelog-plugin</artifactId>
+                               <artifactId>maven-pmd-plugin</artifactId>
+                               <version>2.3</version>
                                <inherited>false</inherited>
+                               <configuration>
+                                       <linkXref>true</linkXref>
+                                       <targetJdk>1.5</targetJdk>
+                                       <aggregate>true</aggregate>
+                                       <excludes>
+                                               <exclude>**/springutil/*.java</exclude>
+                                       </excludes>
+                               </configuration>
+                               <reportSets>
+                                       <reportSet>
+                                               <reports>
+                                                       <report>cpd</report>
+                                               </reports>
+                                       </reportSet>
+                               </reportSets>
                        </plugin>
                </plugins>
        </reporting>