commit 608a066eed7ed42c6cf91b8173cf6e7664d40fe34dcce015e738e6325505906a Author: Adrian Schröter Date: Fri May 3 11:31:56 2024 +0200 Sync from SUSE:SLFO:Main cdi-api revision baa748097fa4adc834f83ec23f92bf19 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ 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 diff --git a/0001-Remove-dependency-on-glassfish-el.patch b/0001-Remove-dependency-on-glassfish-el.patch new file mode 100644 index 0000000..fe88f77 --- /dev/null +++ b/0001-Remove-dependency-on-glassfish-el.patch @@ -0,0 +1,52 @@ +From b8570328d6d781b9f7fd96381423c4b3cef352fe Mon Sep 17 00:00:00 2001 +From: Marian Koncek +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 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 + diff --git a/_service b/_service new file mode 100644 index 0000000..46abc1c --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + git + https://github.com/cdi-spec/cdi + 2.0.2 + @PARENT_TAG@ + api + LICENSE.txt + README.md + + + *.tar + xz + + + diff --git a/cdi-2.0.2.tar.xz b/cdi-2.0.2.tar.xz new file mode 100644 index 0000000..0919c62 --- /dev/null +++ b/cdi-2.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84f34e2344d0fe01aa23dd7835189380dc9dfa012fede35458658775b606f8ac +size 66452 diff --git a/cdi-api-build.xml b/cdi-api-build.xml new file mode 100644 index 0000000..a3403ea --- /dev/null +++ b/cdi-api-build.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cdi-api.changes b/cdi-api.changes new file mode 100644 index 0000000..00f858b --- /dev/null +++ b/cdi-api.changes @@ -0,0 +1,37 @@ +------------------------------------------------------------------- +Mon Apr 4 04:30:33 UTC 2022 - Fridrich Strba + +- 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 + +- Build with java source and target levels 8 + +------------------------------------------------------------------- +Sat Apr 6 22:29:10 UTC 2019 - Jan Engelhardt + +- Use _service instead of custom create-tarball.sh. +- Avoid double-shipping license file. + +------------------------------------------------------------------- +Wed Apr 3 10:59:32 UTC 2019 - Fridrich Strba + +- 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 + +- Replace summary by something that speaks more than two + acronyms. + +------------------------------------------------------------------- +Wed Mar 27 06:41:00 UTC 2019 - Fridrich Strba + +- Initial packaging of cdi-api 1.2 +- Generate and customize the ant build.xml file diff --git a/cdi-api.spec b/cdi-api.spec new file mode 100644 index 0000000..245b3a9 --- /dev/null +++ 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