diff --git a/assembly/pom.xml b/assembly/pom.xml
index d3d3990e1e..2627aa1b5c 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -260,13 +260,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <version>2.1</version>
         <executions>
           <execution>
             <id>run</id>
             <phase>package</phase>
             <goals>
-              <goal>single</goal>
+              <goal>assembly</goal>
             </goals>
             <configuration>
               <descriptors>
@@ -285,7 +285,7 @@
             <id>bin</id>
             <phase>package</phase>
             <goals>
-              <goal>single</goal>
+              <goal>assembly</goal>
             </goals>
             <configuration>
               <descriptors>
@@ -300,4 +300,4 @@
     </plugins>
   </build>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f2370cc05f..1da0cdff0d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -108,12 +108,12 @@
     <repository>
       <id>apache-repo</id>
       <name>Apache CVS Repository</name>
-      <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+      <url>scp://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
     </repository>
     <snapshotRepository>
       <id>apache-snapshots</id>
       <name>Apache CVS Development Repository</name>
-      <url>scpexe://cvs.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
+      <url>scp://minotaur.apache.org/www/cvs.apache.org/maven-snapshot-repository</url>
     </snapshotRepository>
     <site>
       <id>apache-website</id>
@@ -775,20 +775,22 @@
       </plugins>
     </pluginManagement>
     <plugins>
-      <!-- plugin>
+      <plugin>
         <artifactId>maven-one-plugin</artifactId>
-        <executions> 
+        <version>1.0</version>
+        <executions>
           <execution>
-            <configuration>
-              <remoteRepositoryUrl>scpexe://cvs.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
-            </configuration>
             <goals>
               <goal>install-maven-one-repository</goal>
               <goal>deploy-maven-one-repository</goal>
             </goals>
+            <configuration>
+              <remoteRepositoryId>apache.m1.releases</remoteRepositoryId>
+              <remoteRepositoryUrl>scp://minotaur.apache.org/www/cvs.apache.org/repository</remoteRepositoryUrl>
+            </configuration>
           </execution>
         </executions>
-      </plugin -->
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -816,4 +818,4 @@
     </plugins>
   </reporting>
 
-</project>
+</project>
\ No newline at end of file