debian/changelog

-aether-ant-tasks (1.0.1-5) UNRELEASED; urgency=medium
+aether-ant-tasks (1.0.1-5) unstable; urgency=medium
 
+  * Team upload.
+
+  [ Emmanuel Bourg ]
+  * Fixed the compatibility with Maven 3.6.2 (Closes: #941211)
+  * Standards-Version updated to 4.4.0
+
+  [ Andrius Merkys ]
   * Fixing the URL in VCS-* fields.
 
- -- Andrius Merkys <merkys@debian.org>  Fri, 27 Sep 2019 01:39:17 -0400
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 27 Sep 2019 10:42:03 +0200
 
 aether-ant-tasks (1.0.1-4) unstable; urgency=medium
 

debian/control

@@ -10,14 +10,14 @@ Build-Depends:
  libmaven-resolver-java,
  libmaven-resolver-transport-http-java,
  libmaven-shade-plugin-java (>= 3.1.0),
- libmaven3-core-java (>= 3.5.0),
+ libmaven3-core-java (>= 3.6.2),
  libplexus-component-annotations-java (>= 1.7.1-6~),
  libplexus-container-default-java (>= 1.7.1-7~),
  libplexus-interpolation-java (>= 1.16),
  libsisu-plexus-java (>= 0.1.1),
  libslf4j-java,
  maven-debian-helper (>= 2.2)
-Standards-Version: 4.2.1
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/java-team/aether-ant-tasks
 Vcs-Git: https://salsa.debian.org/java-team/aether-ant-tasks.git
 Homepage: http://www.eclipse.org/aether/

debian/patches/01-maven-compatibility.patch

@@ -37,3 +37,25 @@ Forwarded: no
 +        addRepository( repository );
 +    }
  }
+--- a/src/main/java/org/eclipse/aether/internal/ant/AntSettingsDecryptorFactory.java
++++ b/src/main/java/org/eclipse/aether/internal/ant/AntSettingsDecryptorFactory.java
+@@ -23,18 +23,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;
+     }