X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=pom.xml;h=affbf8bd1d9c6018e850160a790303dbd2d06b36;hb=0cf7cc6e98d7009476ed42c7ac508fc443abd9cd;hp=ad0c9e63015e26ef7428c2cd398e4e94809d8d3a;hpb=3d9cab816701db76261a0eda41a9b159bed83ace;p=utils

diff --git a/pom.xml b/pom.xml
index ad0c9e63..affbf8bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
-<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>
 	<groupId>org.wamblee</groupId>
 	<artifactId>wamblee-utils</artifactId>
 	<packaging>pom</packaging>
-	<version>0.2.5-SNAPSHOT</version>
+	<version>0.6-SNAPSHOT</version>
 	<name>/</name>
 	<description>wamblee.org utilities library</description>
 	<url>http://wamblee.org</url>
@@ -43,11 +42,6 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.dbunit</groupId>
-			<artifactId>dbunit</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derby</artifactId>
@@ -89,13 +83,17 @@
 		<!--
 			dependency> <groupId>org.testng</groupId>
 			<artifactId>testng</artifactId> <version>5.7</version>
-			<scope>test</scope> <classifier>jdk15</classifier> </dependency
-		-->
+			<scope>test</scope> <classifier>jdk15</classifier> </dependency -->
 	</dependencies>
 
 	<dependencyManagement>
 		<dependencies>
-
+			<dependency>
+				<groupId>javax.faces</groupId>
+				<artifactId>jsf-api</artifactId>
+				<version>1.2_02</version>
+				<scope>provided</scope>
+			</dependency>
 			<dependency>
 				<groupId>org.apache.wicket</groupId>
 				<artifactId>wicket</artifactId>
@@ -106,7 +104,6 @@
 				<groupId>org.jboss.weld</groupId>
 				<artifactId>weld-se</artifactId>
 				<version>1.0.1-Final</version>
-				<scope>provided</scope>
 			</dependency>
 
 			<dependency>
@@ -120,6 +117,7 @@
 				<groupId>javax.transaction</groupId>
 				<artifactId>transaction-api</artifactId>
 				<version>1.1</version>
+                                <scope>provided</scope>
 			</dependency>
 
 			<dependency>
@@ -262,8 +260,8 @@
 			</dependency>
 			<dependency>
 				<groupId>net.sf.ehcache</groupId>
-				<artifactId>ehcache</artifactId>
-				<version>1.2.3</version>
+				<artifactId>ehcache-core</artifactId>
+				<version>2.2.0</version>
 			</dependency>
 
 			<dependency>
@@ -325,11 +323,11 @@
 				<artifactId>commons-dbcp</artifactId>
 				<version>1.4</version>
 			</dependency>
-			<dependency>
+			<!-- dependency>
 				<groupId>toplink.essentials</groupId>
 				<artifactId>toplink-essentials</artifactId>
 				<version>2.1-60f</version>
-			</dependency>
+			</dependency -->
 			<dependency>
 				<groupId>org.eclipse.persistence</groupId>
 				<artifactId>eclipselink</artifactId>
@@ -391,6 +389,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
+                                <version>2.5</version>
 				<configuration>
 					<!--
 						enable forkMode to check if some tests do not setup their test
@@ -455,7 +454,36 @@
 			<plugins>
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>2.1.1</version>
+					<version>3.0-beta-3</version>
+					<configuration>
+						<reportPlugins>
+							<plugin>
+								<groupId>org.apache.maven.plugins</groupId>
+								<artifactId>maven-project-info-reports-plugin</artifactId>
+								<version>2.3.1</version>
+								<configuration>
+									<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+									<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+								</configuration>
+							</plugin>
+							<plugin>
+								<groupId>org.apache.maven.plugins</groupId>
+								<artifactId>maven-javadoc-plugin</artifactId>
+								<version>2.7</version>
+							</plugin>
+							<plugin>
+								<groupId>org.codehaus.mojo</groupId>
+								<artifactId>cobertura-maven-plugin</artifactId>
+								<version>2.3</version>
+								<configuration>
+									<formats>
+										<format>xml</format>
+										<format>html</format>
+									</formats>
+								</configuration>
+							</plugin>		
+						</reportPlugins>
+					</configuration>
 				</plugin>
 			</plugins>
 		</pluginManagement>
@@ -465,24 +493,6 @@
 
 	<reporting>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-				<reportSets>
-					<reportSet>
-						<reports>
-							<report>checkstyle</report>
-							<report>javadoc</report>
-							<!--report>dependencies</report -->
-							<!-- report>project-team</report -->
-							<!-- report>mailing-list</report -->
-							<!-- report>issue-tracking</report -->
-							<!-- report>license</report -->
-							<!--report>scm</report -->
-						</reports>
-					</reportSet>
-				</reportSets>
-			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>findbugs-maven-plugin</artifactId>
@@ -513,25 +523,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
+				<version>2.6.1</version>
 			</plugin>
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>surefire-report-maven-plugin</artifactId>
 			</plugin>
-			<!-- Test coverage reporting -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<formats>
-						<format>xml</format>
-						<format>html</format>
-					</formats>
-				</configuration>
-			</plugin>
-
 			<!-- checkstyle -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>