From 59306aef87aaaf9e57652c2ef54e00cb26d5c4ac Mon Sep 17 00:00:00 2001 From: fstrba <> Date: Jun 11 2024 16:36:46 +0000 Subject: Update jakarta-inject to version 2.0.1 / rev 2 via SR 1179897 https://build.opensuse.org/request/show/1179897 by user fstrba + anag+factory Fix bundle manifest put to adi:2 --- diff --git a/.files b/.files index a2f2de7..a24513a 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 403028b..61b0c55 100644 --- a/.rev +++ b/.rev @@ -7,4 +7,13 @@ <comment>new package</comment> <requestid>1179677</requestid> </revision> + <revision rev="2" vrev="2"> + <srcmd5>69507052417b0e0cf6a005af1a65b9bb</srcmd5> + <version>2.0.1</version> + <time>1718123265</time> + <user>anag+factory</user> + <comment>Fix bundle manifest +put to adi:2</comment> + <requestid>1179897</requestid> + </revision> </revisionlist> diff --git a/jakarta-inject-build.xml b/jakarta-inject-build.xml index e1e997d..ba0a469 100644 --- a/jakarta-inject-build.xml +++ b/jakarta-inject-build.xml @@ -12,6 +12,8 @@ <property name="project.artifactId" value="jakarta.inject-api"/> <property name="project.version" value="2.0.1"/> + <property name="spec.version" value="2.0"/> + <property name="compiler.release" value="8"/> <property name="compiler.source" value="1.${compiler.release}"/> <property name="compiler.target" value="${compiler.source}"/> @@ -53,7 +55,7 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <exclude name="**/module-info.java"/> + <exclude name="**/module-info.java"/> </javac> <!-- compile the module-info.java --> <javac destdir="${build.outputDir}" @@ -68,7 +70,7 @@ <src> <pathelement location="${build.srcDir}"/> </src> - <include name="**/module-info.java"/> + <include name="**/module-info.java"/> </javac> <mkdir dir="${build.outputDir}/META-INF"/> <copy todir="${build.outputDir}/META-INF"> @@ -117,20 +119,20 @@ basedir="${build.outputDir}" excludes="**/package.html"> <manifest> - <attribute name="Bundle-Description" value="Jakarta Dependency Injection"/> - <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/> - <attribute name="Bundle-ManifestVersion" value="2"/> - <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-Version" value="${project.version}"/> - <attribute name="Export-Package" value="javax.inject;version="${project.version}""/> - <attribute name="Implementation-Version" value="1.1"/> - <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> - <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> - <attribute name="JavaPackages-Version" value="${project.version}"/> - <attribute name="Multi-Release" value="true"/> - <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> + <attribute name="Bundle-Description" value="Jakarta Dependency Injection"/> + <attribute name="Bundle-DocURL" value="https://www.eclipse.org"/> + <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/> + <attribute name="Bundle-ManifestVersion" value="2"/> + <attribute name="Bundle-Name" value="Jakarta Dependency Injection"/> + <attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/> + <attribute name="Bundle-Vendor" value="Eclipse Foundation"/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="jakarta.inject;version="${project.version}""/> + <attribute name="Implementation-Version" value="${spec.version}"/> + <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> + <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> + <attribute name="JavaPackages-Version" value="${project.version}"/> + <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> </manifest> </jar> </target> diff --git a/jakarta-inject.changes b/jakarta-inject.changes index 3ff451a..9183190 100644 --- a/jakarta-inject.changes +++ b/jakarta-inject.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jun 11 07:03:48 UTC 2024 - Fridrich Strba <fstrba@suse.com> + +- Fix bundle manifest + +------------------------------------------------------------------- Fri Jun 7 17:07:24 UTC 2024 - Fridrich Strba <fstrba@suse.com> - Initial packaging of version 2.0.1