[maven-resolver-ant-tasks] branch fixed-stuff updated (e8138e1 -> edfe57e)

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch fixed-stuff
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git.


 discard e8138e1  Fix build errors
     new edfe57e  Fix build errors

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e8138e1)
            \
             N -- N -- N   refs/heads/fixed-stuff (edfe57e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

[maven-resolver-ant-tasks] 01/01: Fix build errors

[mi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch fixed-stuff
in repository https://gitbox.apache.org/repos/asf/maven-resolver-ant-tasks.git

commit edfe57e68448e34f9687d3f07194a54a845b43cb
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Tue Jan 28 22:44:16 2020 +0100

    Fix build errors
---
 pom.xml                                               |  4 ++--
 .../internal/ant/AntSettingsDecryptorFactory.java     | 19 +++----------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index ed2339d..459f1f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,8 +61,8 @@
   </distributionManagement>
 
   <properties>
-    <mavenVersion>3.5.0</mavenVersion>
-    <resolverVersion>1.3.3</resolverVersion>
+    <mavenVersion>3.6.3</mavenVersion>
+    <resolverVersion>1.4.2</resolverVersion>
     <antVersion>1.8.4</antVersion>
     <javaVersion>7</javaVersion>
     <maven.site.path>resolver-archives/resolver-ant-tasks-LATEST</maven.site.path>
diff --git a/src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java b/src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java
index 39ef960..e9bfe6a 100644
--- a/src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java
+++ b/src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java
@@ -8,9 +8,9 @@ package org.apache.maven.resolver.internal.ant;
  * 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
@@ -19,8 +19,6 @@ package org.apache.maven.resolver.internal.ant;
  * under the License.
  */
 
-import java.lang.reflect.Field;
-
 import org.apache.maven.settings.crypto.DefaultSettingsDecrypter;
 
 /**
@@ -32,18 +30,7 @@ class AntSettingsDecryptorFactory
     {
         AntSecDispatcher secDispatcher = new AntSecDispatcher();
 
-        DefaultSettingsDecrypter decrypter = new DefaultSettingsDecrypter();
-
-        try
-        {
-            Field field = decrypter.getClass().getDeclaredField( "securityDispatcher" );
-            field.setAccessible( true );
-            field.set( decrypter, secDispatcher );
-        }
-        catch ( Exception e )
-        {
-            throw new IllegalStateException( e );
-        }
+        DefaultSettingsDecrypter decrypter = new DefaultSettingsDecrypter( secDispatcher );
 
         return decrypter;
     }