[maven] branch MNG-6656 updated (712b95f -> b46a4c7)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[maven] branch MNG-6656 updated (712b95f -> b46a4c7)

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

rfscholte pushed a change to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git.


    from 712b95f  [MNG-6656] Support reactor managed versions
     add a52e2ea  [MNG-6695] Improve speed in collection merging
     add 400e7e5  [MNG-6747] Generalize 'resume from' message when build reactor fails
     add 40f5233  [maven-release-plugin] prepare release maven-3.6.2
     add d9a0eee  [maven-release-plugin] prepare for next development iteration
     add 71eafc4  Update DOAP file for 3.6.2 release
     add 3eb242c  [MNG-6760] ExclusionArtifactFilter result invalid when wildcard exclusion is followed by other exclusions
     add d09bc74  [refactor] use utility method of Objects to simplify code (#284)
     add 38efe84  Fix checkstyle reported errors
     new 2f4d491  Merge branch 'master' into MNG-6656
     new b46a4c7  [MNG-6656] Update project versions

The 2 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:
 apache-maven/pom.xml                               |   2 +-
 doap_Maven.rdf                                     |  11 +-
 maven-artifact/pom.xml                             |   2 +-
 .../maven/artifact/versioning/VersionRange.java    |  10 +-
 maven-builder-support/pom.xml                      |   2 +-
 maven-compat/pom.xml                               |   2 +-
 .../artifact/resolver/DebugResolutionListener.java |   3 +-
 maven-core/pom.xml                                 |   2 +-
 .../repository/MavenArtifactRepository.java        |   3 +-
 .../resolver/filter/ExclusionArtifactFilter.java   |  14 +-
 .../resolver/filter/ScopeArtifactFilter.java       |   9 +-
 .../java/org/apache/maven/plugin/CacheUtils.java   |   2 +-
 .../maven/plugin/DefaultPluginDescriptorCache.java |  14 +-
 .../org/apache/maven/project/MavenProject.java     |  11 +-
 .../artifact/DefaultMavenMetadataCache.java        |  25 +-
 .../apache/maven/toolchain/DefaultToolchain.java   |  10 +-
 .../filter/ExclusionArtifactFilterTest.java        |  33 +
 maven-embedder/pom.xml                             |   2 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   |  12 +-
 maven-model-builder/pom.xml                        |   2 +-
 maven-model/pom.xml                                |   2 +-
 .../org/apache/maven/model/merge/ModelMerger.java  | 866 ++++++++++-----------
 maven-plugin-api/pom.xml                           |   2 +-
 maven-repository-metadata/pom.xml                  |   2 +-
 maven-resolver-provider/pom.xml                    |   2 +-
 maven-settings-builder/pom.xml                     |   2 +-
 maven-settings/pom.xml                             |   2 +-
 maven-slf4j-provider/pom.xml                       |   2 +-
 maven-xml/pom.xml                                  |   2 +-
 pom.xml                                            |   2 +-
 30 files changed, 531 insertions(+), 524 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[maven] 01/02: Merge branch 'master' into MNG-6656

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

rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git

commit 2f4d4919f590007de2fe6a13b76cffa1f54e3809
Merge: 712b95f 38efe84
Author: rfscholte <[hidden email]>
AuthorDate: Tue Sep 10 21:51:53 2019 +0200

    Merge branch 'master' into MNG-6656

 apache-maven/pom.xml                               |   2 +-
 doap_Maven.rdf                                     |  11 +-
 maven-artifact/pom.xml                             |   2 +-
 .../maven/artifact/versioning/VersionRange.java    |  10 +-
 maven-builder-support/pom.xml                      |   2 +-
 maven-compat/pom.xml                               |   2 +-
 .../artifact/resolver/DebugResolutionListener.java |   3 +-
 maven-core/pom.xml                                 |   2 +-
 .../repository/MavenArtifactRepository.java        |   3 +-
 .../resolver/filter/ExclusionArtifactFilter.java   |  14 +-
 .../resolver/filter/ScopeArtifactFilter.java       |   9 +-
 .../java/org/apache/maven/plugin/CacheUtils.java   |   2 +-
 .../maven/plugin/DefaultPluginDescriptorCache.java |  14 +-
 .../org/apache/maven/project/MavenProject.java     |  11 +-
 .../artifact/DefaultMavenMetadataCache.java        |  25 +-
 .../apache/maven/toolchain/DefaultToolchain.java   |  10 +-
 .../filter/ExclusionArtifactFilterTest.java        |  33 +
 maven-embedder/pom.xml                             |   2 +-
 .../main/java/org/apache/maven/cli/MavenCli.java   |  12 +-
 maven-model-builder/pom.xml                        |   2 +-
 maven-model/pom.xml                                |   2 +-
 .../org/apache/maven/model/merge/ModelMerger.java  | 866 ++++++++++-----------
 maven-plugin-api/pom.xml                           |   2 +-
 maven-repository-metadata/pom.xml                  |   2 +-
 maven-resolver-provider/pom.xml                    |   2 +-
 maven-settings-builder/pom.xml                     |   2 +-
 maven-settings/pom.xml                             |   2 +-
 maven-slf4j-provider/pom.xml                       |   2 +-
 pom.xml                                            |   2 +-
 29 files changed, 530 insertions(+), 523 deletions(-)


Reply | Threaded
Open this post in threaded view
|

[maven] 02/02: [MNG-6656] Update project versions

rfscholte
In reply to this post by rfscholte
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MNG-6656
in repository https://gitbox.apache.org/repos/asf/maven.git

commit b46a4c727026191977bea62f968a5b044f003cbc
Author: rfscholte <[hidden email]>
AuthorDate: Tue Sep 10 21:57:06 2019 +0200

    [MNG-6656] Update project versions
---
 apache-maven/pom.xml              | 2 +-
 maven-artifact/pom.xml            | 2 +-
 maven-builder-support/pom.xml     | 2 +-
 maven-compat/pom.xml              | 2 +-
 maven-core/pom.xml                | 2 +-
 maven-embedder/pom.xml            | 2 +-
 maven-model-builder/pom.xml       | 2 +-
 maven-model/pom.xml               | 2 +-
 maven-plugin-api/pom.xml          | 2 +-
 maven-repository-metadata/pom.xml | 2 +-
 maven-resolver-provider/pom.xml   | 2 +-
 maven-settings-builder/pom.xml    | 2 +-
 maven-settings/pom.xml            | 2 +-
 maven-slf4j-provider/pom.xml      | 2 +-
 maven-xml/pom.xml                 | 2 +-
 pom.xml                           | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index edbec83..f57506a 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apache-maven</artifactId>
diff --git a/maven-artifact/pom.xml b/maven-artifact/pom.xml
index 834905f..f9d78c8 100644
--- a/maven-artifact/pom.xml
+++ b/maven-artifact/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-artifact</artifactId>
diff --git a/maven-builder-support/pom.xml b/maven-builder-support/pom.xml
index de4b9db..3a24e3d 100644
--- a/maven-builder-support/pom.xml
+++ b/maven-builder-support/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-builder-support</artifactId>
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 24bfbf1..058eeec 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-compat</artifactId>
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 7c9d483..c814a95 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-core</artifactId>
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 9c00974..e308277 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-embedder</artifactId>
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index a44089f..d9e02f4 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-model-builder</artifactId>
diff --git a/maven-model/pom.xml b/maven-model/pom.xml
index a1505d4..59a4dd2 100644
--- a/maven-model/pom.xml
+++ b/maven-model/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-model</artifactId>
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 80470c3..a59bfed 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin-api</artifactId>
diff --git a/maven-repository-metadata/pom.xml b/maven-repository-metadata/pom.xml
index f3e6588..9d94f16 100644
--- a/maven-repository-metadata/pom.xml
+++ b/maven-repository-metadata/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-repository-metadata</artifactId>
diff --git a/maven-resolver-provider/pom.xml b/maven-resolver-provider/pom.xml
index 3180d9a..0f68256 100644
--- a/maven-resolver-provider/pom.xml
+++ b/maven-resolver-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-resolver-provider</artifactId>
diff --git a/maven-settings-builder/pom.xml b/maven-settings-builder/pom.xml
index a6ac8fb..4c4b406 100644
--- a/maven-settings-builder/pom.xml
+++ b/maven-settings-builder/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-settings-builder</artifactId>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index 3636f0f..b4a6943 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-settings</artifactId>
diff --git a/maven-slf4j-provider/pom.xml b/maven-slf4j-provider/pom.xml
index fdf5860..e0bd341 100644
--- a/maven-slf4j-provider/pom.xml
+++ b/maven-slf4j-provider/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.3-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-slf4j-provider</artifactId>
diff --git a/maven-xml/pom.xml b/maven-xml/pom.xml
index 1c57690..4541888 100644
--- a/maven-xml/pom.xml
+++ b/maven-xml/pom.xml
@@ -26,7 +26,7 @@ under the License.
   <parent>
     <groupId>org.apache.maven</groupId>
     <artifactId>maven</artifactId>
-    <version>3.6.2-SNAPSHOT</version>
+    <version>3.7.0-SNAPSHOT</version>
   </parent>
   <artifactId>maven-xml</artifactId>
   <name>Maven XML</name>
diff --git a/pom.xml b/pom.xml
index 3600772..0a50d17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@ under the License.
   </parent>
 
   <artifactId>maven</artifactId>
-  <version>3.6.3-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Apache Maven</name>