You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/01/15 17:34:28 UTC

[maven-build-cache-extension] branch master updated: [MBUILDCACHE-2] point to new branches implementing MNG-7391

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

hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-build-cache-extension.git


The following commit(s) were added to refs/heads/master by this push:
     new dcd782f  [MBUILDCACHE-2] point to new branches implementing MNG-7391
dcd782f is described below

commit dcd782f065ee01c86a213bf1a4a3aa0053f37b0f
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat Jan 15 18:34:26 2022 +0100

    [MBUILDCACHE-2] point to new branches implementing MNG-7391
---
 .gitmodules  | 4 ++--
 maven/maven3 | 2 +-
 maven/maven4 | 2 +-
 pom.xml      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 7108220..93f16fe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "maven3"]
 	path = maven/maven3
 	url = https://github.com/apache/maven.git
-	branch = MNG-7129-3.8.x
+	branch = MNG-7391-maven-3.8.x
 [submodule "maven4"]
 	path = maven/maven4
 	url = https://github.com/apache/maven.git
-	branch = MNG-7129-master
+	branch = MNG-7391-master
diff --git a/maven/maven3 b/maven/maven3
index 4ca2fb6..9366ea7 160000
--- a/maven/maven3
+++ b/maven/maven3
@@ -1 +1 @@
-Subproject commit 4ca2fb635cdf907ba65e9dcf43aa7b1ce98b8ace
+Subproject commit 9366ea7ba16c834e5fd74965dc10c184ca0ccb50
diff --git a/maven/maven4 b/maven/maven4
index dc58d4b..91b57d5 160000
--- a/maven/maven4
+++ b/maven/maven4
@@ -1 +1 @@
-Subproject commit dc58d4b419517e64a17c93033e4808cb3b11b1b7
+Subproject commit 91b57d5b40ed6204b1eb49dbc29f54adf322dd7e
diff --git a/pom.xml b/pom.xml
index eb2ca56..822ac0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,8 +44,8 @@ under the License.
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <classWorldsVersion>2.6.0</classWorldsVersion>
-        <maven3Version>3.9.0-SNAPSHOT</maven3Version><!-- MNG-7129-3.8.x branch, waiting for Maven API update -->
-        <maven4Version>4.0.0-alpha-1-SNAPSHOT</maven4Version><!-- MNG-7129-master branch, waiting for Maven API update -->
+        <maven3Version>3.8.5-SNAPSHOT</maven3Version><!-- MNG-7391-maven-3.8.x branch, waiting for MNG-7391 Maven API update -->
+        <maven4Version>4.0.0-alpha-1-SNAPSHOT</maven4Version><!-- MNG-7391-master branch, waiting for MNG-7391 Maven API update -->
 
         <formatter-maven-plugin.version>2.17.0</formatter-maven-plugin.version>
         <impsort-maven-plugin.version>1.6.2</impsort-maven-plugin.version>