X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=pom.xml;h=c63e2fa70e9ece6dd85e7d1eb79e41fae6173f77;hb=c46efecd86330918248ee9aac139fc632da6b976;hp=144a711c2623aa8f8945b0737560eea626ff55a8;hpb=5eaba3cea8fcacb7f57a6c335e1f9bb816959b05;p=gpl%2Fargeo-slc.git

diff --git a/pom.xml b/pom.xml
index 144a711c2..c63e2fa70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,15 +16,15 @@
 	</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.13</version.maven-argeo-osgi>
@@ -412,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 -->
@@ -524,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>
@@ -556,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 -->
@@ -1029,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>
@@ -1050,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>