Sync from SUSE:SLFO:Main cdi-api revision baa748097fa4adc834f83ec23f92bf19

2024-05-03 11:31:56 +02:00 · 2024-05-03 11:31:56 +02:00 · 608a066eed
commit 608a066eed
7 changed files with 357 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -0,0 +1,23 @@
+## Default LFS
+*.7z filter=lfs diff=lfs merge=lfs -text
+*.bsp filter=lfs diff=lfs merge=lfs -text
+*.bz2 filter=lfs diff=lfs merge=lfs -text
+*.gem filter=lfs diff=lfs merge=lfs -text
+*.gz filter=lfs diff=lfs merge=lfs -text
+*.jar filter=lfs diff=lfs merge=lfs -text
+*.lz filter=lfs diff=lfs merge=lfs -text
+*.lzma filter=lfs diff=lfs merge=lfs -text
+*.obscpio filter=lfs diff=lfs merge=lfs -text
+*.oxt filter=lfs diff=lfs merge=lfs -text
+*.pdf filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
+*.rpm filter=lfs diff=lfs merge=lfs -text
+*.tbz filter=lfs diff=lfs merge=lfs -text
+*.tbz2 filter=lfs diff=lfs merge=lfs -text
+*.tgz filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
+*.txz filter=lfs diff=lfs merge=lfs -text
+*.whl filter=lfs diff=lfs merge=lfs -text
+*.xz filter=lfs diff=lfs merge=lfs -text
+*.zip filter=lfs diff=lfs merge=lfs -text
+*.zst filter=lfs diff=lfs merge=lfs -text
--- a/0001-Remove-dependency-on-glassfish-el.patch
+++ b/0001-Remove-dependency-on-glassfish-el.patch
@ -0,0 +1,52 @@
+From b8570328d6d781b9f7fd96381423c4b3cef352fe Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Wed, 18 Sep 2019 11:54:36 +0200
+Subject: [PATCH] Remove dependency on glassfish-el
+
+---
+ .../enterprise/inject/spi/BeanManager.java    | 22 -------------------
+ 1 file changed, 22 deletions(-)
+
+diff --git a/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java b/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
+index 29c62af..b467727 100644
+--- a/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
+++ b/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java
+@@ -17,8 +17,6 @@
+ 
+ package javax.enterprise.inject.spi;
+ 
+-import javax.el.ELResolver;
+-import javax.el.ExpressionFactory;
+ import javax.enterprise.context.ContextNotActiveException;
+ import javax.enterprise.context.spi.Context;
+ import javax.enterprise.context.spi.Contextual;
+@@ -415,26 +413,6 @@ public interface BeanManager {
+      */
+     public Context getContext(Class<? extends Annotation> scopeType);
+ 
+-    /**
+-     * Returns a {@link javax.el.ELResolver} that resolves beans by EL name.
+-     * 
+-     * @return the {@link javax.el.ELResolver}
+-     */
+-    public ELResolver getELResolver();
+-
+-    /**
+-     * Returns a wrapper {@link javax.el.ExpressionFactory} that delegates {@link javax.el.MethodExpression} and
+-     * {@link javax.el.ValueExpression} creation to the given {@link javax.el.ExpressionFactory}. When a Unified EL expression
+-     * is evaluated using a {@link javax.el.MethodExpression} or {@link javax.el.ValueExpression} returned by the wrapper
+-     * {@link javax.el.ExpressionFactory}, the container handles destruction of objects with scope
+-     * {@link javax.enterprise.context.Dependent}.
+-     * 
+-     * 
+-     * @param expressionFactory the {@link javax.el.ExpressionFactory} to wrap
+-     * @return the wrapped {@link javax.el.ExpressionFactory}
+-     */
+-    public ExpressionFactory wrapExpressionFactory(ExpressionFactory expressionFactory);
+-
+     /**
+      * Obtain an {@link AnnotatedType} that may be used to read the annotations of the given class or interface.
+      * 
+-- 
+2.21.0
+
--- a/16
+++ b/16
@ -0,0 +1,16 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/cdi-spec/cdi</param>
+		<param name="revision">2.0.2</param>
+		<param name="versionformat">@PARENT_TAG@</param>
+		<param name="include">api</param>
+		<param name="include">LICENSE.txt</param>
+		<param name="include">README.md</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>
--- a/cdi-2.0.2.tar.xz
+++ b/cdi-2.0.2.tar.xz
--- a/cdi-api-build.xml
+++ b/cdi-api-build.xml
@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="cdi-api" default="package" basedir=".">
+
+  <!-- ====================================================================== -->
+  <!-- Build environment properties                                           -->
+  <!-- ====================================================================== -->
+
+  <property file="build.properties"/>
+
+  <property name="project.groupId" value="jakarta.enterprise"/>
+  <property name="project.artifactId" value="jakarta.enterprise.cdi-api"/>
+  <property name="project.version" value="2.0.2"/>
+  <property name="project.name" value="Jakarta CDI"/>
+  <property name="project.description" value="APIs for Jakarta CDI (Contexts and Dependency Injection)"/>
+  <property name="project.license.url" value="https://repository.jboss.org/licenses/apache-2.0.txt"/>
+  
+  <property name="project.organization.name" value="Eclipse Foundation"/>
+  <property name="project.organization.url" value="https://jakarta.ee"/>
+
+  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.target" value="${compiler.source}"/>
+
+  <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
+  <property name="build.dir" value="target"/>
+  <property name="build.outputDir" value="${build.dir}/classes"/>
+  <property name="build.srcDir" value="src/main/java"/>
+  <property name="build.resourceDir" value="src/main/resources"/>
+
+  <property name="reporting.outputDirectory" value="${build.dir}/site"/>
+
+  <!-- ====================================================================== -->
+  <!-- Defining classpaths                                                    -->
+  <!-- ====================================================================== -->
+
+  <path id="build.classpath">
+    <fileset dir="lib">
+      <include name="**/*"/>
+    </fileset>
+  </path>
+
+  <!-- ====================================================================== -->
+  <!-- Cleaning up target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="clean" description="Clean the output directory">
+    <delete dir="${build.dir}"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Compilation target                                                     -->
+  <!-- ====================================================================== -->
+
+  <target name="compile" description="Compile the code">
+    <mkdir dir="${build.outputDir}"/>
+    <javac destdir="${build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           target="${compiler.target}" 
+           verbose="false" 
+           fork="false" 
+           source="${compiler.source}">
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <copy todir="${build.outputDir}">
+      <fileset dir="${build.resourceDir}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Javadoc target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="javadoc" description="Generates the Javadoc of the application">
+    <javadoc sourcepath="${build.srcDir}" 
+             packagenames="*" 
+             destdir="${reporting.outputDirectory}/apidocs" 
+             access="protected" 
+             verbose="false" 
+             version="true" 
+             use="true" 
+             author="true" 
+             splitindex="false" 
+             nodeprecated="false" 
+             nodeprecatedlist="false" 
+             notree="false" 
+             noindex="false" 
+             nohelp="false" 
+             nonavbar="false" 
+             serialwarn="false" 
+             charset="ISO-8859-1" 
+             linksource="false" 
+             breakiterator="false" 
+             source="${compiler.source}"
+             classpathref="build.classpath"/>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Package target                                                         -->
+  <!-- ====================================================================== -->
+
+  <target name="package" depends="compile" description="Package the application">
+    <jar jarfile="${build.dir}/${build.finalName}.jar" 
+         compress="true" 
+         index="false" 
+         basedir="${build.outputDir}" 
+         excludes="**/package.html">
+      <manifest>
+		<attribute name="Bundle-Description" value="${project.description}"/>
+		<attribute name="Bundle-DocURL" value="${project.organization.url}"/>
+		<attribute name="Bundle-License" value="${project.license.url}"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-Name" value="${project.name}"/>
+		<attribute name="Bundle-SymbolicName" value="${project.artifactId}"/>
+		<attribute name="Bundle-Vendor" value="${project.organization.name}"/>
+		<attribute name="Bundle-Version" value="${project.version}"/>
+		<attribute name="Export-Package" value="javax.decorator;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.inject&quot;,javax.enterprise.context.control;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.context,javax.interceptor&quot;,javax.enterprise.context.spi;version=&quot;2.0&quot;,javax.enterprise.context;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.util,javax.inject&quot;,javax.enterprise.event;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.util&quot;,javax.enterprise.inject.literal;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.util,javax.inject&quot;,javax.enterprise.inject.se;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.inject,javax.enterprise.inject.spi&quot;,javax.enterprise.inject.spi.configurator;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.enterprise.inject.spi,javax.enterprise.util&quot;,javax.enterprise.inject.spi;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.enterprise.inject.spi.configurator,javax.interceptor&quot;,javax.enterprise.inject;version=&quot;2.0&quot;;uses:=&quot;javax.enterprise.context,javax.enterprise.util,javax.inject&quot;,javax.enterprise.util;version=&quot;2.0&quot;"/>
+		<attribute name="Import-Package" value="javax.enterprise.context.spi;version=&quot;[2.0,3)&quot;,javax.enterprise.context;version=&quot;[2.0,3)&quot;,javax.enterprise.event;version=&quot;[2.0,3)&quot;,javax.enterprise.inject.spi.configurator;version=&quot;[2.0,3)&quot;,javax.enterprise.inject.spi;version=&quot;[2.0,3)&quot;,javax.enterprise.inject;version=&quot;[2.0,3)&quot;,javax.enterprise.util;version=&quot;[2.0,3)&quot;,javax.inject,javax.interceptor;version=&quot;[1.2,2)&quot;"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
+	  </manifest>
+	</jar>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- A dummy target for the package named after the type it creates         -->
+  <!-- ====================================================================== -->
+
+  <target name="jar" depends="package" description="Builds the jar for the application"/>
+
+</project>
--- a/cdi-api.changes
+++ b/cdi-api.changes
@ -0,0 +1,37 @@
+-------------------------------------------------------------------
+Mon Apr  4 04:30:33 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upsteam release 2.0.2
+  * No changelog was made available.
+- Added patch:
+  * 0001-Remove-dependency-on-glassfish-el.patch
+    + patch out the two el wrapper functions that are unused
+
+-------------------------------------------------------------------
+Sun Mar 20 19:41:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with java source and target levels 8
+
+-------------------------------------------------------------------
+Sat Apr  6 22:29:10 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Use _service instead of custom create-tarball.sh.
+- Avoid double-shipping license file.
+
+-------------------------------------------------------------------
+Wed Apr  3 10:59:32 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Generate the tarball and pack only the api part, to avoid
+  distributing non-distribuable content
+ 
+-------------------------------------------------------------------
+Wed Mar 27 09:31:47 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Replace summary by something that speaks more than two
+  acronyms.
+
+-------------------------------------------------------------------
+Wed Mar 27 06:41:00 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Initial packaging of cdi-api 1.2
+- Generate and customize the ant build.xml file
--- a/cdi-api.spec
+++ b/cdi-api.spec
@ -0,0 +1,91 @@
+#
+# spec file for package cdi-api
+#
+# Copyright (c) 2022 SUSE LLC
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
+#
+
+
+Name:           cdi-api
+Version:        2.0.2
+Release:        0
+Summary:        Contexts and Dependency Injection for Java EE
+License:        Apache-2.0
+Group:          Development/Libraries/Java
+URL:            https://seamframework.org/Weld
+Source0:        cdi-%{version}.tar.xz
+Source1:        %{name}-build.xml
+Patch0:         0001-Remove-dependency-on-glassfish-el.patch
+BuildRequires:  ant
+BuildRequires:  atinject
+BuildRequires:  fdupes
+BuildRequires:  javapackages-local
+BuildRequires:  jboss-interceptors-1.2-api
+Requires:       mvn(javax.inject:javax.inject)
+Requires:       mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
+BuildArch:      noarch
+
+%description
+APIs for JSR-299: Contexts and Dependency Injection for Java EE
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Documentation/HTML
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q -n cdi-%{version}
+%patch0 -p1
+cp %{SOURCE1} api/build.xml
+
+# Use newer version of interceptors API
+%pom_change_dep "jakarta.interceptor:jakarta.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec" api
+
+%pom_remove_parent api
+%pom_remove_dep :jakarta.el-api api
+
+%build
+pushd api/
+mkdir -p lib
+build-jar-repository -s lib javax.inject jboss-interceptors-1.2-api
+%{ant} jar javadoc
+popd
+
+%install
+# jar
+install -dm 0755 %{buildroot}%{_javadir}/%{name}
+install -pm 0644 api/target/jakarta.enterprise.cdi-api-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
+install -dm 0755 %{buildroot}%{_javadir}/javax.enterprise.inject
+ln -sf ../%{name}/%{name}.jar %{buildroot}%{_javadir}/javax.enterprise.inject/%{name}.jar
+
+# pom
+install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
+install -pm 0644 api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
+%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "javax.enterprise:cdi-api"
+# javadoc
+install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}
+
+%files -f .mfiles
+%{_javadir}/javax.enterprise.inject
+%license LICENSE.txt
+%doc README.md
+
+%files javadoc
+%{_javadocdir}/%{name}
+%license LICENSE.txt
+
+%changelog