From 92871194c0a62d413fcd0b406f9e97ee16f09e5dd75d267c88b3f79d0cd1fc90 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 30 Mar 2022 10:14:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-resolver?expand=0&rev=31 --- maven-resolver.changes | 5 +++++ maven-resolver.spec | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/maven-resolver.changes b/maven-resolver.changes index d4e72d2..d944065 100644 --- a/maven-resolver.changes +++ b/maven-resolver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 30 10:13:22 UTC 2022 - Fridrich Strba + +- Build against the standalone JavaEE modules inconditionally + ------------------------------------------------------------------- Sat Mar 19 13:38:39 UTC 2022 - Fridrich Strba diff --git a/maven-resolver.spec b/maven-resolver.spec index 3859085..41cd953 100644 --- a/maven-resolver.spec +++ b/maven-resolver.spec @@ -31,6 +31,7 @@ BuildRequires: ant BuildRequires: apache-commons-lang3 BuildRequires: atinject BuildRequires: fdupes +BuildRequires: glassfish-annotation-api BuildRequires: google-guice BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core @@ -46,9 +47,6 @@ BuildRequires: unzip BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildArch: noarch -%if 0%{?suse_version} > 1500 -BuildRequires: glassfish-annotation-api -%endif %if %{with tests} BuildRequires: ant-junit BuildRequires: cglib @@ -190,10 +188,6 @@ done " -%if 0%{?suse_version} <= 1500 -%pom_remove_dep javax.annotation:javax.annotation-api maven-resolver-impl -%endif - %{mvn_package} :maven-resolver %{mvn_package} :maven-resolver-{*} @1 %{mvn_alias} 'org.apache.maven.resolver:maven-resolver{*}' 'org.eclipse.aether:aether@1' @@ -208,9 +202,7 @@ mkdir -p lib build-jar-repository -s lib \ atinject \ commons-lang3 \ -%if 0%{?suse_version} > 1500 glassfish-annotation-api \ -%endif guice/google-guice-no_aop \ httpcomponents/httpclient \ httpcomponents/httpcore \