From deef66062056b76e0e9e51ca0d12bc26b273e718 Mon Sep 17 00:00:00 2001
From: sk89q <the.sk89q>
Date: Sat, 30 Apr 2011 20:08:14 -0700
Subject: [PATCH] Updated pom.xml with correct versions. Disabled pushing for
 release. Fixed checkout URL in pom.xml. Added local checkout for pom.xml.
 Added assembly:assembly to preparation goal of release. Fixed path issues
 with build. Removed release config.

---
 build.xml                           |  2 +-
 pom.xml                             | 17 ++++++++---------
 src/{ => main}/assembly/default.xml |  0
 src/{ => main}/resources/config.yml |  0
 src/{ => main}/resources/plugin.yml |  0
 5 files changed, 9 insertions(+), 10 deletions(-)
 rename src/{ => main}/assembly/default.xml (100%)
 rename src/{ => main}/resources/config.yml (100%)
 rename src/{ => main}/resources/plugin.yml (100%)

diff --git a/build.xml b/build.xml
index 2d73a9da9..44a2a255a 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,7 @@
     en-masse, de-griefing, and fixing issues.</description>
 
   <property name="src.dir" location="src/main"/>
-  <property name="resources.dir" location="src/resources"/>
+  <property name="resources.dir" location="src/main/resources"/>
   <property name="build.dir" location="build"/>
   <property name="dist.dir" location="dist"/>
   <property name="release.dir" location="release"/>
diff --git a/pom.xml b/pom.xml
index 55fe92d7f..b00425546 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,10 @@
 <!-- Maven build file for WorldEdit Copyright (c) 2011 sk89q <http://www.sk89q.com> 
   WorldEdit is available under the GNU General Public License v3 -->
-<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/xsd/maven-4.0.0.xsd">
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sk89q</groupId>
   <artifactId>worldedit</artifactId>
-  <version>4.4.0-SNAPSHOT</version>
+  <version>4.4.1-SNAPSHOT</version>
   <name>WorldEdit</name>
   <description>WorldEdit allows for editing the Minecraft SMP world
     en-masse, de-griefing, and fixing issues.</description>
@@ -77,19 +76,19 @@
     <!-- Resources -->
     <resources>
       <resource>
-        <targetPath></targetPath>
+        <targetPath>.</targetPath>
         <filtering>true</filtering>
-        <directory>${basedir}</directory>
+        <directory>${basedir}/src/main/resources/</directory>
         <includes>
-          <include>src/resources/plugin.yml</include>
+          <include>plugin.yml</include>
         </includes>
       </resource>
       <resource>
         <targetPath>defaults/</targetPath>
         <filtering>true</filtering>
-        <directory>${basedir}</directory>
+        <directory>${basedir}/src/main/resources/</directory>
         <includes>
-          <include>src/resources/config.yml</include>
+          <include>config.yml</include>
         </includes>
       </resource>
     </resources>
@@ -132,7 +131,7 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-2</version>
         <configuration>
-          <descriptor>${basedir}/src/assembly/default.xml</descriptor>
+          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
         </configuration>
       </plugin>
 
diff --git a/src/assembly/default.xml b/src/main/assembly/default.xml
similarity index 100%
rename from src/assembly/default.xml
rename to src/main/assembly/default.xml
diff --git a/src/resources/config.yml b/src/main/resources/config.yml
similarity index 100%
rename from src/resources/config.yml
rename to src/main/resources/config.yml
diff --git a/src/resources/plugin.yml b/src/main/resources/plugin.yml
similarity index 100%
rename from src/resources/plugin.yml
rename to src/main/resources/plugin.yml