X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=pom.xml;h=4c490395df52d2df0e458ea14025cb56a7211500;hb=7f9ddc1ed5622a79c7581c42c776c9e0a2b87503;hp=216a28ab6cd69da707505d105d5219a0b12557b8;hpb=72e213feab4c1b56095a3d86f8f3fb7103938b39;p=utils

diff --git a/pom.xml b/pom.xml
index 216a28ab..4c490395 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>
@@ -27,7 +30,7 @@
         </developer>
     </developers>
 
-    <modules>	    
+    <modules>
         <module>support</module>
         <module>system</module>
         <module>hibernate-jpa</module>
@@ -79,7 +82,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.8.0</version>
+            <version>1.8.5</version>
             <scope>test</scope>
         </dependency>
 
@@ -95,6 +98,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>
@@ -235,12 +245,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>
@@ -320,15 +324,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>
 
@@ -351,32 +355,10 @@
                     <dependency>
                         <groupId>org.wamblee</groupId>
                         <artifactId>wamblee-code-style</artifactId>
-                        <version>1.0</version>
+                        <version>1.1</version>
                     </dependency>
                 </dependencies>
             </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>
-            </plugin>
 
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -389,7 +371,7 @@
                     <dependency>
                         <groupId>org.wamblee</groupId>
                         <artifactId>wamblee-code-style</artifactId>
-                        <version>1.0</version>
+                        <version>1.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -434,6 +416,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.3</version>
                 <executions>
                     <execution>
                         <goals>
@@ -447,12 +430,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>
@@ -463,16 +462,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>
@@ -488,6 +502,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.7</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -497,6 +512,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.3</version>
                 <configuration>
                     <formats>
                         <format>xml</format>
@@ -564,7 +580,7 @@
                     <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
                 </repository>
             </distributionManagement>
-            
+
         </profile>
         <profile>
             <id>all</id>
@@ -583,6 +599,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>