migration to maven 3

diff --git a/hibernate-jpa/pom.xml b/hibernate-jpa/pom.xml
index 0a4d5da5ada447fe0e08980205a71ba29ca1958b..cab463ccd27908e6f6cf4d1f5ee99f451077fd2e 100644 (file)
--- a/hibernate-jpa/pom.xml
+++ b/hibernate-jpa/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
index 4c4ed6c1e7cceee7ebc42ecf6b9d6f83ec57ca79..dcea804062a3064f19ccc3c40855099a3cda5abc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -323,11 +323,11 @@
                                <artifactId>commons-dbcp</artifactId>
                                <version>1.4</version>
                        </dependency>
-                       <dependency>
+                       <!-- dependency>
                                <groupId>toplink.essentials</groupId>
                                <artifactId>toplink-essentials</artifactId>
                                <version>2.1-60f</version>
-                       </dependency>
+                       </dependency -->
                        <dependency>
                                <groupId>org.eclipse.persistence</groupId>
                                <artifactId>eclipselink</artifactId>
@@ -454,7 +454,26 @@
                        <plugins>
                                <plugin>
                                        <artifactId>maven-site-plugin</artifactId>
-                                       <version>2.1.1</version>
+                                       <version>3.0-beta-3</version>
+                                       <configuration>
+                                               <reportPlugins>
+                                                       <plugin>
+                                                               <groupId>org.apache.maven.plugins</groupId>
+                                                               <artifactId>maven-project-info-reports-plugin</artifactId>
+                                                               <version>2.3.1</version>
+                                                               <configuration>
+                                                                       <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+                                                                       <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                                                               </configuration>
+                                                       </plugin>
+                                                       <plugin>
+                                                               <groupId>org.apache.maven.plugins</groupId>
+                                                               <artifactId>maven-javadoc-plugin</artifactId>
+                                                               <version>2.7</version>
+                                                       </plugin>
+                                                       
+                                               </reportPlugins>
+                                       </configuration>
                                </plugin>
                        </plugins>
                </pluginManagement>
@@ -464,24 +483,6 @@
 
        <reporting>
                <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-project-info-reports-plugin</artifactId>
-                               <reportSets>
-                                       <reportSet>
-                                               <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 -->
-                                               </reports>
-                                       </reportSet>
-                               </reportSets>
-                       </plugin>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>
                                <artifactId>findbugs-maven-plugin</artifactId>
@@ -512,7 +513,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-javadoc-plugin</artifactId>
-                               <version>2.5</version>
+                               <version>2.6.1</version>
                        </plugin>
                        <plugin>
                                <groupId>org.codehaus.mojo</groupId>

diff --git a/security/jpatest/pom.xml b/security/jpatest/pom.xml
index ec2896659190fe87747af71de8182e6faecb3c99..59b63ee012a7f9f8f5e073a336c5f897ae8ec356 100644 (file)
--- a/security/jpatest/pom.xml
+++ b/security/jpatest/pom.xml
@@ -5,6 +5,7 @@
         <groupId>org.wamblee</groupId>
         <artifactId>wamblee-utils</artifactId>
         <version>0.6-SNAPSHOT</version>
+               <relativePath>../..</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/security/pom.xml b/security/pom.xml
index 33ba9c36474c82082e4d141788f34919fc8b15a2..9491b492b0c73761930d41faf6a349932a82e8c5 100644 (file)
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/security/usermgt/pom.xml b/security/usermgt/pom.xml
index cdeb8e387c21bfdc48d60fc74f4fb08a78f19846..436f70765953a765c51309a74fb6fd8bbf04183d 100644 (file)
--- a/security/usermgt/pom.xml
+++ b/security/usermgt/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/support/cdi/pom.xml b/support/cdi/pom.xml
index e69420a12eb256a30dbb821cf234b92e133df241..1ed3c7fbf7a2ebf5aa605e501f90761e68ce285c 100644 (file)
--- a/support/cdi/pom.xml
+++ b/support/cdi/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/support/general/pom.xml b/support/general/pom.xml
index 927be2e3e8d8bec432638af27bfd1333dd2437cb..8cd135f9d76bcf69f1687e7dd1edb777b6250a0e 100644 (file)
--- a/support/general/pom.xml
+++ b/support/general/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/support/inject/pom.xml b/support/inject/pom.xml
index 6694d565c7472b338dfdcd22182d3dc8859d729b..4dbdd5d6f6ca79cbcdb38c6c6f18af687924ecb3 100644 (file)
--- a/support/inject/pom.xml
+++ b/support/inject/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/support/pom.xml b/support/pom.xml
index 9a66bfd271a570e166183a209602c4a22d8fb993..07e5a1e1b5874541758c5205f4cb6dd8bd34ff5d 100644 (file)
--- a/support/pom.xml
+++ b/support/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/support/spring/pom.xml b/support/spring/pom.xml
index 8f3462fb3cf92034501ce8cf81821d757a7e39db..4c8778041216feba7475dae45f7716019e37ee90 100644 (file)
--- a/support/spring/pom.xml
+++ b/support/spring/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/system/general/pom.xml b/system/general/pom.xml
index a58927a5f11cb7312c49c9da965345ac25d172eb..3282c18af78188bbec1fcc17d6a4bd9b41667c69 100644 (file)
--- a/system/general/pom.xml
+++ b/system/general/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/system/pom.xml b/system/pom.xml
index c24468e1b338422b1c61770219afdbc7f46e4229..78264023a8036784a6f5ed0e4660e154c5dc5ed7 100644 (file)
--- a/system/pom.xml
+++ b/system/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/system/spring/pom.xml b/system/spring/pom.xml
index f3ba1dba4b19b6a88c626838489849045d337bb5..81ac61df359f6b36d79dd6e97a84a5b8de9936c7 100644 (file)
--- a/system/spring/pom.xml
+++ b/system/spring/pom.xml
@@ -5,6 +5,7 @@
         <groupId>org.wamblee</groupId>
         <artifactId>wamblee-utils</artifactId>
         <version>0.6-SNAPSHOT</version>
