Initial import from Fedora
Related: rhbz#2064785
This commit is contained in:
Mikolaj Izdebski
parent
d1f988e4a6
commit
2345975f49
9
.gitignore
vendored
9
.gitignore
vendored
@ -0,0 +1,9 @@
|
|||||||
|
/results_*
|
||||||
|
/*.src.rpm
|
||||||
|
|
||||||
|
/cdi-api-1.0.SP4.tar.xz
|
||||||
|
/1.1.tar.gz
|
||||||
|
/1.2.tar.gz
|
||||||
|
/cdi-2.0.tar.gz
|
||||||
|
/2.0.1.tar.gz
|
||||||
|
/2.0.2.tar.gz
|
||||||
52
0001-Remove-dependency-on-glassfish-el.patch
Normal file
52
0001-Remove-dependency-on-glassfish-el.patch
Normal file
@ -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
|
||||||
|
|
||||||
205
cdi-api.spec
Normal file
205
cdi-api.spec
Normal file
@ -0,0 +1,205 @@
|
|||||||
|
%bcond_with bootstrap
|
||||||
|
|
||||||
|
Name: cdi-api
|
||||||
|
Version: 2.0.2
|
||||||
|
Release: 6%{?dist}
|
||||||
|
Summary: CDI API
|
||||||
|
License: ASL 2.0
|
||||||
|
URL: https://github.com/eclipse-ee4j/cdi
|
||||||
|
BuildArch: noarch
|
||||||
|
ExclusiveArch: %{java_arches} noarch
|
||||||
|
|
||||||
|
Source0: https://github.com/eclipse-ee4j/cdi/archive/%{version}.tar.gz
|
||||||
|
|
||||||
|
Patch1: 0001-Remove-dependency-on-glassfish-el.patch
|
||||||
|
|
||||||
|
%if %{with bootstrap}
|
||||||
|
BuildRequires: javapackages-bootstrap
|
||||||
|
%else
|
||||||
|
BuildRequires: maven-local
|
||||||
|
BuildRequires: %{?module_prefix}mvn(jakarta.inject:jakarta.inject-api)
|
||||||
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description
|
||||||
|
APIs for JSR-299: Contexts and Dependency Injection for Java EE
|
||||||
|
|
||||||
|
%{?javadoc_package}
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n cdi-%{version}
|
||||||
|
|
||||||
|
%pom_remove_parent
|
||||||
|
%pom_remove_parent api
|
||||||
|
%pom_disable_module spec
|
||||||
|
%pom_remove_plugin -r :maven-javadoc-plugin
|
||||||
|
|
||||||
|
%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}
|
||||||
|
|
||||||
|
%mvn_alias :jakarta.enterprise.cdi-api javax.enterprise:cdi-api
|
||||||
|
|
||||||
|
%build
|
||||||
|
%mvn_build -f
|
||||||
|
|
||||||
|
%install
|
||||||
|
%mvn_install
|
||||||
|
|
||||||
|
%files -f .mfiles
|
||||||
|
%doc README.md
|
||||||
|
%license LICENSE.txt
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.2-5
|
||||||
|
- Rebuilt for java-17-openjdk as system jdk
|
||||||
|
|
||||||
|
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.2-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.2-2
|
||||||
|
- Bootstrap build
|
||||||
|
- Non-bootstrap build
|
||||||
|
|
||||||
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Aug 23 2020 Fabio Valentini <decathorpe@gmail.com> - 2.0-1
|
||||||
|
- Update to version 2.0.
|
||||||
|
|
||||||
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.2-13
|
||||||
|
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||||
|
|
||||||
|
* Sat May 16 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.2-1
|
||||||
|
- Update to upstream version 2.0.2
|
||||||
|
|
||||||
|
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-3
|
||||||
|
- Build with OpenJDK 8
|
||||||
|
|
||||||
|
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-2
|
||||||
|
- Mass rebuild for javapackages-tools 201902
|
||||||
|
|
||||||
|
* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0.1-1
|
||||||
|
- Update to upstream version 2.0.1
|
||||||
|
|
||||||
|
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-9
|
||||||
|
- Mass rebuild for javapackages-tools 201901
|
||||||
|
|
||||||
|
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-8
|
||||||
|
- Remove javax.enterprise.inject directory and provides
|
||||||
|
|
||||||
|
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Sep 23 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-6
|
||||||
|
- Conditionally allow building without asciidoc
|
||||||
|
|
||||||
|
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 16 2016 gil cattaneo <puntogil@libero.it> 1.2-3
|
||||||
|
- add missing build requires: pygmentize
|
||||||
|
|
||||||
|
* Thu Jun 16 2016 gil cattaneo <puntogil@libero.it> 1.2-2
|
||||||
|
- add missing build requires
|
||||||
|
|
||||||
|
* Mon Jun 06 2016 gil cattaneo <puntogil@libero.it> 1.2-1
|
||||||
|
- Upstream release 1.2
|
||||||
|
|
||||||
|
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-13
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Oct 28 2015 Mat Booth <mat.booth@redhat.com> - 1.1-12
|
||||||
|
- Fix FTBFS due to enforcer plugin failure
|
||||||
|
|
||||||
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed May 20 2015 gil cattaneo <puntogil@libero.it> 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 <mizdebsk@redhat.com> - 1.1-9
|
||||||
|
- Fix interceptors symlink
|
||||||
|
|
||||||
|
* Mon Mar 23 2015 Marek Goldmann <mgoldman@redhat.com> - 1.1-8
|
||||||
|
- Switch to interceptors 1.2
|
||||||
|
|
||||||
|
* Mon Nov 17 2014 Alexander Kurtakov <akurtako@redhat.com> 1.1-7
|
||||||
|
- Rebuild to fix broken symlink to jboss-interceptors.
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 1.1-5
|
||||||
|
- Use Requires: java-headless rebuild (#1067528)
|
||||||
|
|
||||||
|
* Tue Aug 13 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1-4
|
||||||
|
- Add javax.enterprise.inject provides and directory
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 23 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-2
|
||||||
|
- Generate OSGi metadata
|
||||||
|
- Resolves: rhbz#987111
|
||||||
|
|
||||||
|
* Thu Jul 04 2013 Marek Goldmann <mgoldman@redhat.com> - 1.1-1
|
||||||
|
- Upstream release 1.1
|
||||||
|
- New guidelines
|
||||||
|
|
||||||
|
* Sat Mar 02 2013 Mat Booth <fedora@matbooth.co.uk> - 1.0-9.SP4
|
||||||
|
- Add missing BR, fixes FTBFS rhbz #913916
|
||||||
|
|
||||||
|
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-8.SP4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 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 <mgoldman@redhat.com> - 1.0-6.SP4
|
||||||
|
- Added missing BR
|
||||||
|
|
||||||
|
* Tue Dec 04 2012 Marek Goldmann <mgoldman@redhat.com> - 1.0-5.SP4
|
||||||
|
- Added missing BR/R
|
||||||
|
- Simplified the spec file
|
||||||
|
- Removed unnecessary patch
|
||||||
|
|
||||||
|
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4.SP4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Mar 25 2012 Asaf Shakarchi <asaf@redhat.com> 1.0-3.SP4
|
||||||
|
- Fixed changelog versions.
|
||||||
|
|
||||||
|
* Fri Mar 16 2012 Asaf Shakarchi <asaf@redhat.com> 1.0-2.SP4
|
||||||
|
- Added required dependencies, modified patches and cleaned spec.
|
||||||
|
|
||||||
|
* Mon Feb 20 2012 Marek Goldmann <mgoldman@redhat.com> 1.0-1.SP4
|
||||||
|
- Initial packaging
|
||||||
Loading…
Reference in New Issue
Block a user