X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=pom.xml;h=a41a601aa41f7caa2fd8fb67a2cd8e8df875f0dd;hb=f990eaefc7c05bfe601e33c2bc1a655c081f272a;hp=24fcd42a037f5ce37889c8179c84797b4c2ebe61;hpb=fa45ae8a9b91bb14de404c07afac1d08e4c72cc2;p=utils

diff --git a/pom.xml b/pom.xml
index 24fcd42a..a41a601a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,4 @@
+<?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">
@@ -5,7 +6,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <packaging>pom</packaging>
-    <version>0.2-SNAPSHOT</version>
+    <version>0.2.5-SNAPSHOT</version>
     <name>/</name>
     <description>wamblee.org utilities library</description>
     <url>http://wamblee.org</url>
@@ -17,18 +18,24 @@
         </license>
     </licenses>
     <scm>
-        <url>http://wamblee.org/svn/public</url>
+        <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>
+            <email>erik@wamblee.org</email>
+            <name>Erik Brakkee</name>
+            <url>http://brakkee.org</url>
+        </developer>
+    </developers>
 
     <modules>
         <module>support</module>
         <module>system</module>
         <module>hibernate-jpa</module>
         <module>security</module>
-        <module>socketproxy</module>
-        <module>crawler</module>
-        <module>gps</module>
-        <module>mythtv</module>
+        <module>test</module>
     </modules>
     <dependencies>
         <dependency>
@@ -75,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>
 
@@ -91,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>
@@ -231,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>
@@ -253,12 +261,6 @@
                 <artifactId>ehcache</artifactId>
                 <version>1.2.3</version>
             </dependency>
-            <dependency>
-                <groupId>xerces</groupId>
-                <artifactId>xercesImpl</artifactId>
-                <version>2.8.1</version>
-            </dependency>
-
 
             <dependency>
                 <groupId>commons-email</groupId>
@@ -302,9 +304,9 @@
             </dependency>
 
             <dependency>
-                <groupId>javaee</groupId>
+                <groupId>javax</groupId>
                 <artifactId>javaee-api</artifactId>
-                <version>5</version>
+                <version>6.0</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -322,22 +324,42 @@
             <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>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <version>2.0</version>
+                <configuration>
+                    <autoVersionSubmodules>true</autoVersionSubmodules>
+                    <goals>javadoc:jar deploy</goals>
+                </configuration>
+            </plugin>
+            <plugin>
+                <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>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jalopy-maven-plugin</artifactId>
@@ -345,6 +367,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>
@@ -387,6 +416,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.3</version>
                 <executions>
                     <execution>
                         <goals>
@@ -396,19 +426,32 @@
                 </executions>
                 <configuration>
                     <instrumentation>
-                        <excludes>
-                            <exclude>org/wamblee/crawler/kiss/**/*.class</exclude>
-                            <exclude>org/wamblee/mythtv/**/*.class</exclude>
-                        </excludes>
+                        <excludes> </excludes>
                     </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>
@@ -429,6 +472,21 @@
                     </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>
@@ -444,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>
@@ -453,6 +512,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.3</version>
                 <configuration>
                     <formats>
                         <format>xml</format>
@@ -465,8 +525,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>
 
@@ -486,23 +547,15 @@
         </plugins>
     </reporting>
 
-    <repositories>
-        <repository>
-            <id>javaee</id>
-            <name>Java EE repo at SUN</name>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>EclipseLink Repo</id>
-            <url>http://www.eclipse.org/downloads/download.php?r=1&amp;nf=1&amp;file=/rt/eclipselink/maven.repo</url>
-        </repository>
-
-    </repositories>
-
     <profiles>
         <profile>
             <id>release</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -520,9 +573,38 @@
                     </plugin>
                 </plugins>
             </build>
+            <distributionManagement>
+                <repository>
+                    <id>sonatype-nexus-staging</id>
+                    <name>Nexus Release Repository</name>
+                    <url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+                </repository>
+            </distributionManagement>
+
+        </profile>
+        <profile>
+            <id>all</id>
+            <activation>
+                <property>
+                    <name>!performRelease</name>
+                </property>
+            </activation>
+            <distributionManagement>
+                <repository>
+                    <id>local</id>
+                    <name>Local directory</name>
+                    <url>file:${user.home}/java/workspace/deploy</url>
+                </repository>
+            </distributionManagement>
         </profile>
     </profiles>
 
+    <distributionManagement>
+        <site>
+            <id>test-enterprise-site</id>
+            <url>file:${distrib}/main</url>
+        </site>
+    </distributionManagement>
 
     <properties>
         <spring.version>2.0.8</spring.version>