From dae76ecd4838e8da8a22e32930ac46c1841090f0e1bcd892907aa1a8d2851f1f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 7 Jun 2024 12:12:14 +0000 Subject: [PATCH 1/4] 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} From abbf284546398362fd0b100c616c1dc6163e90beaeef33b88b736c79ba418c96 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 7 Jun 2024 12:17:40 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/atinject?expand=0&rev=32 --- atinject.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/atinject.spec b/atinject.spec index af137d8..b10a33c 100644 --- a/atinject.spec +++ b/atinject.spec @@ -55,8 +55,9 @@ cp %{SOURCE1} build.xml %install # jars install -dm 755 %{buildroot}%{_javadir}/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 +install -m 0644 target/jakarta.inject-api-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +(cd %{buildroot}%{_javadir}/javax.inject && ln -s ../%{name}.jar .) +%add_maven_depmap javax.inject:javax.inject:%{version} %{name}.jar # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name} @@ -65,6 +66,7 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %files -f .mfiles %license LICENSE.txt NOTICE.md +%{_javadir}/javax.inject %files javadoc %{_javadocdir}/%{name} From 359781cfeb6217b13727f7a8245e0456d11da2ba9a6a4164b3c2197153fb23a6 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 7 Jun 2024 16:59:56 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/atinject?expand=0&rev=33 --- atinject-build.xml | 4 ++-- atinject.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atinject-build.xml b/atinject-build.xml index 1fd23dd..2c465ce 100644 --- a/atinject-build.xml +++ b/atinject-build.xml @@ -8,8 +8,8 @@ - - + + diff --git a/atinject.spec b/atinject.spec index b10a33c..00b76e6 100644 --- a/atinject.spec +++ b/atinject.spec @@ -55,7 +55,7 @@ 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 +install -m 0644 target/javax.inject-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar (cd %{buildroot}%{_javadir}/javax.inject && ln -s ../%{name}.jar .) %add_maven_depmap javax.inject:javax.inject:%{version} %{name}.jar From 3c17db68ed268e51a7a6c80c7faba7d5f95a61714f782d7c5b792c5084e5a9a1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 7 Jun 2024 17:17:02 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/atinject?expand=0&rev=34 --- atinject-build.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/atinject-build.xml b/atinject-build.xml index 2c465ce..35485de 100644 --- a/atinject-build.xml +++ b/atinject-build.xml @@ -123,8 +123,7 @@ - - +