* Upgrade to james-project 1.5
* Cleanup stage
* jvyaml artifact name changed

git-svn-id: https://svn.apache.org/repos/asf/james/jspf/trunk@900794 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 39e3263..5849982 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -48,9 +48,9 @@
   		<artifactId>log4j</artifactId>
   	</dependency>
   	<dependency>
-  		<groupId>org.jvyaml</groupId>
-  		<artifactId>jvyaml</artifactId>
-  	</dependency>
+        <groupId>net.java.dev</groupId>
+        <artifactId>jvyaml</artifactId>
+	</dependency>
   	<dependency>
   		<groupId>commons-cli</groupId>
   		<artifactId>commons-cli</artifactId>
diff --git a/pom.xml b/pom.xml
index 37298d4..c1595bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.james</groupId>
     <artifactId>james-project</artifactId>
-    <version>1.3</version>
+    <version>1.5</version>
   </parent>
   <name>Apache JAMES jSPF</name>
   <version>0.9.8-SNAPSHOT</version>
@@ -167,8 +167,8 @@
 	      <version>1.2.14</version>
 	    </dependency>
 	    <dependency>
-	      <groupId>org.jvyaml</groupId>
-	      <artifactId>jvyaml</artifactId>
+          <groupId>net.java.dev</groupId>
+          <artifactId>jvyaml</artifactId>
 	      <version>0.2.1</version>
 	    </dependency>
 	    <dependency>
diff --git a/stage/commons-cli/jars/commons-cli-1.2.jar b/stage/commons-cli/jars/commons-cli-1.2.jar
deleted file mode 100644
index ce4b9ff..0000000
--- a/stage/commons-cli/jars/commons-cli-1.2.jar
+++ /dev/null
Binary files differ
diff --git a/stage/commons-cli/poms/commons-cli-1.2.pom b/stage/commons-cli/poms/commons-cli-1.2.pom
deleted file mode 100644
index 21e6d30..0000000
--- a/stage/commons-cli/poms/commons-cli-1.2.pom
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<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">
-  <parent>
-    <groupId>org.apache.commons</groupId>
-    <artifactId>commons-parent</artifactId>
-    <version>11</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>commons-cli</groupId>
-  <artifactId>commons-cli</artifactId>
-  <version>1.2</version>
-  <name>Commons CLI</name>
-
-  <inceptionYear>2002</inceptionYear>
-  <description>
-    Commons CLI provides a simple API for presenting, processing and validating a command line interface.
-  </description>
-
-  <url>http://commons.apache.org/cli/</url>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/CLI</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/cli/branches/cli-1.x/</developerConnection>
-    <url>http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/</url>
-  </scm>
-
-  <developers>
-    <developer>
-      <name>James Strachan</name>
-      <id>jstrachan</id>
-      <email>jstrachan@apache.org</email>
-      <organization>SpiritSoft, Inc.</organization>
-    </developer>
-    <developer>
-      <name>Bob McWhirter</name>
-      <id>bob</id>
-      <email>bob@werken.com</email>
-      <organization>Werken</organization>
-      <roles>
-        <role>contributed ideas and code from werken.opt</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>John Keyes</name>
-      <id>jkeyes</id>
-      <email>jbjk@mac.com</email>
-      <organization>integral Source</organization>
-      <roles>
-        <role>contributed ideas and code from Optz</role>
-      </roles>
-    </developer>
-    <developer>
-      <name>Rob Oxspring</name>
-      <id>roxspring</id>
-      <email>roxspring@imapmail.org</email>
-      <organization>Indigo Stone</organization>
-      <roles>
-        <role>designed CLI2</role>
-      </roles>
-    </developer>
-  </developers>
-
-  <contributors>
-    <contributor>
-      <name>Peter Donald</name>
-      <roles>
-        <role>contributed ideas and code from Avalon Excalibur's cli package</role>
-      </roles>
-    </contributor>
-    <contributor>
-      <name>Brian Egge</name>
-      <roles>
-        <role>made the 1.1 release happen</role>
-      </roles>
-    </contributor>
-    <contributor>
-      <name>Berin Loritsch</name>
-      <email>bloritsch@apache.org</email>
-      <roles>
-        <role>helped in the Avalon CLI merge</role>
-      </roles>
-    </contributor>
-    <contributor>
-      <name>Peter Maddocks</name>
-      <email>peter_maddocks@hp.com</email>
-      <organization>Hewlett-Packard</organization>
-      <roles>
-        <role>supplied patch</role>
-      </roles>
-    </contributor>
-    <contributor>
-      <name>Andrew Shirley</name>
-      <roles>
-        <role>lots of fixes for 1.1</role>
-      </roles>
-    </contributor>
-  </contributors>
-
-  <dependencies>
-    <!-- used for unit tests -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <properties>
-    <maven.compile.source>1.4</maven.compile.source>
-    <maven.compile.target>1.4</maven.compile.target>
-    <commons.componentid>cli</commons.componentid>
-    <commons.release.version>1.2</commons.release.version>
-    <commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
-    <commons.osgi.symbolicName>org.apache.commons.cli</commons.osgi.symbolicName>
-    <commons.binary.suffix />
-    <commons.jira.id>CLI</commons.jira.id>
-    <commons.jira.pid>12310463</commons.jira.pid>
-    <!-- The RC version used in the staging repository URL. -->
-    <commons.rc.version>RC7</commons.rc.version>    
-  </properties>
-
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    <resources>
-      <resource>
-        <directory>.</directory>
-        <targetPath>META-INF</targetPath>
-        <includes>
-          <include>NOTICE.txt</include>
-          <include>LICENSE.txt</include>
-        </includes>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/assembly/bin.xml</descriptor>
-            <descriptor>src/assembly/src.xml</descriptor>
-          </descriptors>
-          <tarLongFileMode>gnu</tarLongFileMode>
-        </configuration>
-      </plugin>
-      <!--
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-ant-plugin</artifactId>
-        <version>2.1.1-SNAPSHOT</version>
-      </plugin>
-      -->
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>1.2</version>
-        <configuration>
-          <threshold>Normal</threshold>
-          <effort>Default</effort>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>src/conf/checkstyle.xml</configLocation>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <comparisonVersion>1.1</comparisonVersion>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-
-  <profiles>
-    <!-- Profile to let Gump choose the name of the jar file generated -->
-    <profile>
-      <id>gump</id>
-      <activation>
-        <property>
-          <name>maven.final.name</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-jar-plugin</artifactId>
-            <configuration>
-              <finalName>${maven.final.name}</finalName>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>rc</id>
-      <distributionManagement>
-        <!-- Cannot define in parent ATM, see COMMONSSITE-26 -->
-        <site>
-          <id>apache.website</id>
-          <name>Apache Commons Release Candidate Staging Site</name>
-          <url>${commons.deployment.protocol}://people.apache.org/www/people.apache.org/builds/commons/${commons.componentid}/${commons.release.version}/${commons.rc.version}/site</url>
-        </site>
-      </distributionManagement>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/stage/junit/jars/junit-3.8.1.jar b/stage/junit/jars/junit-3.8.1.jar
deleted file mode 100644
index 674d71e..0000000
--- a/stage/junit/jars/junit-3.8.1.jar
+++ /dev/null
Binary files differ
diff --git a/stage/junit/poms/junit-3.8.1.pom b/stage/junit/poms/junit-3.8.1.pom
deleted file mode 100644
index c724642..0000000
--- a/stage/junit/poms/junit-3.8.1.pom
+++ /dev/null
@@ -1,33 +0,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">
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
-  -->
-  <modelVersion>4.0.0</modelVersion>

