From 7d3eda55b7a8289cfef3dc6c3f55b16fe838c7f0963d0cb006693fe8afae4de2 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 22 Oct 2021 08:38:10 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven?expand=0&rev=27

---
 0004-Use-non-shaded-HTTP-wagon.patch | 4 ++--
 apache-maven-3.8.1-build.tar.xz      | 3 ---
 apache-maven-3.8.1-src.tar.gz        | 3 ---
 apache-maven-3.8.3-build.tar.xz      | 3 +++
 apache-maven-3.8.3-src.tar.gz        | 3 +++
 maven.spec                           | 8 ++++----
 6 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 apache-maven-3.8.1-build.tar.xz
 delete mode 100644 apache-maven-3.8.1-src.tar.gz
 create mode 100644 apache-maven-3.8.3-build.tar.xz
 create mode 100644 apache-maven-3.8.3-src.tar.gz

diff --git a/0004-Use-non-shaded-HTTP-wagon.patch b/0004-Use-non-shaded-HTTP-wagon.patch
index 9f66b3e..d763aac 100644
--- a/0004-Use-non-shaded-HTTP-wagon.patch
+++ b/0004-Use-non-shaded-HTTP-wagon.patch
@@ -32,8 +32,8 @@ index 2686570af..d22ae121d 100644
 -        </exclusion>
 -      </exclusions>
      </dependency>
-     <dependency>
-       <!-- this is included in Wagon Http
+     <!--  This is included in Wagon HTTP.
+           We are just making the dependency explicit
 diff --git a/pom.xml b/pom.xml
 index 237cdc39e..85436c54d 100644
 --- a/pom.xml
diff --git a/apache-maven-3.8.1-build.tar.xz b/apache-maven-3.8.1-build.tar.xz
deleted file mode 100644
index 926fb45..0000000
--- a/apache-maven-3.8.1-build.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4217036830a64d7b39e6fb8a0f3db49d9f952c5395d571ba8a7723a9c948f309
-size 5176
diff --git a/apache-maven-3.8.1-src.tar.gz b/apache-maven-3.8.1-src.tar.gz
deleted file mode 100644
index 188499d..0000000
--- a/apache-maven-3.8.1-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86dc0df5950bb22dedcab326499531ee9c155016c9a7a3d3f33315becb0c71b1
-size 2763744
diff --git a/apache-maven-3.8.3-build.tar.xz b/apache-maven-3.8.3-build.tar.xz
new file mode 100644
index 0000000..41334d5
--- /dev/null
+++ b/apache-maven-3.8.3-build.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:558c9e3d63fcba23f6b8d3143b8362d362826db19fe3d66af71a0999ed09e9a1
+size 5220
diff --git a/apache-maven-3.8.3-src.tar.gz b/apache-maven-3.8.3-src.tar.gz
new file mode 100644
index 0000000..96869d2
--- /dev/null
+++ b/apache-maven-3.8.3-src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c58ea18cee78d678af33b4080b083a104ab80919e4bb57468109338e0bbad19f
+size 2775996
diff --git a/maven.spec b/maven.spec
index ccee50b..654177b 100644
--- a/maven.spec
+++ b/maven.spec
@@ -26,7 +26,7 @@
 %endif
 %bcond_with  logback
 Name:           maven
-Version:        3.8.1
+Version:        3.8.3
 Release:        0
 Summary:        Java project management and project comprehension tool
 # maven itself is ASL 2.0
@@ -53,7 +53,7 @@ BuildRequires:  atinject
 BuildRequires:  cdi-api
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
-BuildRequires:  geronimo-annotation-1_0-api
+BuildRequires:  glassfish-annotation-api
 BuildRequires:  google-guice
 BuildRequires:  guava
 BuildRequires:  hawtjni-runtime
@@ -136,7 +136,7 @@ Requires:       apache-commons-logging
 Requires:       atinject
 Requires:       cdi-api
 Requires:       cglib
-Requires:       geronimo-annotation-1_0-api
+Requires:       glassfish-annotation-api
 Requires:       google-guice
 Requires:       guava
 Requires:       hawtjni-runtime
@@ -329,7 +329,7 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \
     jansi-native/jansi-native \
     atinject \
     slf4j/jcl-over-slf4j \
-    geronimo-annotation-1.0-api \
+    glassfish-annotation-api \
     junit \
     maven-resolver/maven-resolver-api \
     maven-resolver/maven-resolver-connector-basic \