diff --git a/.cdi-api.metadata b/.cdi-api.metadata new file mode 100644 index 0000000..7edc7b0 --- /dev/null +++ b/.cdi-api.metadata @@ -0,0 +1 @@ +f11bb11a6e280c65c16641861667179ee34ffa68 SOURCES/2.0.1.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845df14 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/2.0.1.tar.gz diff --git a/SOURCES/0001-Remove-dependency-on-glassfish-el.patch b/SOURCES/0001-Remove-dependency-on-glassfish-el.patch new file mode 100644 index 0000000..c6d578b --- /dev/null +++ b/SOURCES/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/SPECS/cdi-api.spec b/SPECS/cdi-api.spec new file mode 100644 index 0000000..d3cff33 --- /dev/null +++ b/SPECS/cdi-api.spec @@ -0,0 +1,164 @@ +Name: cdi-api +Version: 2.0.1 +Release: 2%{?dist} +Summary: CDI API +License: ASL 2.0 +URL: http://seamframework.org/Weld +BuildArch: noarch + +Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz + +Patch1: 0001-Remove-dependency-on-glassfish-el.patch + +BuildRequires: maven-local +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:) + +%description +APIs for JSR-299: Contexts and Dependency Injection for Java EE + +%{?module_package} +%{?javadoc_package} + +%prep +%setup -q -n cdi-%{version}/api + +%patch1 -p2 + +# J2EE API directory +%mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1 + +%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 + +%build +%mvn_build -- -Denforcer.skip + +%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 + +%changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0.1-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Sep 18 2019 Marian Koncek - 2.0.1-1 +- Update to upstream version 2.0.1 + +* Fri May 24 2019 Mikolaj Izdebski - 1.2-9 +- Mass rebuild for javapackages-tools 201901 + +* Wed Apr 18 2018 Mikolaj Izdebski - 1.2-8 +- Remove javax.enterprise.inject directory and provides + +* Wed Feb 07 2018 Fedora Release Engineering - 1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Sat Sep 23 2017 Mikolaj Izdebski - 1.2-6 +- Conditionally allow building without asciidoc + +* Wed Jul 26 2017 Fedora Release Engineering - 1.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Jun 16 2016 gil cattaneo 1.2-3 +- add missing build requires: pygmentize + +* Thu Jun 16 2016 gil cattaneo 1.2-2 +- add missing build requires + +* Mon Jun 06 2016 gil cattaneo 1.2-1 +- Upstream release 1.2 + +* Wed Feb 03 2016 Fedora Release Engineering - 1.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Oct 28 2015 Mat Booth - 1.1-12 +- Fix FTBFS due to enforcer plugin failure + +* Wed Jun 17 2015 Fedora Release Engineering - 1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed May 20 2015 gil cattaneo 1.1-10 +- rebuilt for upgrade el apis gid:aid (rhbz#1223468) +- adapt to current guideline +- use mvn()-like BRs +- fix rpmlint problem in changelog entries + +* Tue Mar 24 2015 Mikolaj Izdebski - 1.1-9 +- Fix interceptors symlink + +* Mon Mar 23 2015 Marek Goldmann - 1.1-8 +- Switch to interceptors 1.2 + +* Mon Nov 17 2014 Alexander Kurtakov 1.1-7 +- Rebuild to fix broken symlink to jboss-interceptors. + +* Sat Jun 07 2014 Fedora Release Engineering - 1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 28 2014 Michael Simacek - 1.1-5 +- Use Requires: java-headless rebuild (#1067528) + +* Tue Aug 13 2013 Stanislav Ochotnicky - 1.1-4 +- Add javax.enterprise.inject provides and directory + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jul 23 2013 Mikolaj Izdebski - 1.1-2 +- Generate OSGi metadata +- Resolves: rhbz#987111 + +* Thu Jul 04 2013 Marek Goldmann - 1.1-1 +- Upstream release 1.1 +- New guidelines + +* Sat Mar 02 2013 Mat Booth - 1.0-9.SP4 +- Add missing BR, fixes FTBFS rhbz #913916 + +* Wed Feb 13 2013 Fedora Release Engineering - 1.0-8.SP4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.0-7.SP4 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Dec 04 2012 Marek Goldmann - 1.0-6.SP4 +- Added missing BR + +* Tue Dec 04 2012 Marek Goldmann - 1.0-5.SP4 +- Added missing BR/R +- Simplified the spec file +- Removed unnecessary patch + +* Wed Jul 18 2012 Fedora Release Engineering - 1.0-4.SP4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sun Mar 25 2012 Asaf Shakarchi 1.0-3.SP4 +- Fixed changelog versions. + +* Fri Mar 16 2012 Asaf Shakarchi 1.0-2.SP4 +- Added required dependencies, modified patches and cleaned spec. + +* Mon Feb 20 2012 Marek Goldmann 1.0-1.SP4 +- Initial packaging