-  <groupId>junit</groupId>
-  <artifactId>junit</artifactId>
-  <name>JUnit</name>

-  <version>3.8.1</version>

-  <packaging>jar</packaging>

-  <url>http://www.junit.org</url>

-  <licenses>
-    <license>
-      <name>CPL v1.0</name>
-      <url>http://junit.sourceforge.net/cpl-v10.html</url>
-    </license>
-  </licenses>
-</project>
\ No newline at end of file
diff --git a/stage/log4j/jars/log4j-1.2.14.jar b/stage/log4j/jars/log4j-1.2.14.jar
deleted file mode 100644
index 6251307..0000000
--- a/stage/log4j/jars/log4j-1.2.14.jar
+++ /dev/null
Binary files differ
diff --git a/stage/log4j/poms/log4j-1.2.14.pom b/stage/log4j/poms/log4j-1.2.14.pom
deleted file mode 100644
index a5c9622..0000000
--- a/stage/log4j/poms/log4j-1.2.14.pom
+++ /dev/null
Binary files differ
diff --git a/stage/org.apache.james/poms/james-parent-1.1.pom b/stage/org.apache.james/poms/james-parent-1.1.pom
deleted file mode 100644
index 14b8dea..0000000
--- a/stage/org.apache.james/poms/james-parent-1.1.pom
+++ /dev/null
@@ -1,385 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
-  -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.james</groupId>
-  <artifactId>james-parent</artifactId>
-  <name>Apache JAMES Parent POM</name>
-  <version>1.1</version>
-  <description>
-    The Apache JAMES Parent POM
-  </description>
-
-  <prerequisites>
-    <maven>2.0.6</maven>
-  </prerequisites>
-  
-  <modules>
-    <module>maven-skin</module>
-    <module>project</module>
-  </modules>
-
-  <url>http://james.apache.org/</url>
-  <inceptionYear>2006</inceptionYear>
-  <packaging>pom</packaging>
-
-  <dependencies>
-  </dependencies>
-
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/JAMES</url>
-  </issueManagement>
-
-  <developers>
-    <developer>
-      <id>bago</id>
-      <name>Stefano Bagnara</name>
-      <email>bago at apache.org</email>
-      <timezone>2</timezone>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>norman</id>
-      <name>Norman Maurer</name>
-      <email>norman at apache.org</email>
-      <timezone>2</timezone>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>serge</id>
-      <name>Serge Knystautas</name>
-      <email>sergek at lokitech.com</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>benrdf</id>
-      <name>Bernd Fondermann</name>
-      <email>bf_jak at brainlounge.de</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>sbrewin</id>
-      <name>Steve Brewin</name>
-      <email>sbrewin at synsys.com</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>hilmer</id>
-      <!-- This is not correctly handled by maven release plugin -->
-      <!-- <name>S&#248;ren Hilmer</name> -->
-      <name>Soren Hilmer</name>
-      <email>sh at widetrail.dk</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>noel</id>
-      <name>Noel J. Bergman</name>
-      <email>noel at devtech.com</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>danny</id>
-      <name>Danny Angus</name>
-      <email>danny at apache.org</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>adc</id>
-      <name>Alan D. Cabrera</name>
-      <email>list at toolazydogs.com</email>
-      <timezone>-8</timezone>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>vincenzo</id>
-      <name>Vincenzo Gianferrari Pini</name>
-      <email>vincenzo.gianferraripini at praxis.it</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email>rdonkin at apache.org</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>niklas</id>
-      <name>Niklas Therning</name>
-      <email>niklas(at)apache(dot)org</email>
-      <organization>Trillian AB</organization>
-    </developer>
-    <developer>
-      <id>jcheng</id>
-      <name>Joe Cheng</name>
-      <email>joe(at)joecheng(dot)com</email>
-      <properties>
-        <description>
-          Former author to the mime4j product
-        </description>
-      </properties>
-    </developer>
-  </developers>
-
-  <contributors>
-    <contributor>
-      <name>Rob Oxspring</name>
-      <properties>
-        <description>
-          Contributed to the mime4j product
-        </description>
-      </properties>
-    </contributor>
-    <contributor>
-      <name>Roger Fullerton</name>
-      <properties>
-        <description>
-          Wrote spfjava, the first spf implementation in java
-        </description>
-      </properties>
-    </contributor>
-  </contributors>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/tags/james-parent-1.1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/tags/james-parent-1.1</developerConnection>
-    <url>http://svn.apache.org/viewvc/james/project/tags/james-parent-1.1</url>
-  </scm>
-
-  <distributionManagement>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-    </snapshotRepository>
-    <!-- Each project must override this with their own -->
-    <site>
-      <id>james-parent-website</id>
-      <url>scp://minotaur.apache.org/www/james.apache.org/parent/</url>
-    </site>
-  </distributionManagement>
-
-  <repositories>
-    <repository>
-      <id>central</id>
-      <url>http://repo1.maven.org/maven2</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Main M2 Repository</name>
-      <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  
-  <profiles>
-    <!-- parent profile: used to find skin dependency in stage -->
-    <profile>
-      <id>parent</id>
-      <repositories>
-        <repository>
-          <id>local-james-parent-stage</id>
-          <name>Apache JAMES parent stage repository folder</name>
-          <url>file://${basedir}/stage</url>
-          <layout>legacy</layout>
-          <releases>
-            <enabled>true</enabled>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <checksumPolicy>ignore</checksumPolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <!-- local profile: used to ignore remote repositories in a local build -->
-    <profile>
-      <id>local</id>
-      <repositories>
-        <repository>
-          <id>central</id>
-          <url>http://repo1.maven.org/maven2</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <repository>
-          <id>apache.releases</id>
-          <name>Apache Main M2 Repository</name>
-          <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Snapshot Repository</name>
-          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <!-- START SNIPPET: release-profile -->
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.0-alpha-3</version>
-            <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
-            </configuration>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- We want to deploy the artifact to a staging location for perusal -->
-          <plugin>
-            <inherited>true</inherited>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-              <updateReleaseInfo>true</updateReleaseInfo>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.0.2</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.2</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- END SNIPPET: release-profile -->
-  </profiles>  
-
-</project>
\ No newline at end of file
diff --git a/stage/org.apache.james/poms/james-parent-1.2-SNAPSHOT.pom b/stage/org.apache.james/poms/james-parent-1.2-SNAPSHOT.pom
deleted file mode 100644
index 4609326..0000000
--- a/stage/org.apache.james/poms/james-parent-1.2-SNAPSHOT.pom
+++ /dev/null
@@ -1,396 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
-  -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.james</groupId>
-  <artifactId>james-parent</artifactId>
-  <name>Apache JAMES Parent POM</name>
-  <version>1.2-SNAPSHOT</version>
-  <description>
-    The Apache JAMES Parent POM
-  </description>
-
-  <prerequisites>
-    <maven>2.0.6</maven>
-  </prerequisites>
-  
-  <modules>
-    <module>maven-skin</module>
-    <module>project</module>
-  </modules>
-
-  <url>http://james.apache.org/</url>
-  <inceptionYear>2006</inceptionYear>
-  <packaging>pom</packaging>
-
-  <dependencies>
-  </dependencies>
-
-  <organization>
-    <name>The Apache Software Foundation</name>
-    <url>http://www.apache.org</url>
-  </organization>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>2.0-beta-5</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-
-  <licenses>
-    <license>
-      <name>Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/JAMES</url>
-  </issueManagement>
-
-  <developers>
-    <developer>
-      <id>bago</id>
-      <name>Stefano Bagnara</name>
-      <email>bago at apache.org</email>
-      <timezone>2</timezone>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>norman</id>
-      <name>Norman Maurer</name>
-      <email>norman at apache.org</email>
-      <timezone>2</timezone>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>serge</id>
-      <name>Serge Knystautas</name>
-      <email>sergek at lokitech.com</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>benrdf</id>
-      <name>Bernd Fondermann</name>
-      <email>bf_jak at brainlounge.de</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>sbrewin</id>
-      <name>Steve Brewin</name>
-      <email>sbrewin at synsys.com</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>hilmer</id>
-      <!-- This is not correctly handled by maven release plugin -->
-      <!-- <name>S&#248;ren Hilmer</name> -->
-      <name>Soren Hilmer</name>
-      <email>sh at widetrail.dk</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>noel</id>
-      <name>Noel J. Bergman</name>
-      <email>noel at devtech.com</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>danny</id>
-      <name>Danny Angus</name>
-      <email>danny at apache.org</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>adc</id>
-      <name>Alan D. Cabrera</name>
-      <email>list at toolazydogs.com</email>
-      <timezone>-8</timezone>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>vincenzo</id>
-      <name>Vincenzo Gianferrari Pini</name>
-      <email>vincenzo.gianferraripini at praxis.it</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>rdonkin</id>
-      <name>Robert Burrell Donkin</name>
-      <email>rdonkin at apache.org</email>
-      <timezone />
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>niklas</id>
-      <name>Niklas Therning</name>
-      <email>niklas(at)apache(dot)org</email>
-      <organization>Trillian AB</organization>
-    </developer>
-    <developer>
-      <id>jcheng</id>
-      <name>Joe Cheng</name>
-      <email>joe(at)joecheng(dot)com</email>
-      <properties>
-        <description>
-          Former author to the mime4j product
-        </description>
-      </properties>
-    </developer>
-  </developers>
-
-  <contributors>
-    <contributor>
-      <name>Rob Oxspring</name>
-      <properties>
-        <description>
-          Contributed to the mime4j product
-        </description>
-      </properties>
-    </contributor>
-    <contributor>
-      <name>Roger Fullerton</name>
-      <properties>
-        <description>
-          Wrote spfjava, the first spf implementation in java
-        </description>
-      </properties>
-    </contributor>
-  </contributors>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/james/project/trunk</url>
-  </scm>
-
-  <distributionManagement>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>scp://people.apache.org/www/people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
-    </snapshotRepository>
-    <!-- Each project must override this with their own -->
-    <site>
-      <id>james-parent-website</id>
-      <url>scp://people.apache.org/www/james.apache.org/parent/</url>
-    </site>
-  </distributionManagement>
-
-  <repositories>
-    <repository>
-      <id>central</id>
-      <url>http://repo1.maven.org/maven2</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Main M2 Repository</name>
-      <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-  
-  <profiles>
-    <!-- parent profile: used to find skin dependency in stage -->
-    <profile>
-      <id>parent</id>
-      <repositories>
-        <repository>
-          <id>local-james-parent-stage</id>
-          <name>Apache JAMES parent stage repository folder</name>
-          <url>file://${basedir}/stage</url>
-          <layout>legacy</layout>
-          <releases>
-            <enabled>true</enabled>
-            <checksumPolicy>ignore</checksumPolicy>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-            <checksumPolicy>ignore</checksumPolicy>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <!-- local profile: used to ignore remote repositories in a local build -->
-    <profile>
-      <id>local</id>
-      <repositories>
-        <repository>
-          <id>central</id>
-          <url>http://repo1.maven.org/maven2</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <repository>
-          <id>apache.releases</id>
-          <name>Apache Main M2 Repository</name>
-          <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-        <repository>
-          <id>apache.snapshots</id>
-          <name>Apache Snapshot Repository</name>
-          <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-          <releases>
-            <enabled>false</enabled>
-          </releases>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-    </profile>
-    <!-- START SNIPPET: release-profile -->
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-          <!-- We want to sign the artifact, the POM, and all attached artifacts -->
-          <plugin>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.0-alpha-3</version>
-            <configuration>
-              <passphrase>${gpg.passphrase}</passphrase>
-            </configuration>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <!-- We want to deploy the artifact to a staging location for perusal -->
-          <plugin>
-            <inherited>true</inherited>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
-              <updateReleaseInfo>true</updateReleaseInfo>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.0.2</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.2</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <!-- END SNIPPET: release-profile -->
-  </profiles>  
-
-</project>
diff --git a/stage/org.apache.james/poms/james-project-1.2.pom b/stage/org.apache.james/poms/james-project-1.2.pom
deleted file mode 100644
index 4b2e41d..0000000
--- a/stage/org.apache.james/poms/james-project-1.2.pom
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
-  -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.james</groupId>
-  <artifactId>james-project</artifactId>
-  <name>Apache JAMES Project</name>
-  <version>1.2</version>
-  <description>
-    The Apache JAMES Project
-  </description>
-  
-  <parent>
-    <groupId>org.apache.james</groupId>
-    <artifactId>james-parent</artifactId>
-    <version>1.1</version>
-  </parent>
-
-  <modules>
-    <module>server</module>
-  </modules>
-  
-  <url>http://james.apache.org/</url>
-  <inceptionYear>2006</inceptionYear>
-  <packaging>pom</packaging>
-
-  <dependencies>
-  </dependencies>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/JAMES</url>
-  </issueManagement>
-
-  <distributionManagement>
-    <!-- Each project must override this with their own -->
-    <site>
-      <id>james-website</id>
-      <url>scp://minotaur.apache.org/www/james.apache.org/</url>
-    </site>
-  </distributionManagement>
-
-  <mailingLists>
-    <mailingList>
-      <name>Apache James Website Developement</name>
-      <subscribe>site-dev-subscribe@james.apache.org</subscribe>
-      <unsubscribe>site-dev-unsubscribe@james.apache.org</unsubscribe>
-      <post>site-dev@james.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/james-site-dev/</archive>
-    </mailingList>
-  </mailingLists>
-  
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/project/tags/james-project-1.2</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/project/tags/james-project-1.2</developerConnection>
-    <url>http://svn.apache.org/viewvc/james/project/tags/james-project-1.2</url>
-  </scm>
-</project>
\ No newline at end of file
diff --git a/stage/org.apache.james/poms/james-project-1.3-SNAPSHOT.pom b/stage/org.apache.james/poms/james-project-1.3-SNAPSHOT.pom
deleted file mode 100644
index dbaffe1..0000000
--- a/stage/org.apache.james/poms/james-project-1.3-SNAPSHOT.pom
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
-  -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.james</groupId>
-  <artifactId>james-project</artifactId>
-  <name>Apache JAMES Project</name>
-  <version>1.3-SNAPSHOT</version>
-  <description>
-    The Apache JAMES Project
-  </description>
-  
-  <parent>
-    <groupId>org.apache.james</groupId>
-    <artifactId>james-parent</artifactId>
-    <version>1.2-SNAPSHOT</version>
-  </parent>
-
-  <modules>
-    <module>server</module>
-  </modules>
-  
-  <url>http://james.apache.org/</url>
-  <inceptionYear>2006</inceptionYear>
-  <packaging>pom</packaging>
-
-  <dependencies>
-  </dependencies>
-
-  <issueManagement>
-    <system>JIRA</system>
-    <url>http://issues.apache.org/jira/browse/JAMES</url>
-  </issueManagement>
-
-  <distributionManagement>
-    <!-- Each project must override this with their own -->
-    <site>
-      <id>james-website</id>
-      <url>scp://people.apache.org/www/james.apache.org/</url>
-    </site>
-  </distributionManagement>
-
-  <mailingLists>
-    <mailingList>
-      <name>Apache James Website Developement</name>
-      <subscribe>site-dev-subscribe@james.apache.org</subscribe>
-      <unsubscribe>site-dev-unsubscribe@james.apache.org</unsubscribe>
-      <post>site-dev@james.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/james-site-dev/</archive>
-    </mailingList>
-  </mailingLists>
-</project>
diff --git a/stage/org.apache.james/xmls/james-parent-1.1-site.xml b/stage/org.apache.james/xmls/james-parent-1.1-site.xml
deleted file mode 100644
index 95601af..0000000
--- a/stage/org.apache.james/xmls/james-parent-1.1-site.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><project name="James Parent POM">
-  <bannerLeft>
-    <name>James Project</name>
-    <src>images/james-project-logo.gif</src>
-    <href>http://james.apache.org/index.html</href>
-  </bannerLeft>
-  <bannerRight>
-    <name>The Apache Software Foundation</name>
-    <src>images/asf-logo-reduced.gif</src>
-    <href>http://www.apache.org/index.html</href>
-  </bannerRight>
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-default-skin</artifactId>
-    <version>1.0</version>
-  </skin>
-  <body />
-</project>
\ No newline at end of file
diff --git a/stage/org.apache.james/xmls/james-parent-1.1-site_en.xml b/stage/org.apache.james/xmls/james-parent-1.1-site_en.xml
deleted file mode 100644
index e69de29..0000000
--- a/stage/org.apache.james/xmls/james-parent-1.1-site_en.xml
+++ /dev/null
diff --git a/stage/org.apache.james/xmls/james-parent-1.2-SNAPSHOT-site.xml b/stage/org.apache.james/xmls/james-parent-1.2-SNAPSHOT-site.xml
deleted file mode 100644
index a906b01..0000000
--- a/stage/org.apache.james/xmls/james-parent-1.2-SNAPSHOT-site.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><project name="James Parent POM">
-  <bannerLeft>
-    <name>James Parent</name>
-    <src>images/james-project-logo.gif</src>
-    <href>http://james.apache.org/index.html</href>
-  </bannerLeft>
-  <bannerRight>
-    <name>The Apache Software Foundation</name>
-    <src>images/asf-logo-reduced.gif</src>
-    <href>http://www.apache.org/index.html</href>
-  </bannerRight>
-  <skin>
-    <groupId>org.apache.maven.skins</groupId>
-    <artifactId>maven-default-skin</artifactId>
-    <version>1.0</version>
-  </skin>
-  <body />
-</project>
\ No newline at end of file
diff --git a/stage/org.apache.james/xmls/james-project-1.2-site.xml b/stage/org.apache.james/xmls/james-project-1.2-site.xml
deleted file mode 100644
index 2d94949..0000000
--- a/stage/org.apache.james/xmls/james-project-1.2-site.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><project name="James Project">
-  <bannerLeft>
-    <name>James Project</name>
-    <src>images/james-project-logo.gif</src>
-    <href>http://james.apache.org/index.html</href>
-  </bannerLeft>
-  <bannerRight>
-    <name>The Apache Software Foundation</name>
-    <src>images/asf-logo-reduced.gif</src>
-    <href>http://www.apache.org/index.html</href>
-  </bannerRight>
-  <skin>
-    <groupId>org.apache.james</groupId>
-    <artifactId>maven-skin</artifactId>
-    <version>1.1</version>
-  </skin>
-  <body>
-    <links>
-      <item name="JAMES Project" href="/index.html" />
-      <item name="Server" href="/server/index.html" />
-      <item name="Mailet API" href="/mailet/index.html" />
-      <item name="jSPF" href="/jspf/index.html" />
-      <item name="Mime4J" href="/mime4j/index.html" />
-      <item name="JSieve" href="/jsieve/index.html" />
-      <item name="Postage" href="/postage/index.html" />
-    </links>
-    <menu name="Sub Projects">
-      <item name="Server" href="/server/index.html" />
-      <item name="Mailet API" href="/mailet/index.html" />
-      <item name="jSPF" href="/jspf/index.html" />
-      <item name="Mime4J" href="/mime4j/index.html" />
-      <item name="JSieve" href="/jsieve/index.html" />
-      <item name="Postage" href="/postage/index.html" />
-    </menu>
-    <menu name="About">
-      <item name="News" href="/newsarchive.html" />
-      <item name="Overview" href="/index.html" />
-      <item name="Mailing Lists" href="/mail.html" />
-      <item name="Project Guidelines" href="/guidelines.html" />
-      <item name="Wiki" href="http://wiki.apache.org/james" />
-      <item name="Who We Are" href="/weare.html" />
-      <item name="Contributing" href="/contribute.html" />
-      <item name="Standards" href="/code-standards.html" />
-      <item name="License" href="/license.html" />
-    </menu>
-    <menu name="Downloads" inherit="bottom">
-      <item name="Stable releases" href="/download.cgi" />
-      <item name="Unstable releases" href="/downloadunstable.cgi" />
-      <item name="Nightly builds" href="http://people.apache.org/builds/james/nightly/" />
-    </menu>
-    <menu name="Translated">
-      <item name="Japanese (web)" href="http://james.terra-intl.com/" />
-    </menu>
-    <menu name="Related Projects">
-      <item name="Jakarta Commons" href="http://jakarta.apache.org/commons/index.html" />
-      <item name="Ant" href="http://ant.apache.org/index.html" />
-      <item name="Maven2" href="http://maven.apache.org/index.html" />
-      <item name="Derby" href="http://db.apache.org/derby/index.html" />
-      <item name="Avalon" href="http://avalon.apache.org/index.html" />
-      <item name="DNSJava" href="http://www.dnsjava.org/index.html" />
-    </menu>
-    <menu name="Useful Information">
-      <item name="Get Involved" href="http://jakarta.apache.org/site/getinvolved.html" />
-      <item name="Reference Library" href="http://jakarta.apache.org/site/library.html" />
-      <item name="Apache" href="http://apache.org/foundation/faq.html" />
-    </menu>
-  </body>
-</project>
\ No newline at end of file
diff --git a/stage/org.apache.james/xmls/james-project-1.2-site_en.xml b/stage/org.apache.james/xmls/james-project-1.2-site_en.xml
deleted file mode 100644
index e69de29..0000000
--- a/stage/org.apache.james/xmls/james-project-1.2-site_en.xml
+++ /dev/null
diff --git a/stage/org.apache.james/xmls/james-project-1.3-SNAPSHOT-site.xml b/stage/org.apache.james/xmls/james-project-1.3-SNAPSHOT-site.xml
deleted file mode 100644
index 9d51fbc..0000000
--- a/stage/org.apache.james/xmls/james-project-1.3-SNAPSHOT-site.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><project name="James Project">
-  <bannerLeft>
-    <name>James Project</name>
-    <src>http://james.apache.org/images/james-project-logo.gif</src>
-    <href>http://james.apache.org/index.html</href>
-  </bannerLeft>
-  <bannerRight>
-    <name>The Apache Software Foundation</name>
-    <src>http://james.apache.org/images/asf-logo-reduced.gif</src>
-    <href>http://www.apache.org/index.html</href>
-  </bannerRight>
-  <skin>
-    <groupId>org.apache.james</groupId>
-    <artifactId>maven-skin</artifactId>
-    <version>1.1</version>
-  </skin>
-  <body>
-    <links>
-      <item name="JAMES Project" href="http://james.apache.org/index.html" />
-      <item name="Server" href="http://james.apache.org/server/index.html" />
-      <item name="Mailets" href="http://james.apache.org/mailet/index.html" />
-      <item name="jSPF" href="http://james.apache.org/jspf/index.html" />
-      <item name="Mime4J" href="http://james.apache.org/mime4j/index.html" />
-      <item name="JSieve" href="http://james.apache.org/jsieve/index.html" />
-      <item name="Postage" href="http://james.apache.org/postage/index.html" />
-    </links>
-    <menu name="Sub Projects">
-      <item name="Server" href="http://james.apache.org/server/index.html" />
-      <item name="Mailets" href="http://james.apache.org/mailet/index.html" />
-      <item name="jSPF" href="http://james.apache.org/jspf/index.html" />
-      <item name="Mime4J" href="http://james.apache.org/mime4j/index.html" />
-      <item name="JSieve" href="http://james.apache.org/jsieve/index.html" />
-      <item name="Postage" href="http://james.apache.org/postage/index.html" />
-    </menu>
-    <menu name="About">
-      <item name="News" href="http://james.apache.org/newsarchive.html" />
-      <item name="Overview" href="http://james.apache.org/index.html" />
-      <item name="Mailing Lists" href="http://james.apache.org/mail.html" />
-      <item name="Project Guidelines" href="http://james.apache.org/guidelines.html" />
-      <item name="Wiki" href="http://wiki.apache.org/james" />
-      <item name="Who We Are" href="http://james.apache.org/weare.html" />
-      <item name="Contributing" href="http://james.apache.org/contribute.html" />
-      <item name="Standards" href="http://james.apache.org/code-standards.html" />
-      <item name="License" href="http://james.apache.org/license.html" />
-    </menu>
-    <menu name="Downloads" inherit="bottom">
-      <item name="Stable releases" href="http://james.apache.org/download.cgi" />
-      <item name="Unstable releases" href="http://james.apache.org/downloadunstable.cgi" />
-      <item name="Nightly builds" href="http://people.apache.org/builds/james/nightly/" />
-    </menu>
-    <menu name="Translated">
-      <item name="Japanese (web)" href="http://james.terra-intl.com/" />
-    </menu>
-    <menu name="Related Projects">
-      <item name="Jakarta Commons" href="http://jakarta.apache.org/commons/index.html" />
-      <item name="Ant" href="http://ant.apache.org/index.html" />
-      <item name="Maven2" href="http://maven.apache.org/index.html" />
-      <item name="Derby" href="http://db.apache.org/derby/index.html" />
-      <item name="Avalon" href="http://avalon.apache.org/index.html" />
-      <item name="DNSJava" href="http://www.dnsjava.org/index.html" />
-    </menu>
-    <menu name="Useful Information">
-      <item name="Get Involved" href="http://jakarta.apache.org/site/getinvolved.html" />
-      <item name="Reference Library" href="http://jakarta.apache.org/site/library.html" />
-    </menu>
-    <menu name="Foundation">
-      <item name="FAQ" href="http://apache.org/foundation/faq.html" />
-      <item name="Sponsorship" href="http://apache.org/foundation/sponsorship.html" />
-      <item name="Donations" href="http://apache.org/foundation/contributing.html" />
-      <item name="Thanks" href="http://apache.org/foundation/thanks.html" />
-    </menu>
-  </body>
-</project>
\ No newline at end of file
diff --git a/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar b/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar
deleted file mode 100644
index 48697b5..0000000
--- a/stage/org.apache.maven.skins/jars/maven-default-skin-1.0.jar
+++ /dev/null
Binary files differ
diff --git a/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom b/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom
deleted file mode 100644
index 54e367a..0000000
--- a/stage/org.apache.maven.skins/poms/maven-default-skin-1.0.pom
+++ /dev/null
@@ -1,324 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
-  <parent>
-    <artifactId>maven-skins</artifactId>
-    <groupId>org.apache.maven.skins</groupId>
-    <version>2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven.skins</groupId>
-  <artifactId>maven-default-skin</artifactId>
-  <name>Maven Default Skin</name>
-  <version>1.0</version>
-  <description>Maven Default Skin</description>
-  <url>http://maven.apache.org/skins/maven-default-skin</url>
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/MNG</url>
-  </issueManagement>
-  <ciManagement>
-    <system>continuum</system>
-    <url>http://maven.zones.apache.org:8080/continuum</url>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>notifications@maven.apache.org</address>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2002</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Maven Announcements List</name>
-      <subscribe>announce-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>announce-unsubscribe@maven.apache.org</unsubscribe>
-      <post>announce@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Maven Issues List</name>
-      <subscribe>issues-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>issues-unsubscribe@maven.apache.org</unsubscribe>
-      <post>issues@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
-    </mailingList>
-    <mailingList>
-      <name>Maven Notifications List</name>
-      <subscribe>notifications-subscribe@maven.apache.org</subscribe>
-      <unsubscribe>notifications-unsubscribe@maven.apache.org</unsubscribe>
-      <post>notifications@maven.apache.org</post>
-      <archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>jvanzyl</id>
-      <name>Jason van Zyl</name>
-      <email>jason@maven.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Chair</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>brett</id>
-      <name>Brett Porter</name>
-      <email>brett@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+10</timezone>
-    </developer>
-    <developer>
-      <id>evenisse</id>
-      <name>Emmanuel Venisse</name>
-      <email>evenisse@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>kenney</id>
-      <name>Kenney Westerhof</name>
-      <email>kenney@apache.org</email>
-      <organization>Neonics</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>snicoll</id>
-      <name>Stephane Nicoll</name>
-      <email>snicoll@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>vmassol</id>
-      <name>Vincent Massol</name>
-      <email>vmassol@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>fgiust</id>
-      <name>Fabrizio Giustina</name>
-      <email>fgiust@apache.org</email>
-      <organization>openmind</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>epunzalan</id>
-      <name>Edwin Punzalan</name>
-      <email>epunzalan@mergere.com</email>
-      <organization>Mergere</organization>
-      <roles>
-        <role>Committer</role>
-      </roles>
-      <timezone>+8</timezone>
-    </developer>
-    <developer>
-      <id>mperham</id>
-      <name>Mike Perham</name>
-      <email>mperham@gmail.com</email>
-      <organization>Webify Solutions</organization>
-      <roles>
-        <role>Committer</role>
-      </roles>
-      <timezone>-6</timezone>
-    </developer>
-    <developer>
-      <id>jdcasey</id>
-      <name>John Casey</name>
-      <email>jdcasey@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-    <developer>
-      <id>trygvis</id>
-      <name>Trygve Laugstol</name>
-      <email>trygvis@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>PMC Member</role>
-      </roles>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>vsiveton</id>
-      <name>Vincent Siveton</name>
-      <email>vsiveton@apache.org</email>
-      <organization>ASF</organization>
-      <roles>
-        <role>Committer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-  </developers>
-  <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>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/maven-default-skin</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/maven-default-skin</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/skins/trunk/maven-default-skin</url>
-  </scm>
-  <organization>
-    <name>Apache Software Foundation</name>
-    <url>http://www.apache.org/</url>
-  </organization>
-  <build>
-    <sourceDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\main\java</sourceDirectory>
-    <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
-    <testSourceDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\test\java</testSourceDirectory>
-    <outputDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target\classes</outputDirectory>
-    <testOutputDirectory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target\test-classes</testOutputDirectory>
-    <resources>
-      <resource>
-        <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\main\resources</directory>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\src\test\resources</directory>
-      </testResource>
-    </testResources>
-    <directory>c:\home\brett\scm\maven\skins\maven-default-skin\target\checkout\target</directory>
-    <finalName>maven-default-skin-1.0</finalName>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/maven/skins/tags</tagBase>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.2</version>
-        <inherited>true</inherited>
-        <configuration>
-          <updateReleaseInfo>true</updateReleaseInfo>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.0-beta-3</version>
-        <executions>
-          <execution>
-            <id>attach-javadocs</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.0.1</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.1</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.2-SNAPSHOT</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.0</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.1</version>
-      </plugin>
-    </plugins>
-  </build>
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://svn.apache.org/maven-snapshot-repository</url>
-    </repository>
-    <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>Maven Repository Switchboard</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <releases>
-        <updatePolicy>never</updatePolicy>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>Maven Plugin Repository</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <reporting>
-    <outputDirectory>target/site</outputDirectory>
-  </reporting>
-  <distributionManagement>
-    <repository>
-      <id>apache.releases</id>
-      <name>Apache Release Distribution Repository</name>
-      <url>scp://minotaur.apache.org/www/www.apache.org/dist/maven-repository</url>
-    </repository>
-    <snapshotRepository>
-      <id>apache.snapshots</id>
-      <name>Apache Development Snapshot Repository</name>
-      <url>scp://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
-    </snapshotRepository>
-    <site>
-      <id>website</id>
-      <url>scp://minotaur.apache.org/www/maven.apache.org/skins/maven-default-skin</url>
-    </site>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/stage/org.apache.maven.skins/poms/maven-skins-2.pom b/stage/org.apache.maven.skins/poms/maven-skins-2.pom
deleted file mode 100644
index ce0f28d..0000000
--- a/stage/org.apache.maven.skins/poms/maven-skins-2.pom
+++ /dev/null
@@ -1,51 +0,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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>maven-parent</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>1</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
-  </parent>
-  <groupId>org.apache.maven.skins</groupId>
-  <artifactId>maven-skins</artifactId>
-  <packaging>pom</packaging>
-  <version>2</version>
-  <name>Maven Skins</name>
-  <description>Maven Skins</description>
-  <url>http://maven.apache.org/skins/</url>
-  <!-- TODO: create a new JIRA project/component -->
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/MNG</url>
-  </issueManagement>
-  <distributionManagement>
-    <site>
-      <id>website</id>
-      <url>scp://minotaur.apache.org/www/maven.apache.org/skins/</url>
-    </site>
-  </distributionManagement>
-  <modules>
-    <module>maven-default-skin</module>
-    <module>maven-classic-skin</module>
-    <module>maven-stylus-skin</module>
-  </modules>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/skins/trunk/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/skins/trunk/</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/maven/skins/trunk/</url>
-  </scm>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/maven/skins/tags</tagBase>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
-
diff --git a/stage/org.apache/jars/apache-jar-resource-bundle-1.4.jar b/stage/org.apache/jars/apache-jar-resource-bundle-1.4.jar
deleted file mode 100644
index e9136bf..0000000
--- a/stage/org.apache/jars/apache-jar-resource-bundle-1.4.jar
+++ /dev/null
Binary files differ
diff --git a/stage/org.apache/poms/apache-jar-resource-bundle-1.4.pom b/stage/org.apache/poms/apache-jar-resource-bundle-1.4.pom
deleted file mode 100644
index 0e32dae..0000000
--- a/stage/org.apache/poms/apache-jar-resource-bundle-1.4.pom
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache-resource-bundles</artifactId>
-    <version>2</version>
-  </parent>
-  <artifactId>apache-jar-resource-bundle</artifactId>
-  <name>Apache JAR Resource Bundle</name>
-  <version>1.4</version>
-  <inceptionYear>2006</inceptionYear>
-  <description>
-    An archive which contains templates for generating the necessary license files and notices for all Apache releases.
-  </description>
-
-  <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</developerConnection>
-    <url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-jar-resource-bundle-1.4</url>
-  </scm>
-</project>
diff --git a/stage/org.apache/poms/apache-resource-bundles-2.pom b/stage/org.apache/poms/apache-resource-bundles-2.pom
deleted file mode 100644
index 470cfc3..0000000
--- a/stage/org.apache/poms/apache-resource-bundles-2.pom
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>5</version>
-    <relativePath>../pom/maven/pom.xml</relativePath>
-  </parent>
-  <packaging>pom</packaging>
-  <groupId>org.apache</groupId>
-  <artifactId>apache-resource-bundles</artifactId>
-  <name>Apache Resource Bundles</name>
-  <version>2</version>
-  <inceptionYear>2006</inceptionYear>
-  <modules>
-    <module>apache-jar-resource-bundle</module>
-    <module>apache-license-header-resource-bundle</module>
-    <module>apache-incubator-disclaimer-resource-bundle</module>         
-  </modules>
-  <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</developerConnection>
-    <url>https://svn.apache.org/repos/asf/maven/resources/tags/apache-resource-bundles-2</url>
-  </scm>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.0-beta-4</version>
-          <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/maven/resources/tags</tagBase>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-    <plugins>
-      <!-- Turn this into a lifecycle -->
-      <plugin>      
-        <artifactId>maven-remote-resources-plugin</artifactId>        
-        <executions>
-          <execution>
-            <goals>
-              <goal>bundle</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/stage/org.jvyaml/jars/jvyaml-0.2.1.LICENSE b/stage/org.jvyaml/jars/jvyaml-0.2.1.LICENSE
deleted file mode 100644
index ef26969..0000000
--- a/stage/org.jvyaml/jars/jvyaml-0.2.1.LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-The MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/stage/org.jvyaml/jars/jvyaml-0.2.1.jar b/stage/org.jvyaml/jars/jvyaml-0.2.1.jar
deleted file mode 100644
index 55e2db3..0000000
--- a/stage/org.jvyaml/jars/jvyaml-0.2.1.jar
+++ /dev/null
Binary files differ
diff --git a/stage/org.jvyaml/poms/jvyaml-0.2.1.pom b/stage/org.jvyaml/poms/jvyaml-0.2.1.pom
deleted file mode 100644
index 57441da..0000000
--- a/stage/org.jvyaml/poms/jvyaml-0.2.1.pom
+++ /dev/null
@@ -1,33 +0,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">
-  <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-  
-      http://www.apache.org/licenses/LICENSE-2.0
-  
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.    
-  -->
-  <modelVersion>4.0.0</modelVersion>

