(no commit message)

[utils] / pom.xml

diff --git a/pom.xml b/pom.xml
index 34cde99070ec0ec23f5abfa58ec4360332741135..a41a601aa41f7caa2fd8fb67a2cd8e8df875f0dd 100644 (file)
--- 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.3-SNAPSHOT</version>
+    <version>0.2.5-SNAPSHOT</version>
     <name>/</name>
     <description>wamblee.org utilities library</description>
     <url>http://wamblee.org</url>
@@ -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,12 +324,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 +355,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 +371,7 @@
                     <dependency>
                         <groupId>org.wamblee</groupId>
                         <artifactId>wamblee-code-style</artifactId>
-                        <version>1.1-SNAPSHOT</version>
+                        <version>1.1</version>
                     </dependency>
                 </dependencies>
             </plugin>
@@ -448,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>
@@ -504,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>
@@ -600,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>