From 401a93e51bce3655cd09a352c2159e9898a3b994 Mon Sep 17 00:00:00 2001
From: Brian Topping <topping@codehaus.org>
Date: Tue, 16 Aug 2011 20:54:35 -0400
Subject: [PATCH] Changes to merge wicket-request and wicket-util into
 wicket-core

---
 .gitignore             |  3 +++
 wicket-core/pom.xml    | 20 ++++++++++++++++
 wicket-request/pom.xml | 51 ++++++++++++++++++++++++++--------------
 wicket-util/pom.xml    | 53 +++++++++++++++++++++++++++---------------
 4 files changed, 90 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6121122a4ab..51120ffccdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,7 @@ target
 velocity.log
 .project
 .classpath
+*.ipr
+*.iml
+*.iws
 
diff --git a/wicket-core/pom.xml b/wicket-core/pom.xml
index 93cde917f48..8c0e853deb0 100644
--- a/wicket-core/pom.xml
+++ b/wicket-core/pom.xml
@@ -79,6 +79,26 @@
 					<licenseLocation>${basedir}/../../../common/lib/clover.license</licenseLocation>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>1.4</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+						  <goal>shade</goal>
+						</goals>
+						<configuration>
+							<artifactSet>
+								<includes>
+									<include>org.apache.wicket:*</include>
+								</includes>
+							</artifactSet>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/wicket-request/pom.xml b/wicket-request/pom.xml
index 0207c6de30f..b1881d79d37 100755
--- a/wicket-request/pom.xml
+++ b/wicket-request/pom.xml
@@ -16,22 +16,37 @@
    limitations under the License.
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>wicket-parent</artifactId>
-    <groupId>org.apache.wicket</groupId>
-    <version>1.5-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.wicket</groupId>
-  <artifactId>wicket-request</artifactId>
-  <version>1.5-SNAPSHOT</version>
-  <name>Wicket Request</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.wicket</groupId>
-      <artifactId>wicket-util</artifactId>
-    </dependency>
-  </dependencies>
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>wicket-parent</artifactId>
+		<groupId>org.apache.wicket</groupId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.wicket</groupId>
+	<artifactId>wicket-request</artifactId>
+	<version>1.5-SNAPSHOT</version>
+
+	<name>Wicket Request</name>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-util</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>
diff --git a/wicket-util/pom.xml b/wicket-util/pom.xml
index 2b3ada5d42a..b3afd4490e6 100755
--- a/wicket-util/pom.xml
+++ b/wicket-util/pom.xml
@@ -16,23 +16,38 @@
    limitations under the License.
 -->
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>wicket-parent</artifactId>
-    <groupId>org.apache.wicket</groupId>
-    <version>1.5-SNAPSHOT</version>
-  </parent>
-  <groupId>org.apache.wicket</groupId>
-  <artifactId>wicket-util</artifactId>
-  <version>1.5-SNAPSHOT</version>
-  <name>Wicket Util</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>wicket-parent</artifactId>
+		<groupId>org.apache.wicket</groupId>
+		<version>1.5-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.apache.wicket</groupId>
+	<artifactId>wicket-util</artifactId>
+	<version>1.5-SNAPSHOT</version>
+
+	<name>Wicket Util</name>
+	
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>