X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=pom.xml;h=5a67306538ca8ede1baab5b18917d21f11a5999d;hb=845506d261bba75452e9d65191e486705015b603;hp=84d049cc26ba78369a39823b4af13012b8aae8dd;hpb=1f9fba6035009bfe5925e20b3e79107a75d7c4a4;p=utils

diff --git a/pom.xml b/pom.xml
index 84d049cc..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</version>
+    <version>0.2.5-SNAPSHOT</version>
     <name>/</name>
     <description>wamblee.org utilities library</description>
     <url>http://wamblee.org</url>
@@ -15,9 +18,9 @@
         </license>
     </licenses>
     <scm>
-        <url>https://wamblee.org/viewvc/utils/tags/wamblee-utils-0.2.2</url>
-        <connection>scm:svn:https://wamblee.org/svn/public/utils/tags/wamblee-utils-0.2.2</connection>
-        <developerConnection>scm:svn:https://wamblee.org/svn/public/utils/tags/wamblee-utils-0.2.2</developerConnection>
+        <url>https://wamblee.org/viewvc/utils</url>
+        <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>
@@ -29,6 +32,7 @@
 
     <modules>
         <module>support</module>
+        <module>wicket</module>
         <module>system</module>
         <module>hibernate-jpa</module>
         <module>security</module>
@@ -79,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>
 
@@ -95,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>
@@ -235,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>
@@ -320,12 +325,12 @@
             <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>
 
@@ -351,33 +356,11 @@
                     <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>
                 <artifactId>jalopy-maven-plugin</artifactId>
@@ -389,7 +372,7 @@
                     <dependency>
                         <groupId>org.wamblee</groupId>
                         <artifactId>wamblee-code-style</artifactId>
-                        <version>1.1-SNAPSHOT</version>
+                        <version>1.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -406,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>
@@ -448,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>
@@ -464,12 +466,12 @@
                         <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>
@@ -504,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>
@@ -600,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>