You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/13 09:40:39 UTC

[maven] 01/01: Merge branch 'MNG-6672'

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

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 3d76faed001b260737cc89ba968d7d0e64938ecc
Merge: da05c25 25ffca0
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 13 11:40:08 2019 +0200

    Merge branch 'MNG-6672'

 .../internal/DefaultVersionResolver.java           | 41 ++++++++++++++++++----
 pom.xml                                            |  2 +-
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --cc pom.xml
index 0d8a11a,07d4946..c9f5c4d
--- a/pom.xml
+++ b/pom.xml
@@@ -62,9 -62,9 +62,9 @@@ under the License
      <wagonVersion>3.3.2</wagonVersion>
      <securityDispatcherVersion>1.4</securityDispatcherVersion>
      <cipherVersion>1.7</cipherVersion>
 -    <modelloVersion>1.10.0</modelloVersion>
 +    <modelloVersion>1.11</modelloVersion>
      <jxpathVersion>1.3</jxpathVersion>
-     <resolverVersion>1.3.3</resolverVersion>
+     <resolverVersion>1.4.0</resolverVersion>
      <slf4jVersion>1.7.25</slf4jVersion>
      <xmlunitVersion>2.2.1</xmlunitVersion>
      <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>