From 70bdf7660398dc8ad0bbbe74a351f5f0124be4f8 Mon Sep 17 00:00:00 2001
From: Erik Brakkee <erik@brakkee.org>
Date: Sun, 9 Jan 2011 14:19:55 +0000
Subject: [PATCH] migration to maven 3

---
 hibernate-jpa/pom.xml                   |  1 +
 pom.xml                                 | 45 +++++++++++++------------
 security/jpatest/pom.xml                |  1 +
 security/pom.xml                        |  1 +
 security/usermgt/pom.xml                |  1 +
 support/cdi/pom.xml                     |  1 +
 support/general/pom.xml                 |  1 +
 support/inject/pom.xml                  |  1 +
 support/pom.xml                         |  1 +
 support/spring/pom.xml                  |  1 +
 system/general/pom.xml                  |  1 +
 system/pom.xml                          |  1 +
 system/spring/pom.xml                   |  1 +
 test/eclipselink/pom.xml                |  1 +
 test/enterprise/pom.xml                 |  1 +
 test/hibernate/pom.xml                  |  1 +
 test/jpatest-eclipselink/pom.xml        |  1 +
 test/jpatest-hibernate/pom.xml          |  1 +
 test/jpatest-toplink-essentials/pom.xml |  1 +
 test/pom.xml                            |  3 +-
 test/toplink-essentials/pom.xml         |  1 +
 wicket/components/pom.xml               |  1 +
 wicket/joe/pom.xml                      |  1 +
 wicket/pom.xml                          |  1 +
 24 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/hibernate-jpa/pom.xml b/hibernate-jpa/pom.xml
index 0a4d5da5..cab463cc 100644
--- 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 4c4ed6c1..dcea8040 100644
--- 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 ec289665..59b63ee0 100644
--- 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 33ba9c36..9491b492 100644
--- 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 cdeb8e38..436f7076 100644
--- 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 e69420a1..1ed3c7fb 100644
--- 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 927be2e3..8cd135f9 100644
--- 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 6694d565..4dbdd5d6 100644
--- 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 9a66bfd2..07e5a1e1 100644
--- 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 8f3462fb..4c877804 100644
--- 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 a58927a5..3282c18a 100644
--- 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 c24468e1..78264023 100644
--- 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 f3ba1dba..81ac61df 100644
--- 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 38ac2c7a..22df7f70 100644
--- 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 d5a86d04..0805881e 100644
--- 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 2448e1ed..175312f2 100644
--- 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 2b98de14..3b79134a 100644
--- 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 24ecbde8..06e09d9d 100644
--- 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 da34de14..d61ae877 100644
--- 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 80109b13..b736e588 100644
--- 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 64de62e2..8122aaae 100644
--- 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 9d2c6247..2829647e 100644
--- 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 95b3dc42..c66e90a7 100644
--- 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 26131710..c167ec3c 100644
--- 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>
-- 
2.31.1