pool/cdi-api
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/cdi-api?expand=0&rev=15

Browse Source
This commit is contained in:
Fridrich Strba 2022-04-03 11:23:14 +00:00 committed by Git OBS Bridge
parent 413a84a65b
commit 4b5966980b
6 changed files with 50 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0001-Remove-dependency-on-glassfish-el.patch
View File

@ -1,22 +1,33 @@
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 96ba6ae..e3faacd 100644
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
@@ -22,8 +22,6 @@ import java.lang.reflect.Type;
import java.util.List;
import java.util.Set;
@@ -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;
@@ -407,24 +405,6 @@ public interface BeanManager {
@@ -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();
-
@ -36,3 +47,6 @@ index 96ba6ae..e3faacd 100644
/**
* Obtain an {@link AnnotatedType} that may be used to read the annotations of the given class or interface.
*
--
2.21.0

4
_service
View File

@ -2,9 +2,11 @@
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/cdi-spec/cdi</param>
<param name="revision">1.2</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>

3
cdi-1.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c8a60a1c5591edecbd50796462ffae66fc5994bd2a3789a03e829903f45552fc
size 46596

BIN
cdi-2.0.2.tar.xz (Stored with Git LFS) Normal file
View File

Binary file not shown.

34
cdi-api-build.xml
View File

@ -8,22 +8,16 @@
<property file="build.properties"/>
<property name="project.groupId" value="javax.enterprise"/>
<property name="project.artifactId" value="cdi-api"/>
<property name="project.version" value="1.2"/>
<property name="project.name" value="CDI APIs"/>
<property name="project.description" value="APIs for CDI (Contexts and Dependency Injection for Java EE)"/>
<property name="project.url" value="http://cdi-spec.org"/>
<property name="project.license.url" value="http://www.apache.org/licenses/LICENSE-2.0.html"/>
<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="JBoss by Red Hat, Inc."/>
<property name="project.organization.url" value="http://jboss.org"/>
<property name="project.organization.name" value="Eclipse Foundation"/>
<property name="project.organization.url" value="https://jakarta.ee"/>
<property name="bundle.version" value="${project.version}.0"/>
<property name="spec.title" value="JSR-346 Contexts and Dependency Injection for the Java EE platform"/>
<property name="spec.version" value="${project.version}"/>
<property name="compiler.source" value="1.8"/>
<property name="compiler.target" value="${compiler.source}"/>
@ -122,16 +116,12 @@
<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.groupId}.${project.artifactId}"/>
<attribute name="Bundle-SymbolicName" value="${project.artifactId}"/>
<attribute name="Bundle-Vendor" value="${project.organization.name}"/>
<attribute name="Bundle-Version" value="${bundle.version}"/>
<attribute name="Export-Package" value="javax.decorator;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.inject&quot;,javax.enterprise.context;version=&quot;1.1&quot;;uses:=&quot;javax.inject&quot;,javax.enterprise.context.spi;version=&quot;1.1&quot;,javax.enterprise.event;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.util&quot;,javax.enterprise.inject;version=&quot;1.1&quot;;uses:=&quot;javax.enterprise.context,javax.enterprise.util,javax.inject&quot;,javax.enterprise.inject.spi;version=&quot;1.1&quot;;uses:=&quot;javax.el,javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.interceptor&quot;,javax.enterprise.util;version=&quot;1.1&quot;"/>
<attribute name="Implementation-Title" value="${project.name}"/>
<attribute name="Implementation-Version" value="${project.version}"/>
<attribute name="Import-Package" value="javax.enterprise.context;version=&quot;[1.1,2)&quot;,javax.enterprise.context.spi;version=&quot;[1.1,2)&quot;,javax.enterprise.event;version=&quot;[1.1,2)&quot;,javax.enterprise.inject;version=&quot;[1.1,2)&quot;,javax.enterprise.util;version=&quot;[1.1,2)&quot;,javax.inject;version=&quot;[1.0,2)&quot;,javax.interceptor;version=&quot;[${project.version},2)&quot;"/>
<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;"/>
<attribute name="Specification-Title" value="${spec.title}"/>
<attribute name="Specification-Version" value="${spec.version}"/>
</manifest>
</jar>
</target>

34
cdi-api.spec
View File

@ -17,7 +17,7 @@
Name: cdi-api
Version: 1.2
Version: 2.0.2
Release: 0
Summary: Contexts and Dependency Injection for Java EE
License: Apache-2.0
@ -25,7 +25,6 @@ Group: Development/Libraries/Java
URL: https://seamframework.org/Weld
Source0: cdi-%{version}.tar.xz
Source1: %{name}-build.xml
Source2: http://www.apache.org/licenses/LICENSE-2.0.txt
Patch0: 0001-Remove-dependency-on-glassfish-el.patch
BuildRequires: ant
BuildRequires: atinject
@ -49,17 +48,13 @@ This package contains the API documentation for %{name}.
%prep
%setup -q -n cdi-%{version}
%patch0 -p1
pushd api/
cp %{SOURCE1} build.xml
cp %{SOURCE2} LICENSE
%pom_remove_dep :javax.el-api
cp %{SOURCE1} api/build.xml
# Use newer version of interceptors API
%pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec"
%pom_change_dep "jakarta.interceptor:jakarta.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec" api
%pom_remove_parent
popd
%pom_remove_parent api
%pom_remove_dep :jakarta.el-api api
%build
pushd api/
@ -69,27 +64,24 @@ build-jar-repository -s lib javax.inject jboss-interceptors-1.2-api
popd
%install
pushd api/
# jar
install -dm 0755 %{buildroot}%{_javadir}/%{name}
install -dm 0755 %{buildroot}%{_javadir}/javax.enterprise.inject
install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
ln -sf ../%{name}/%{name}.jar %{buildroot}%{_javadir}/javax.enterprise.inject/%{name}.jar
install -pm 0644 api/target/jakarta.enterprise.cdi-api-%{version}.jar %{buildroot}%{_javadir}/%{name}/jakarta.enterprise.cdi-api.jar
# pom
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar
install -pm 0644 api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/jakarta.enterprise.cdi-api.pom
%add_maven_depmap %{name}/jakarta.enterprise.cdi-api.pom %{name}/jakarta.enterprise.cdi-api.jar -a "javax.enterprise:cdi-api"
# javadoc
install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
popd
cp -pr api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
%fdupes -s %{buildroot}%{_javadocdir}
%files -f api/.mfiles
%license api/LICENSE
%{_javadir}/javax.enterprise.inject
%files -f .mfiles
%license LICENSE.txt
%doc README.md
%files javadoc
%{_javadocdir}/%{name}
%license LICENSE.txt
%changelog