diff --git a/.cdi-api.metadata b/.cdi-api.metadata index 7edc7b0..217608b 100644 --- a/.cdi-api.metadata +++ b/.cdi-api.metadata @@ -1 +1 @@ -f11bb11a6e280c65c16641861667179ee34ffa68 SOURCES/2.0.1.tar.gz +43043d92152899310b0aa092ad99f99a945700a5 SOURCES/2.0.2.tar.gz diff --git a/.gitignore b/.gitignore index 845df14..7155921 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/2.0.1.tar.gz +SOURCES/2.0.2.tar.gz diff --git a/SOURCES/0001-Remove-dependency-on-glassfish-el.patch b/SOURCES/0001-Remove-dependency-on-glassfish-el.patch deleted file mode 100644 index c6d578b..0000000 --- a/SOURCES/0001-Remove-dependency-on-glassfish-el.patch +++ /dev/null @@ -1,52 +0,0 @@ -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/SPECS/cdi-api.spec b/SPECS/cdi-api.spec index d910841..12d2c81 100644 --- a/SPECS/cdi-api.spec +++ b/SPECS/cdi-api.spec @@ -1,61 +1,127 @@ -Name: cdi-api -Version: 2.0.1 -Release: 3%{?dist} -Summary: CDI API -License: ASL 2.0 -URL: http://seamframework.org/Weld -BuildArch: noarch +%bcond_with bootstrap -Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz +Name: cdi-api +Version: 2.0.2 +Release: 16%{?dist} +Summary: Jakarta Contexts and Dependency Injection +License: Apache-2.0 +URL: https://jakarta.ee/specifications/cdi/2.0/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Patch1: 0001-Remove-dependency-on-glassfish-el.patch +Source0: https://github.com/jakartaee/cdi/archive/%{version}.tar.gz -BuildRequires: maven-local-openjdk8 -BuildRequires: %{?module_prefix}mvn(javax.inject:javax.inject) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.surefire:surefire-testng) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec) -BuildRequires: mvn(org.jboss.weld:weld-parent:pom:) -BuildRequires: mvn(org.testng:testng::jdk15:) +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +%endif + +Provides: jakarta-cdi2.0 = %{version}-%{release} %description -APIs for JSR-299: Contexts and Dependency Injection for Java EE +Jakarta Contexts Dependency Injection specifies a means for obtaining +objects in such a way as to maximize reusability, testability and +maintainability compared to traditional approaches such as +constructors, factories, and service locators (e.g., JNDI). -%{?module_package} %{?javadoc_package} %prep -%setup -q -n cdi-%{version}/api +%autosetup -p1 -n cdi-%{version} -%patch1 -p2 +%pom_remove_parent +%pom_remove_parent api +%pom_xpath_set pom:project/pom:groupId javax.enterprise api +%pom_xpath_set pom:project/pom:artifactId cdi-api api +%pom_disable_module spec +%pom_remove_plugin -r :maven-javadoc-plugin -# J2EE API directory -%mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1 +%pom_change_dep jakarta.inject:jakarta.inject-api javax.inject:javax.inject api +%pom_remove_dep :jakarta.el-api api +%pom_remove_dep :jakarta.interceptor-api api +rm -rf api/src/main/java/javax/enterprise/{context/,inject/spi/,inject/se/,inject/Model.java,inject/New.java} -%pom_remove_dep :jakarta.el-api - -# Use newer version of interceptors API -%pom_change_dep :jakarta.interceptor-api org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec::provided - -# Fix failing tests -%pom_xpath_remove 'pom:configuration/pom:argLine' - -%mvn_alias jakarta.enterprise:jakarta.enterprise.cdi-api javax.enterprise:cdi-api +%mvn_package :cdi-parent __noinstall %build -%mvn_build -- -Denforcer.skip +%mvn_build -f %install %mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles -%doc ../spec/src/main/asciidoc/cdi-spec.asciidoc -%license ../spec/src/main/asciidoc/license-asl2.asciidoc -%license ../spec/src/main/asciidoc/license-jcp-final.asciidoc +%files -f .mfiles +%doc README.md +%license LICENSE.txt %changelog +* Wed Dec 18 2024 Mikolaj Izdebski - 2.0.2-16 +- Sync with Fedora + +* Tue Oct 29 2024 Troy Dawson - 2.0.2-15 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Thu Aug 01 2024 Troy Dawson - 2.0.2-14 +- Bump release for Aug 2024 java mass rebuild + +* Mon Jun 24 2024 Troy Dawson - 2.0.2-13 +- Bump release for June 2024 mass rebuild + +* Tue Jan 23 2024 Fedora Release Engineering - 2.0.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 2.0.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 2.0.2-10 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 2.0.2-9 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 2.0.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 2.0.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 2.0.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 2.0.2-5 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 2.0.2-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Aug 23 2020 Fabio Valentini - 2.0-1 +- Update to version 2.0. + +* Mon Jul 27 2020 Fedora Release Engineering - 1.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.2-13 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Sat May 16 2020 Mikolaj Izdebski - 2.0.2-1 +- Update to upstream version 2.0.2 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 25 2020 Mikolaj Izdebski - 2.0.1-3 - Build with OpenJDK 8 @@ -65,9 +131,18 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE * Wed Sep 18 2019 Marian Koncek - 2.0.1-1 - Update to upstream version 2.0.1 +* Wed Jul 24 2019 Fedora Release Engineering - 1.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 1.2-9 - Mass rebuild for javapackages-tools 201901 +* Thu Jan 31 2019 Fedora Release Engineering - 1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Apr 18 2018 Mikolaj Izdebski - 1.2-8 - Remove javax.enterprise.inject directory and provides