From 7be4d58a7c8dc8084140b1e1151d9446b76ce7cee2aa612e56878e37f903d947 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 2 May 2023 05:23:04 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=58

---
 0003-Use-non-shaded-HTTP-wagon.patch | 10 +++++-----
 apache-maven-3.8.6-build.tar.xz      |  3 ---
 apache-maven-3.8.6-src.tar.gz        |  3 ---
 apache-maven-3.8.8-build.tar.xz      |  3 +++
 apache-maven-3.8.8-src.tar.gz        |  3 +++
 maven.spec                           |  4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 apache-maven-3.8.6-build.tar.xz
 delete mode 100644 apache-maven-3.8.6-src.tar.gz
 create mode 100644 apache-maven-3.8.8-build.tar.xz
 create mode 100644 apache-maven-3.8.8-src.tar.gz

diff --git a/0003-Use-non-shaded-HTTP-wagon.patch b/0003-Use-non-shaded-HTTP-wagon.patch
index 9af0268..0fb7d65 100644
--- a/0003-Use-non-shaded-HTTP-wagon.patch
+++ b/0003-Use-non-shaded-HTTP-wagon.patch
@@ -12,7 +12,7 @@ diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
 index 7ff412767..b15091576 100644
 --- a/apache-maven/pom.xml
 +++ b/apache-maven/pom.xml
-@@ -63,21 +63,6 @@ under the License.
+@@ -63,21 +63,6 @@
      <dependency>
        <groupId>org.apache.maven.wagon</groupId>
        <artifactId>wagon-http</artifactId>
@@ -38,14 +38,14 @@ diff --git a/pom.xml b/pom.xml
 index c319cae26..42afab5f1 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -333,7 +333,6 @@ under the License.
+@@ -340,7 +340,6 @@
          <groupId>org.apache.maven.wagon</groupId>
          <artifactId>wagon-http</artifactId>
          <version>${wagonVersion}</version>
 -        <classifier>shaded</classifier>
-         <exclusions>
-           <exclusion>
-             <groupId>commons-logging</groupId>
+       </dependency>
+       <!--  Repository -->
+       <dependency>
 -- 
 2.36.1
 
diff --git a/apache-maven-3.8.6-build.tar.xz b/apache-maven-3.8.6-build.tar.xz
deleted file mode 100644
index 64d2ad1..0000000
--- a/apache-maven-3.8.6-build.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index a29e337..0000000
--- a/apache-maven-3.8.6-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:72bfc3189bc337b9f4f311da7909af38f4d8253a8465a984512795db15ab5f4b
-size 2786244
diff --git a/apache-maven-3.8.8-build.tar.xz b/apache-maven-3.8.8-build.tar.xz
new file mode 100644
index 0000000..0ca37a1
--- /dev/null
+++ b/apache-maven-3.8.8-build.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8dc3e33eb9a433865f9923dbcc294a5429731f4687126492f8b09ffe559246dc
+size 5176
diff --git a/apache-maven-3.8.8-src.tar.gz b/apache-maven-3.8.8-src.tar.gz
new file mode 100644
index 0000000..f8f8d2e
--- /dev/null
+++ b/apache-maven-3.8.8-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:224dbca28737d0b63a257f0a07c8ffae333a13cab837120dd15e773a357a0207
+size 2792384
diff --git a/maven.spec b/maven.spec
index e5400db..4d4686b 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
 %global homedir %{_datadir}/%{name}%{?maven_version_suffix}
 %global confdir %{_sysconfdir}/%{name}%{?maven_version_suffix}
 Name:           maven
-Version:        3.8.6
+Version:        3.8.8
 Release:        0
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0