-  <groupId>org.jvyaml</groupId>

-  <artifactId>jvyaml</artifactId>

-  <name>jvyaml</name>

-  <version>0.2.1</version>

-  <packaging>jar</packaging>

-  <url>http://jvyaml.dev.java.net/</url>

-  <licenses>

-    <license>

-      <name>MIT license</name>

-      <url>http://www.opensource.org/licenses/mit-license.php</url>

-    </license>

-  </licenses>

-</project>
\ No newline at end of file
diff --git a/stage/pom.xml b/stage/pom.xml
index c4305df..e8ae348 100644
--- a/stage/pom.xml
+++ b/stage/pom.xml
@@ -47,47 +47,13 @@
   </repositories>
 
   <dependencies>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-parent</artifactId>
-      <version>1.2</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-project</artifactId>
-      <version>1.3</version>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-parent</artifactId>
-      <version>1.2-SNAPSHOT</version>
-      <type>xml</type>
-      <classifier>site</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-project</artifactId>
-      <version>1.3-SNAPSHOT</version>
-      <type>xml</type>
-      <classifier>site</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.skins</groupId>
-      <artifactId>maven-default-skin</artifactId>
-      <version>1.0</version>
-    </dependency>
+    
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>maven-skin</artifactId>
       <version>1.1</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache</groupId>
-      <artifactId>apache-jar-resource-bundle</artifactId>
-      <version>1.4</version>
-    </dependency>
+   
     <dependency>
       <groupId>dnsjava</groupId>
       <artifactId>dnsjava</artifactId>
@@ -98,28 +64,7 @@
       <artifactId>dnsjnio</artifactId>
       <version>1.0.3</version>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.14</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jvyaml</groupId>
-      <artifactId>jvyaml</artifactId>
-      <version>0.2.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.2</version>
-    </dependency>
+  
   </dependencies>
 
   <reporting>
diff --git a/tester/pom.xml b/tester/pom.xml
index 85970da..da4910e 100644
--- a/tester/pom.xml
+++ b/tester/pom.xml
@@ -44,8 +44,8 @@
       <groupId>dnsjava</groupId>
       <artifactId>dnsjava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jvyaml</groupId>
+	<dependency>
+      <groupId>net.java.dev</groupId>
       <artifactId>jvyaml</artifactId>
     </dependency>
     <dependency>