commit 88c22b563e67e9d301edbf7643c53a3a19f5608a
author Michael Osipov <michaelo@apache.org> Fri May 29 21:41:47 2020 +0200
committer Michael Osipov <michaelo@apache.org> Fri May 29 21:42:37 2020 +0200
tree 1c08711cd986ae4bde354131d62df79740430a86
parent 6b67ffac40eb1a238e8ed8666f3790bf7c8a91e4

[MRESOLVER-110] Upgrade to Maven 3.6.3

pom.xml

diff --git a/pom.xml b/pom.xml
index ed2339d..b7c3afa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
   </distributionManagement>
 
   <properties>
-    <mavenVersion>3.5.0</mavenVersion>
+    <mavenVersion>3.6.3</mavenVersion>
     <resolverVersion>1.3.3</resolverVersion>
     <antVersion>1.8.4</antVersion>
     <javaVersion>7</javaVersion>

src/main/java/org/apache/maven/resolver/internal/ant/AntSettingsDecryptorFactory.java

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 @@
  * 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 @@
  * under the License.
  */
 
-import java.lang.reflect.Field;
-
 import org.apache.maven.settings.crypto.DefaultSettingsDecrypter;
 
 /**
@@ -32,18 +30,7 @@
     {
         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;
     }