[MNG-3849]

- upreved mercury dependency to the latest snapshot
- removed security dispatcher xml descriptor dependency

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@750789 13f79535-47bb-0310-9956-ffa450edef68

maven-embedder/src/main/java/org/apache/maven/embedder/execution/MavenSecurityDispatcher.java

@@ -0,0 +1,41 @@
+/*
+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.
+*/
+
+package org.apache.maven.embedder.execution;
+
+import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
+
+/**
+ *
+ *
+ * @author Oleg Gusakov
+ * @version $Id$
+ *
+ * @plexus.component role="" hint="maven"
+ */
+//@Component( role=SecDispatcher.class, hint="maven" )
+public class MavenSecurityDispatcher
+    extends DefaultSecDispatcher
+{
+//    @Configuration( value="~/.m2/settings-security.xml" )
+    /**
+     * @plexus.configuration default-value="~/.m2/settings-security.xml"
+     */
+    protected String _configurationFile = "~/.m2/settings-security.xml";
+}

pom.xml

@@ -63,9 +63,9 @@ under the License.
     <plexusWebdavVersion>1.0</plexusWebdavVersion>    
     <wagonVersion>1.0-beta-4</wagonVersion>
     <modelBuilderVersion>1.5</modelBuilderVersion>
-    <mercuryVersion>1.0.0-alpha-4</mercuryVersion>
+    <mercuryVersion>1.0-alpha-6-SNAPSHOT</mercuryVersion>
     <mercuryMp3Version>1.0-alpha-1</mercuryMp3Version>
-    <securityDispatcherVersion>1.0</securityDispatcherVersion>
+    <securityDispatcherVersion>1.2</securityDispatcherVersion>
     <woodstoxVersion>3.2.6</woodstoxVersion>
     <modelloVersion>1.0.1-SNAPSHOT</modelloVersion>
     <jxpathVersion>1.3</jxpathVersion>