From dae76ecd4838e8da8a22e32930ac46c1841090f0e1bcd892907aa1a8d2851f1f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 7 Jun 2024 12:12:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/atinject?expand=0&rev=31 --- atinject.changes | 7 +++++++ atinject.spec | 10 ++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/atinject.changes b/atinject.changes index 8496dae..18aba01 100644 --- a/atinject.changes +++ b/atinject.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jun 7 12:10:33 UTC 2024 - Fridrich Strba + +- Don't distribute as jakarta.inject:jakarta-inject-api artifact + to prevent conflicts with the version 2.x that actually has + classes in jakarta.inject namespace and thus is incompatible + ------------------------------------------------------------------- Wed Apr 10 08:19:26 UTC 2024 - Fridrich Strba diff --git a/atinject.spec b/atinject.spec index 2d948b8..af137d8 100644 --- a/atinject.spec +++ b/atinject.spec @@ -55,13 +55,8 @@ cp %{SOURCE1} build.xml %install # jars install -dm 755 %{buildroot}%{_javadir}/javax.inject -install -m 0644 target/jakarta.inject-api-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -(cd %{buildroot}%{_javadir}/javax.inject && ln -s ../%{name}.jar .) - -# pom -install -dm 755 %{buildroot}%{_mavenpomdir} -%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom %{name}.jar -a javax.inject:javax.inject +install -m 0644 target/jakarta.inject-api-%{version}.jar %{buildroot}%{_javadir}/javax.inject/%{name}.jar +%add_maven_depmap javax.inject:javax.inject:%{version} javax.inject/%{name}.jar # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} @@ -70,7 +65,6 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %files -f .mfiles %license LICENSE.txt NOTICE.md -%{_javadir}/javax.inject %files javadoc %{_javadocdir}/%{name}