X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=pom.xml;h=ec3d564283b1a0149dbd76abd18a398894ac71ac;hb=HEAD;hp=441b478cee8d74d01fc37e9262aa2ba6ac16836a;hpb=6ce2ab62fd7b8420b82cbfe410141e66b4b6b17b;p=utils

diff --git a/pom.xml b/pom.xml
index 441b478c..ec3d5642 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.wamblee</groupId>
 	<artifactId>wamblee-utils</artifactId>
 	<packaging>pom</packaging>
-	<version>0.5</version>
+	<version>0.9-SNAPSHOT</version>
 	<name>/</name>
 	<description>wamblee.org utilities library</description>
 	<url>http://wamblee.org</url>
@@ -16,9 +16,9 @@
 		</license>
 	</licenses>
 	<scm>
-		<url>https://wamblee.org/viewvc/utils/tags/wamblee-utils-0.5</url>
-		<connection>scm:svn:https://wamblee.org/svn/public/utils/tags/wamblee-utils-0.5</connection>
-		<developerConnection>scm:svn:https://wamblee.org/svn/public/utils/tags/wamblee-utils-0.5</developerConnection>
+		<url>https://wamblee.org/viewvc/utils</url>
+		<connection>scm:git:https://wamblee.org/git/public/utils</connection>
+		<developerConnection>scm:git:https://wamblee.org/git/public/utils</developerConnection>
 	</scm>
 	<developers>
 		<developer>
@@ -42,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>
@@ -93,7 +88,12 @@
 
 	<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>
@@ -104,7 +104,6 @@
 				<groupId>org.jboss.weld</groupId>
 				<artifactId>weld-se</artifactId>
 				<version>1.0.1-Final</version>
-				<scope>provided</scope>
 			</dependency>
 
 			<dependency>
@@ -118,6 +117,7 @@
 				<groupId>javax.transaction</groupId>
 				<artifactId>transaction-api</artifactId>
 				<version>1.1</version>
+                                <scope>provided</scope>
 			</dependency>
 
 			<dependency>
@@ -247,21 +247,10 @@
 				<version>${spring.version}</version>
 			</dependency>
 
-			<dependency>
-				<groupId>dom4j</groupId>
-				<artifactId>dom4j</artifactId>
-				<version>1.6</version>
-				<exclusions>
-					<exclusion>
-						<groupId>xml-apis</groupId>
-						<artifactId>xml-apis</artifactId>
-					</exclusion>
-				</exclusions>
-			</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>
@@ -269,21 +258,6 @@
 				<artifactId>commons-email</artifactId>
 				<version>1.0</version>
 			</dependency>
-			<dependency>
-				<groupId>jaxen</groupId>
-				<artifactId>jaxen</artifactId>
-				<version>1.1-beta-9</version>
-				<exclusions>
-					<exclusion>
-						<groupId>xom</groupId>
-						<artifactId>xom</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>xerces</groupId>
-						<artifactId>xmlParserAPIs</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<dependency>
 				<groupId>jstl</groupId>
 				<artifactId>jstl</artifactId>
@@ -323,11 +297,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>
@@ -340,12 +314,23 @@
 
 	<build>
 		<plugins>
+            <plugin>
+			    <groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.4.1</version>
+                <configuration>
+                    <failOnError>false</failOnError>
+                    <failOnWarnings>false</failOnWarnings>
+                </configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.0</version>
+				<version>2.2.1</version>
 				<configuration>
 					<autoVersionSubmodules>true</autoVersionSubmodules>
+                                        <localCheckout>true</localCheckout>
+                                        <pushChanges>false</pushChanges>
 					<goals>javadoc:jar deploy</goals>
 				</configuration>
 			</plugin>
@@ -365,6 +350,7 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>jalopy-maven-plugin</artifactId>
+				<version>1.0-alpha-1</version>
 				<configuration>
 					<fileFormat>UNIX</fileFormat>
 					<convention>org.wamblee.jalopy.xml</convention>
@@ -380,6 +366,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -413,6 +400,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-jar-plugin</artifactId>
+				<version>2.3.1</version>
 				<executions>
 					<execution>
 						<goals>
@@ -425,19 +413,21 @@
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>cobertura-maven-plugin</artifactId>
-				<version>2.3</version>
+				<version>2.7</version>
 				<executions>
-					<execution>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
+                    <execution>
+					    <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>cobertura</goal>
+                        </goals>
+                    </execution>
 				</executions>
 				<configuration>
-					<instrumentation>
-						<excludes>
-						</excludes>
-					</instrumentation>
+                    <aggregate>true</aggregate>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format>
+                    </formats>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -454,53 +444,64 @@
 			<plugins>
 				<plugin>
 					<artifactId>maven-site-plugin</artifactId>
-					<version>2.1.1</version>
+					<version>3.12.0</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>3.4.1</version>
+                                <configuration>
+                                    <failOnError>false</failOnError>
+                                    <failOnWarnings>false</failOnWarnings>
+                                </configuration>
+							</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>
 
 	</build>
 
-
 	<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>
-				<version>2.3.1</version>
+				<version>3.0.5</version>
 				<configuration>
 					<xmlOutput>true</xmlOutput>
-					<!-- Optional derectory to put findbugs xdoc xml report -->
 					<xmlOutputDirectory>target/site</xmlOutputDirectory>
 					<findbugsXmlOutput>true</findbugsXmlOutput>
-					<!-- Optional directory to put findbugs xml report -->
 					<findbugsXmlOutputDirectory>target/site</findbugsXmlOutputDirectory>
 				</configuration>
 
 			</plugin>
-
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>changes-maven-plugin</artifactId>
-				<version>2.0-beta-1</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changes-plugin</artifactId>
+				<version>2.12.1</version>
 				<reportSets>
 					<reportSet>
 						<reports>
@@ -512,48 +513,26 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.5</version>
-			</plugin>
+				<version>3.4.1</version>
+                <configuration>
+                  <failOnError>false</failOnError>
+                  <failOnWarnings>false</failOnWarnings>
+                </configuration>
+			</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>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.22.2</version>
 			</plugin>
-
-			<!-- checkstyle -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
-				<version>2.5</version>
+				<version>3.2.0</version>
 				<configuration>
 					<configLocation>org.wamblee.checkstyle.xml</configLocation>
 				</configuration>
 			</plugin>
 
-			<!-- taglist -->
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-				<configuration>
-					<tags>
-						<tag>TODO</tag>
-						<tag>@todo</tag>
-						<tag>FIXME</tag>
-					</tags>
-				</configuration>
-			</plugin>
-
 		</plugins>
 	</reporting>
 
@@ -601,7 +580,7 @@
 			</activation>
 			<distributionManagement>
 				<repository>
-					<id>local</id>
+					<id>localdir</id>
 					<name>Local directory</name>
 					<url>file:${user.home}/java/workspace/deploy</url>
 				</repository>
@@ -622,3 +601,7 @@
 	</properties>
 
 </project>
+
+
+
+