+               <relativePath>../..</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/test/eclipselink/pom.xml b/test/eclipselink/pom.xml
index 38ac2c7a895e2fd32bca143797879bd51e11add1..22df7f705d646bce5ba174fe53a5c3642719e545 100644 (file)
--- a/test/eclipselink/pom.xml
+++ b/test/eclipselink/pom.xml
@@ -5,6 +5,7 @@
                <groupId>org.wamblee</groupId>
                <artifactId>wamblee-utils</artifactId>
                <version>0.6-SNAPSHOT</version>
+               <relativePath>../..</relativePath>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/test/enterprise/pom.xml b/test/enterprise/pom.xml
index d5a86d0446a5ea5e09a69d90f0c3f0dac4d762d3..0805881e26e3439f71383cc7497435bdcd57ec83 100644 (file)
--- a/test/enterprise/pom.xml
+++ b/test/enterprise/pom.xml
@@ -7,6 +7,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/test/hibernate/pom.xml b/test/hibernate/pom.xml
index 2448e1edeb8c8a2af64cb64fa07781d2b37238dc..175312f295f0c23dce5ad39c277f98747f20abc6 100644 (file)
--- a/test/hibernate/pom.xml
+++ b/test/hibernate/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/test/jpatest-eclipselink/pom.xml b/test/jpatest-eclipselink/pom.xml
index 2b98de14408aa2dd16f9db18ad2fe7b9b7781d78..3b79134a6837d9e732702027ee62646eb3c70f28 100644 (file)
--- a/test/jpatest-eclipselink/pom.xml
+++ b/test/jpatest-eclipselink/pom.xml
@@ -5,6 +5,7 @@
                <groupId>org.wamblee</groupId>
                <artifactId>wamblee-utils</artifactId>
                <version>0.6-SNAPSHOT</version>
+               <relativePath>../..</relativePath>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/test/jpatest-hibernate/pom.xml b/test/jpatest-hibernate/pom.xml
index 24ecbde80eee2d75ba9d05865b9b1066383d013e..06e09d9da95363c3dda993eec8ef3d30e50c3f9c 100644 (file)
--- a/test/jpatest-hibernate/pom.xml
+++ b/test/jpatest-hibernate/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/test/jpatest-toplink-essentials/pom.xml b/test/jpatest-toplink-essentials/pom.xml
index da34de14beccf62173514c4a67c92e7f65c21356..d61ae877231244cbfd2ea6147c6c92af66852092 100644 (file)
--- a/test/jpatest-toplink-essentials/pom.xml
+++ b/test/jpatest-toplink-essentials/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/test/pom.xml b/test/pom.xml
index 80109b136512337bb28dc3b5118ef2ff27ba2267..b736e5881d90f880a88c9443be37a81300fceada 100644 (file)
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -32,7 +33,7 @@
       <modules>
         <module>jpatest-hibernate</module>
         <module>jpatest-eclipselink</module>
-        <module>jpatest-toplink-essentials</module>
+        <!--module>jpatest-toplink-essentials</module-->
       </modules>
     </profile>
   </profiles>

diff --git a/test/toplink-essentials/pom.xml b/test/toplink-essentials/pom.xml
index 64de62e291628d15616d52362ec9b436b817642d..8122aaaedee27ddd35a58bd523d22ace07f4be74 100644 (file)
--- a/test/toplink-essentials/pom.xml
+++ b/test/toplink-essentials/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/wicket/components/pom.xml b/wicket/components/pom.xml
index 9d2c624723e8144a4437cafac56e1191bee2d9ea..2829647e26b9d2164cfcadcc5e1fefb2bba55393 100644 (file)
--- a/wicket/components/pom.xml
+++ b/wicket/components/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/wicket/joe/pom.xml b/wicket/joe/pom.xml
index 95b3dc4289fdb6f3b40987579b7aeb49383af9d5..c66e90a76808a715b9e69891580c2c3797acba13 100644 (file)
--- a/wicket/joe/pom.xml
+++ b/wicket/joe/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>../..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/wicket/pom.xml b/wicket/pom.xml
index 261317104bd2a7accafa70990fb45fb2c004c64f..c167ec3c1b1dfd6504a935e1ed14de1b147ef8b8 100644 (file)
--- a/wicket/pom.xml
+++ b/wicket/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.wamblee</groupId>
     <artifactId>wamblee-utils</artifactId>
     <version>0.6-SNAPSHOT</version>
+       <relativePath>..</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>