4 changed files with 66 additions and 146 deletions
--- a/.cdi-api.metadata
+++ b/.cdi-api.metadata
@ -1 +1 @@
-43043d92152899310b0aa092ad99f99a945700a5 SOURCES/2.0.2.tar.gz
+85db06e7d2ff776ecf95aabf39bfbfcfc543380d SOURCES/1.2.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/2.0.2.tar.gz
+SOURCES/1.2.tar.gz
--- a/SOURCES/0001-Remove-dependency-on-glassfish-el.patch
+++ b/SOURCES/0001-Remove-dependency-on-glassfish-el.patch
@ -1,52 +0,0 @@
-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
-
--- a/SPECS/cdi-api.spec
+++ b/SPECS/cdi-api.spec
@ -1,113 +1,85 @@
-%bcond_with bootstrap
-
-Name:           cdi-api
-Version:        2.0.2
-Release:        7%{?dist}
-Summary:        CDI API
-License:        ASL 2.0
-URL:            https://github.com/eclipse-ee4j/cdi
-BuildArch:      noarch
-
-Source0:        https://github.com/eclipse-ee4j/cdi/archive/%{version}.tar.gz
-
-Patch1:         0001-Remove-dependency-on-glassfish-el.patch
-
-BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
-BuildRequires:  %{?module_prefix}mvn(jakarta.inject:jakarta.inject-api)
-BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+%bcond_without asciidoc
+
+%global namedreltag .NOTHING
+%global namedversion %{version}%{?namedreltag}
+
+Name:             cdi-api
+Version:          1.2
+Release:          8%{?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
+
+BuildRequires:    maven-local
+BuildRequires:    mvn(javax.el:javax.el-api)
+BuildRequires:    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 asciidoc}
+BuildRequires:    asciidoc
+BuildRequires:    /usr/bin/pygmentize
 %endif

 %description
 APIs for JSR-299: Contexts and Dependency Injection for Java EE

-%{?javadoc_package}
+%package javadoc
+Summary:          Javadoc for %{name}
+
+%description javadoc
+This package contains the API documentation for %{name}.

 %prep
 %setup -q -n cdi-%{version}

-%pom_remove_parent
-%pom_remove_parent api
-%pom_disable_module spec
-%pom_remove_plugin -r :maven-javadoc-plugin
+cd api
+# J2EE API directory
+%mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1

-%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
+# 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"

 %build
-%mvn_build -f
+
+(
+ cd api
+ %mvn_build -- -Denforcer.skip
+)
+
+%if %{with asciidoc}
+cd spec/src/main/doc
+asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o cdi-spec.html cdi-spec.asciidoc
+asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o license-asl2.html license-asl2.asciidoc
+asciidoc -n -b html5 -a toc2 -a toclevels=3 -a pygments -f html5.conf -o license-jcp.html license-jcp.asciidoc
+%global adoc html
+%else
+%global adoc asciidoc
+%endif

 %install
+cd api
 %mvn_install

-%files -f .mfiles
-%doc README.md
-%license LICENSE.txt
-
-%changelog
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 2.0.2-7
- Rebuild with regenerated Requires on Java
-
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.2-6
- Rebuild to regenerate auto-requires
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.0.2-5
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.2-4
- Rebuild to workaround DistroBaker issue
+%files -f api/.mfiles
+%doc spec/src/main/doc/cdi-spec.%{adoc}
+%license spec/src/main/doc/license-asl2.%{adoc}
+%license spec/src/main/doc/license-jcp.%{adoc}

-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.2-3
- Bootstrap Maven for CentOS Stream 9
+%files javadoc -f api/.mfiles-javadoc
+%license spec/src/main/doc/license-asl2.%{adoc}
+%license spec/src/main/doc/license-jcp.%{adoc}

-* 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
+%changelog
+* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.2-8
+- Rebuilt for MSVSphere 8.8

 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-8
 - Remove javax.enterprise.inject directory and provides