SLFO-pool/atinject
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync from SUSE:SLFO:Main atinject revision 399b4b3a91b5f7feac66d980f75c32dd

Browse Source
This commit is contained in:
Adrian Schröter 2024-06-12 22:29:00 +02:00
parent dcb9d2cc68
commit 29d3f8a64d
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
atinject-build.xml
View File

@ -8,8 +8,8 @@
<property file="build.properties"/> <property file="build.properties"/>
<property name="project.groupId" value="jakarta.inject"/> <property name="project.groupId" value="javax.inject"/>
<property name="project.artifactId" value="jakarta.inject-api"/> <property name="project.artifactId" value="javax.inject"/>
<property name="project.version" value="1.0.5"/> <property name="project.version" value="1.0.5"/>
<property name="compiler.release" value="8"/> <property name="compiler.release" value="8"/>
@ -123,8 +123,7 @@
<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/> <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
<attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-Name" value="Jakarta Dependency Injection"/> <attribute name="Bundle-Name" value="Jakarta Dependency Injection"/>
<attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/> <attribute name="Bundle-SymbolicName" value="javax.inject"/>
<!-- <attribute name="Bundle-SymbolicName" value="javax.inject"/> -->
<attribute name="Bundle-Version" value="${project.version}"/> <attribute name="Bundle-Version" value="${project.version}"/>
<attribute name="Export-Package" value="javax.inject;version=&quot;${project.version}&quot;"/> <attribute name="Export-Package" value="javax.inject;version=&quot;${project.version}&quot;"/>
<attribute name="Implementation-Version" value="1.1"/> <attribute name="Implementation-Version" value="1.1"/>

7
atinject.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Jun 7 12:10:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com> Wed Apr 10 08:19:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>

8
atinject.spec
View File

@ -55,13 +55,9 @@ cp %{SOURCE1} build.xml
%install %install
# jars # jars
install -dm 755 %{buildroot}%{_javadir}/javax.inject 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 .) (cd %{buildroot}%{_javadir}/javax.inject && ln -s ../%{name}.jar .)
%add_maven_depmap javax.inject:javax.inject:%{version} %{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
# javadoc # javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name} install -dm 755 %{buildroot}%{_javadocdir}/%{name}