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

diff --git a/pom.xml b/pom.xml
index 144a711c2..d3b02745a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,18 +16,19 @@
 	</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>
+		<version.maven-argeo-osgi>0.1.15-SNAPSHOT</version.maven-argeo-osgi>
+		<version.maven-argeo-qooxdoo>0.8.1.7</version.maven-argeo-qooxdoo>
 		<site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
 		<site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
 	</properties>
@@ -140,70 +141,32 @@ limitations under the License.
 						</execution>
 					</executions>
 				</plugin>
-				<!--
-					<plugin> <groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-javadoc-plugin</artifactId> <executions>
-					<execution> <id>attach-javadoc</id> <phase>package</phase> <goals>
-					<goal>jar</goal> </goals> </execution> </executions> </plugin>
-				-->
-				<plugin>
-					<groupId>org.mortbay.jetty</groupId>
-					<artifactId>maven-jetty-plugin</artifactId>
-					<version>${version.jetty}</version>
-					<configuration>
-						<contextPath>org.argeo.slc.webapp</contextPath>
-						<stopKey>stopKey</stopKey>
-						<stopPort>9091</stopPort>
-						<connectors>
-							<connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-								<port>9090</port>
-								<maxIdleTime>60000</maxIdleTime>
-							</connector>
-						</connectors>
-					</configuration>
-					<dependencies>
-						<dependency>
-							<groupId>org.hsqldb</groupId>
-							<artifactId>
-								com.springsource.org.hsqldb
-							</artifactId>
-							<version>1.8.0.9</version>
-						</dependency>
-						<dependency>
-							<groupId>org.mortbay.jetty</groupId>
-							<artifactId>jetty-plus</artifactId>
-							<version>${version.jetty}</version>
-						</dependency>
-						<dependency>
-							<groupId>org.mortbay.jetty</groupId>
-							<artifactId>jetty-naming</artifactId>
-							<version>${version.jetty}</version>
-						</dependency>
-						<dependency>
-							<groupId>org.apache.log4j</groupId>
-							<artifactId>com.springsource.org.apache.log4j</artifactId>
-							<version>1.2.15</version>
-						</dependency>
-						<dependency>
-							<groupId>javax.xml.soap</groupId>
-							<artifactId>com.springsource.javax.xml.soap</artifactId>
-							<version>1.3.0</version>
-						</dependency>
-						<dependency>
-							<groupId>javax.mail</groupId>
-							<artifactId>com.springsource.javax.mail</artifactId>
-							<version>1.4.1</version>
-						</dependency>
-					</dependencies>
-				</plugin>
 				<plugin>
-					<groupId>org.argeo.slc.maven</groupId>
+					<groupId>org.argeo.maven.plugins</groupId>
 					<artifactId>maven-argeo-osgi-plugin</artifactId>
 					<version>${version.maven-argeo-osgi}</version>
 				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>buildnumber-maven-plugin</artifactId>
+				<version>1.0-beta-3</version>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<doCheck>false</doCheck>
+					<doUpdate>false</doUpdate>
+					<useLastCommittedRevision>true</useLastCommittedRevision>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -220,8 +183,6 @@ limitations under the License.
 					http://jira.codehaus.org/browse/MSITE-276
 				-->
 			</plugin>
-
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
@@ -412,17 +373,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 -->
@@ -517,19 +478,19 @@ limitations under the License.
 			<dependency>
 				<groupId>org.argeo.slc.dep.osgi</groupId>
 				<artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-				<version>1.0.0.argeo3</version>
+				<version>1.0.0.argeo4</version>
 			</dependency>
 
 			<!-- AOP -->
 			<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 +517,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 -->
@@ -850,6 +811,19 @@ limitations under the License.
 				<version>1.3.0</version>
 			</dependency>
 
+			<!-- SSH -->
+			<dependency>
+				<groupId>com.jcraft.jsch</groupId>
+				<artifactId>com.springsource.com.jcraft.jsch</artifactId>
+				<version>0.1.25</version>
+			</dependency>
+
+			<!-- Scheduling -->
+			<dependency>
+				<groupId>com.opensymphony.quartz</groupId>
+				<artifactId>com.springsource.org.quartz</artifactId>
+				<version>1.6.2</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>
@@ -1029,7 +1003,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 +1024,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>