[karaf] branch karaf-4.2.x updated: [KARAF-6467] Upgrade to Maven 3.6.2

[jbonofre]

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

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new e8573a1  [KARAF-6467] Upgrade to Maven 3.6.2
e8573a1 is described below

commit e8573a1c119d2d25f2d1e60034e386ab7faaf1c8
Author: Jean-Baptiste Onofré <jbono...@apache.org>
AuthorDate: Fri Oct 18 15:34:48 2019 +0200

    [KARAF-6467] Upgrade to Maven 3.6.2
    
    (cherry picked from commit 9a86763e17a06dd544c4ead1240433b2aba44501)
---
 .../java/org/apache/karaf/maven/command/MavenConfigurationSupport.java  | 2 +-
 pom.xml                                                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
 
b/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
index e95d823..ec209db 100644
--- 
a/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
+++ 
b/maven/core/src/main/java/org/apache/karaf/maven/command/MavenConfigurationSupport.java
@@ -416,7 +416,7 @@ public abstract class MavenConfigurationSupport implements 
Action {
         if (mavenSecuritySettings != null && mavenSettings != null) {
             masterPassword = 
cipher.decryptDecorated(mavenSecuritySettings.getMaster(), 
masterMasterPassword);
             DefaultSecDispatcher dispatcher = new DefaultSecDispatcher();
-            DefaultSettingsDecrypter decrypter = new 
DefaultSettingsDecrypter();
+            DefaultSettingsDecrypter decrypter = new 
DefaultSettingsDecrypter(new DefaultSecDispatcher());
             try {
                 
dispatcher.setConfigurationFile(securitySettings.value.getAbsolutePath());
                 Field f = dispatcher.getClass().getDeclaredField("_cipher");
diff --git a/pom.xml b/pom.xml
index b091f4e..564a922 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,7 +267,7 @@
         <junit.version>4.12</junit.version>
         <jsw.version>3.2.3</jsw.version>
         <log4j.version>1.2.17</log4j.version>
-        <maven.version>3.6.1</maven.version>
+        <maven.version>3.6.2</maven.version>
         <maven.wagon.version>3.2.0</maven.wagon.version>
         
<maven-plugin-annotations.version>3.6.0</maven-plugin-annotations.version>
         <maven.resolver.version>1.3.1</maven.resolver.version>