diff --git a/atinject-build.xml b/atinject-build.xml index 1fd23dd..35485de 100644 --- a/atinject-build.xml +++ b/atinject-build.xml @@ -8,8 +8,8 @@ - - + + @@ -123,8 +123,7 @@ - - + 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..00b76e6 100644 --- a/atinject.spec +++ b/atinject.spec @@ -55,13 +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}/%{name}.jar +install -m 0644 target/javax.inject-%{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 +%add_maven_depmap javax.inject:javax.inject:%{version} %{name}.jar # javadoc install -dm 755 %{buildroot}%{_javadocdir}/%{name}