X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=pom.xml;h=5a67306538ca8ede1baab5b18917d21f11a5999d;hb=cb91054f35281c6fc5619f93ff71df46bf4686b9;hp=3dbc30ed03ee6aa059438f3b896e69a26358cbfd;hpb=495df3f222e880f1bc3175f0e7e4433aecbcbd35;p=utils

diff --git a/pom.xml b/pom.xml
index 3dbc30ed..5a673065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,12 @@
-<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">
+<?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">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <packaging>pom</packaging>
-    <version>0.2.2-SNAPSHOT</version>
+    <version>0.2.5-SNAPSHOT</version>
     <name>/</name>
     <description>wamblee.org utilities library</description>
     <url>http://wamblee.org</url>
@@ -16,8 +19,8 @@
     </licenses>
     <scm>
         <url>https://wamblee.org/viewvc/utils</url>
-        <connection>scm:svn:https://wamblee.org/svn/public/utils</connection>
-        <developerConnection>scm:svn:https://wamblee.org/svn/public/utils</developerConnection>
+        <connection>scm:svn:https://wamblee.org/svn/public/utils/trunk</connection>
+        <developerConnection>scm:svn:https://wamblee.org/svn/public/utils/trunk</developerConnection>
     </scm>
     <developers>
         <developer>
@@ -28,8 +31,8 @@
     </developers>
 
     <modules>
-	    <module>baseline</module>
         <module>support</module>
+        <module>wicket</module>
         <module>system</module>
         <module>hibernate-jpa</module>
         <module>security</module>
@@ -80,7 +83,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.8.0</version>
+            <version>1.8.5</version>
             <scope>test</scope>
         </dependency>
 
@@ -96,6 +99,13 @@
     <dependencyManagement>
         <dependencies>
 
+            <dependency>
+                <groupId>org.jboss.weld</groupId>
+                <artifactId>weld-se</artifactId>
+                <version>1.0.1-Final</version>
+                <scope>provided</scope>
+            </dependency>
+            
             <dependency>
                 <groupId>oro</groupId>
                 <artifactId>oro</artifactId>
@@ -236,12 +246,6 @@
                 <version>${spring.version}</version>
             </dependency>
 
-            <!-- should be possible to remove the dependence on log4j -->
-            <dependency>
-                <groupId>log4j</groupId>
-                <artifactId>log4j</artifactId>
-                <version>1.2.8</version>
-            </dependency>
             <dependency>
                 <groupId>dom4j</groupId>
                 <artifactId>dom4j</artifactId>
@@ -321,17 +325,15 @@
             <dependency>
                 <groupId>toplink.essentials</groupId>
                 <artifactId>toplink-essentials</artifactId>
-                <version>2.0-36</version>
+                <version>2.1-60f</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.persistence</groupId>
                 <artifactId>eclipselink</artifactId>
-                <version>2.0.0</version>
+                <version>2.0.2</version>
                 <scope>compile</scope>
             </dependency>
 
-
-
         </dependencies>
     </dependencyManagement>
 
@@ -347,25 +349,16 @@
                 </configuration>
             </plugin>
             <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4</version>
-                <configuration>
-                    <filesets>
-                        <fileset>
-                            <directory>.</directory>
-                            <includes>
-                                <include>derby.log</include>
-                                <include>createDDL.jdbc</include>
-                                <include>dropDDL.jdbc</include>
-                            </includes>
-                            <excludes>
-                                <exclude>**/important.log</exclude>
-                                <exclude>**/another-important.log</exclude>
-                            </excludes>
-                            <followSymlinks>false</followSymlinks>
-                        </fileset>
-                    </filesets>
-                </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.5</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.wamblee</groupId>
+                        <artifactId>wamblee-code-style</artifactId>
+                        <version>1.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
 
             <plugin>
@@ -375,6 +368,13 @@
                     <fileFormat>UNIX</fileFormat>
                     <convention>org.wamblee.jalopy.xml</convention>
                 </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.wamblee</groupId>
+                        <artifactId>wamblee-code-style</artifactId>
+                        <version>1.1</version>
+                    </dependency>
+                </dependencies>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -389,6 +389,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <!-- enable forkMode to check if some tests do not setup their
+                         test fixture correctly --> 
+                    <!-- forkMode>always</forkMode -->
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
@@ -417,6 +420,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.3</version>
                 <executions>
                     <execution>
                         <goals>
@@ -430,12 +434,28 @@
                     </instrumentation>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <locales>en</locales>
+                </configuration>
+            </plugin>
 
 
         </plugins>
 
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>2.1.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
     </build>
 
+
     <reporting>
         <plugins>
             <plugin>
@@ -446,16 +466,31 @@
                         <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>
+                            <!--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>
+                <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>
@@ -471,6 +506,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.5</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -480,6 +516,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.3</version>
                 <configuration>
                     <formats>
                         <format>xml</format>
@@ -492,8 +529,9 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
+                <version>2.5</version>
                 <configuration>
-                    <configLocation>config/sun_checks.xml</configLocation>
+                    <configLocation>org.wamblee.checkstyle.xml</configLocation>
                 </configuration>
             </plugin>
 
@@ -546,7 +584,7 @@
                     <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
                 </repository>
             </distributionManagement>
-            
+
         </profile>
         <profile>
             <id>all</id>
@@ -565,6 +603,12 @@
         </profile>
     </profiles>
 
+    <distributionManagement>
+        <site>
+            <id>test-enterprise-site</id>
+            <url>file:${distrib}/main</url>
+        </site>
+    </distributionManagement>
 
     <properties>
         <spring.version>2.0.8</spring.version>