From ec84803314d2f2d7b9024df630a7406dddc8993a91f96547050a126829b02741 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 25 Jul 2022 12:21:34 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=53

---
 apache-maven-3.8.5-build.tar.xz |  3 ---
 apache-maven-3.8.5-src.tar.gz   |  3 ---
 apache-maven-3.8.6-build.tar.xz |  3 +++
 apache-maven-3.8.6-src.tar.gz   |  3 +++
 maven.changes                   | 38 ++++++++++++++++++++++++++++++++-
 maven.spec                      |  2 +-
 6 files changed, 44 insertions(+), 8 deletions(-)
 delete mode 100644 apache-maven-3.8.5-build.tar.xz
 delete mode 100644 apache-maven-3.8.5-src.tar.gz
 create mode 100644 apache-maven-3.8.6-build.tar.xz
 create mode 100644 apache-maven-3.8.6-src.tar.gz

diff --git a/apache-maven-3.8.5-build.tar.xz b/apache-maven-3.8.5-build.tar.xz
deleted file mode 100644
index 818151b..0000000
--- a/apache-maven-3.8.5-build.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0080cd73d1220b5c175f93d5a46579c6f9948771a2b923280ed18d8157bd785b
-size 5100
diff --git a/apache-maven-3.8.5-src.tar.gz b/apache-maven-3.8.5-src.tar.gz
deleted file mode 100644
index c68fe86..0000000
--- a/apache-maven-3.8.5-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a60ddbb333f3addb93e063613a9589f47ed805a572c156075dc1bf4db774c007
-size 2783778
diff --git a/apache-maven-3.8.6-build.tar.xz b/apache-maven-3.8.6-build.tar.xz
new file mode 100644
index 0000000..64d2ad1
--- /dev/null
+++ b/apache-maven-3.8.6-build.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9c4f0a22148b5d97d97101771c31f4c13176ee1bc19d311be092d93a4816bb00
+size 5160
diff --git a/apache-maven-3.8.6-src.tar.gz b/apache-maven-3.8.6-src.tar.gz
new file mode 100644
index 0000000..a29e337
--- /dev/null
+++ b/apache-maven-3.8.6-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:72bfc3189bc337b9f4f311da7909af38f4d8253a8465a984512795db15ab5f4b
+size 2786244
diff --git a/maven.changes b/maven.changes
index e774c3a..10f71c7 100644
--- a/maven.changes
+++ b/maven.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Mon Jul 25 12:13:39 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.8.6
+  * Bug
+    + [MNG-7432] - [REGRESSION] Resolver session contains
+      non-MavenWorkspaceReader
+    + [MNG-7433] - [REGRESSION] Multiple maven instances working on
+      same source tree can lock each other
+    + [MNG-7441] - Update Version of (optional) Logback to Address
+      CVE-2021-42550, bsc#1193795
+    + [MNG-7448] - Don't ignore bin/ otherwise bin/ in apache-maven
+      module cannot be readded
+    + [MNG-7455] - [REGRESSION] IllegalStateException in
+      SessionScope during guice injection in multithreaded build
+    + [MNG-7459] - Revert MNG-7347 (SessionScoped beans should be
+      singletons for a given session)
+    + [MNG-7467] - [REGRESSION] Compilation failure with relocated
+      transitive dependency
+    + [MNG-7487] - Fix deadlock during forked lifecycle executions
+    + [MNG-7493] - [REGRESSION] Resolving dependencies between
+      submodules fails
+  * New Feature
+    + [MNG-7486] - Create a multiline message helper for boxed log
+      messages
+  * Improvement
+    + [MNG-7445] - to refactor some useless code
+    + [MNG-7476] - Display a warning when an aggregator mojo is
+      locking other mojo executions
+  * Task
+    + [MNG-7466] - Align Assembly Descriptor NS versions
+  * Dependency upgrade
+    + [MNG-7488] - Upgrade SLF4J to 1.7.36
+    + [MNG-7489] - Upgrade JUnit to 4.13.2
+    + [MNG-7490] - Upgrade Plexus Utils to 3.3.1
+
 -------------------------------------------------------------------
 Mon May 16 14:26:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
@@ -64,7 +100,7 @@ Mon May 16 14:26:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
   * 0004-Remove-dependency-on-powermock.patch
     + Remove the non-interpolated tests that require powermock
   * 0006-Restore-DefaultModelValidator-compatibility-with-Mav.patch
-    + XMvn was relying on default constructor for the 
+    + XMvn was relying on default constructor for the
       org.apache.maven.model.validation.DefaultModelValidator,
       which is not generated, since a non-default one is defined.
     + This adds the no-parameter constructor back implicitely
diff --git a/maven.spec b/maven.spec
index 6ab4c4d..bae1bbb 100644
--- a/maven.spec
+++ b/maven.spec
@@ -20,7 +20,7 @@
 %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
 %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
 Name:           maven
-Version:        3.8.5
+Version:        3.8.6
 Release:        0
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0