X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=pom.xml;h=5a67306538ca8ede1baab5b18917d21f11a5999d;hb=845506d261bba75452e9d65191e486705015b603;hp=092ca43ee75a94e49695fc75eccba13984e48449;hpb=16504cb35c59542f7817abfe3c852e9fedd870a3;p=utils

diff --git a/pom.xml b/pom.xml
index 092ca43e..5a673065 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,102 +6,138 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <packaging>pom</packaging>
-    <version>0.2-SNAPSHOT</version>
-    <name>wamblee.org utility libraries</name>
+    <version>0.2.5-SNAPSHOT</version>
+    <name>/</name>
+    <description>wamblee.org utilities library</description>
     <url>http://wamblee.org</url>
+    <licenses>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+    <scm>
+        <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>wicket</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>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.4</version>
-            <scope>test</scope> 
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.dbunit</groupId>
             <artifactId>dbunit</artifactId>
-            <version>2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>jmock</groupId>
-            <artifactId>jmock-cglib</artifactId>
-            <version>1.1.0</version>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbynet</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>cglib</groupId>
-                    <artifactId>cglib-full</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <version>1.8.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- dependency>
+          <groupId>org.testng</groupId>
+          <artifactId>testng</artifactId>
+          <version>5.7</version>
+          <scope>test</scope>
+          <classifier>jdk15</classifier>
+        </dependency -->
     </dependencies>
 
     <dependencyManagement>
         <dependencies>
+
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-support</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-support</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-hibernate-jpa</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-hibernate-jpa</artifactId>
-                <version>${project.version}</version>
-                <type>test-jar</type>
+                <groupId>org.jboss.weld</groupId>
+                <artifactId>weld-se</artifactId>
+                <version>1.0.1-Final</version>
+                <scope>provided</scope>
             </dependency>
+            
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-socketproxy</artifactId>
-                <version>${project.version}</version>
+                <groupId>oro</groupId>
+                <artifactId>oro</artifactId>
+                <version>2.0.6</version>
             </dependency>
+
+
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-socketproxy</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>javax.transaction</groupId>
+                <artifactId>transaction-api</artifactId>
+                <version>1.1</version>
             </dependency>
+
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-crawler</artifactId>
-                <version>${project.version}</version>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.4</version>
             </dependency>
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-crawler</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>org.dbunit</groupId>
+                <artifactId>dbunit</artifactId>
+                <version>2.4.7</version>
             </dependency>
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-crawler-basic</artifactId>
-                <version>${project.version}</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.11</version>
             </dependency>
             <dependency>
-                <groupId>org.wamblee</groupId>
-                <artifactId>wamblee-crawler-basic</artifactId>
-                <type>test-jar</type>
-                <version>${project.version}</version>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-jdk14</artifactId>
+                <version>1.5.11</version>
             </dependency>
 
             <dependency>
@@ -129,22 +166,22 @@
             <dependency>
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
-                <version>3.1.14</version>
+                <version>5.1.12</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
-                <version>10.3.2.1</version>
+                <version>10.5.3.0_1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbyclient</artifactId>
-                <version>10.3.2.1</version>
+                <version>10.5.3.0_1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derbynet</artifactId>
-                <version>10.3.2.1</version>
+                <version>10.5.3.0_1</version>
             </dependency>
             <dependency>
                 <groupId>quartz</groupId>
@@ -176,45 +213,39 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-web</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jms</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-hibernate3</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-jpa</artifactId>
-                <version>${springversion}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-aop</artifactId>
-                <version>${springversion}</version>
+                <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>
@@ -231,12 +262,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>
@@ -280,9 +305,9 @@
             </dependency>
 
             <dependency>
-                <groupId>javaee</groupId>
+                <groupId>javax</groupId>
                 <artifactId>javaee-api</artifactId>
-                <version>5</version>
+                <version>6.0</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -292,12 +317,65 @@
                 <version>1.3</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-dbcp</groupId>
+                <artifactId>commons-dbcp</artifactId>
+                <version>1.4</version>
+            </dependency>
+            <dependency>
+                <groupId>toplink.essentials</groupId>
+                <artifactId>toplink-essentials</artifactId>
+                <version>2.1-60f</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.persistence</groupId>
+                <artifactId>eclipselink</artifactId>
+                <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>
+                <configuration>
+                    <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>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -311,9 +389,13 @@
                 <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>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
                 </configuration>
             </plugin>
 
@@ -334,10 +416,11 @@
                     </execution>
                 </executions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.3</version>
                 <executions>
                     <execution>
                         <goals>
@@ -345,13 +428,34 @@
                         </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <instrumentation>
+                        <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>
@@ -362,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>
@@ -387,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>
@@ -396,10 +516,12 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.3</version>
                 <configuration>
-                  <formats>
-                    <format>xml</format>
-                  </formats>
+                    <formats>
+                        <format>xml</format>
+                        <format>html</format>
+                    </formats>
                 </configuration>
             </plugin>
 
@@ -407,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>
 
@@ -428,17 +551,68 @@
         </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>
-    </repositories>
+    <profiles>
+        <profile>
+            <id>release</id>
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </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>
-        <springversion>2.0.8</springversion>
+        <spring.version>2.0.8</spring.version>
+        <jmock.version>2.4.0</jmock.version>
     </properties>
 
 </project>