From 155a603665794c4eb32f0f827e571f62293aa5e76537b3728c4bfa432b11ee11 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 11 Mar 2022 12:11:18 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=21

---
 maven-resolver-1.6.3-source-release.zip |  3 ---
 maven-resolver-1.7.3-source-release.zip |  3 +++
 maven-resolver-build.tar.xz             |  4 ++--
 maven-resolver.changes                  |  6 +++++
 maven-resolver.spec                     | 31 ++++++++++++++++++-------
 5 files changed, 33 insertions(+), 14 deletions(-)
 delete mode 100644 maven-resolver-1.6.3-source-release.zip
 create mode 100644 maven-resolver-1.7.3-source-release.zip

diff --git a/maven-resolver-1.6.3-source-release.zip b/maven-resolver-1.6.3-source-release.zip
deleted file mode 100644
index 2588387..0000000
--- a/maven-resolver-1.6.3-source-release.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:352359ccb5dc86706433e19b21aabbb5c07a557312b31243fee0e222ec987405
-size 1368933
diff --git a/maven-resolver-1.7.3-source-release.zip b/maven-resolver-1.7.3-source-release.zip
new file mode 100644
index 0000000..82d61a3
--- /dev/null
+++ b/maven-resolver-1.7.3-source-release.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79a42b05fd326845435f007cfd7cd2bd82c4a7cb1723f7f7cdfbdbd29c91da2d
+size 1463642
diff --git a/maven-resolver-build.tar.xz b/maven-resolver-build.tar.xz
index 26805bc..5fb3f05 100644
--- a/maven-resolver-build.tar.xz
+++ b/maven-resolver-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc50d72bb912d00aed4b5c25bb57ef3aadc8061d0c96abd4594133a2202f1f9c
-size 5536
+oid sha256:fae67c97853fef2ad08a92e9f8fa496e5b0eee8c4ac636476610c99ecc8afad3
+size 5736
diff --git a/maven-resolver.changes b/maven-resolver.changes
index e0de0af..58cade8 100644
--- a/maven-resolver.changes
+++ b/maven-resolver.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 11 12:10:26 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 1.7.3
+  * Change of API and incompatible with maven-resolver < 1.7
+
 -------------------------------------------------------------------
 Thu Jan 13 17:38:54 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-resolver.spec b/maven-resolver.spec
index e691ad1..fd75ca2 100644
--- a/maven-resolver.spec
+++ b/maven-resolver.spec
@@ -19,18 +19,19 @@
 %define _buildshell /bin/bash
 %bcond_with tests
 Name:           maven-resolver
-Version:        1.6.3
+Version:        1.7.3
 Release:        0
 Summary:        Apache Maven Artifact Resolver library
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://maven.apache.org/resolver/
+URL:            https://maven.apache.org/resolver/
 Source0:        http://archive.apache.org/dist/maven/resolver/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.tar.xz
 BuildRequires:  ant
 BuildRequires:  apache-commons-lang3
 BuildRequires:  atinject
 BuildRequires:  fdupes
+BuildRequires:  glassfish-annotation-api
 BuildRequires:  google-guice
 BuildRequires:  httpcomponents-client
 BuildRequires:  httpcomponents-core
@@ -84,6 +85,13 @@ Group:          Development/Libraries/Java
 %description util
 A collection of utility classes to ease usage of the repository system.
 
+%package named-locks
+Summary:        Maven Artifact Resolver Named Locks
+Group:          Development/Libraries/Java
+
+%description named-locks
+A synchronization utility implementation using Named locks
+
 %package impl
 Summary:        Maven Artifact Resolver Implementation
 Group:          Development/Libraries/Java
@@ -143,14 +151,17 @@ This package provides %{summary}.
 %prep
 %setup -q -a1
 
-# pointless plugin
-%pom_remove_plugin :maven-enforcer-plugin
+# requires internet connection
+rm maven-resolver-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
 
-# tests require jetty 7
-%pom_remove_dep :::test maven-resolver-transport-http
-rm -r maven-resolver-transport-http/src/test
+%pom_remove_plugin -r :bnd-maven-plugin
+%pom_remove_plugin -r org.codehaus.mojo:animal-sniffer-maven-plugin
+%pom_remove_plugin -r org.apache.maven.plugins:maven-enforcer-plugin
 
 %pom_disable_module maven-resolver-demos
+%pom_disable_module maven-resolver-named-locks-hazelcast
+%pom_disable_module maven-resolver-named-locks-redisson
+%pom_disable_module maven-resolver-transport-classpath
 
 # generate OSGi manifests
 for pom in $(find -mindepth 2 -name pom.xml) ; do
@@ -216,10 +227,10 @@ build-jar-repository -s lib \
 %endif
   package javadoc
 
-%mvn_artifact pom.xml
+%{mvn_artifact} pom.xml
 
 mkdir -p target/site/apidocs
-for i in api spi test-util util impl connector-basic transport-classpath transport-file transport-http transport-wagon; do
+for i in api spi test-util util named-locks impl connector-basic transport-classpath transport-file transport-http transport-wagon; do
   cp -r %{name}-${i}/target/site/apidocs target/site/apidocs/%{name}-${i}
   %{mvn_artifact} %{name}-${i}/pom.xml %{name}-${i}/target/%{name}-${i}-%{version}.jar
 done
@@ -238,6 +249,8 @@ done
 
 %files util -f .mfiles-util
 
+%files named-locks -f .mfiles-named-locks
+
 %files impl -f .mfiles-impl
 
 %files test-util -f .mfiles-test-util