.cdi-api.metadata

@@ -1 +1 @@
-f11bb11a6e280c65c16641861667179ee34ffa68 SOURCES/2.0.1.tar.gz
+85db06e7d2ff776ecf95aabf39bfbfcfc543380d SOURCES/1.2.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/2.0.1.tar.gz
+SOURCES/1.2.tar.gz

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
-

SPECS/cdi-api.spec

@@ -1,6 +1,11 @@
+%bcond_without asciidoc
+
+%global namedreltag .NOTHING
+%global namedversion %{version}%{?namedreltag}
+
 Name:             cdi-api
-Version:          2.0.1
+Version:          1.2
-Release:          3%{?dist}
+Release:          8%{?dist}
 Summary:          CDI API
 License:          ASL 2.0
 URL:              http://seamframework.org/Weld
@@ -8,10 +13,9 @@ 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:    mvn(javax.el:javax.el-api)
-BuildRequires:    maven-local-openjdk8
+BuildRequires:    mvn(javax.inject:javax.inject)
-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)
@@ -19,55 +23,61 @@ 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
 
-%{?module_package}
+%package javadoc
-%{?javadoc_package}
+Summary:          Javadoc for %{name}
+
+%description javadoc
+This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n cdi-%{version}/api
+%setup -q -n cdi-%{version}
-
-%patch1 -p2
 
+cd api
 # 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
+%pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec"
-
-# 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
+
+(
+ 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 -n %{?module_prefix}%{name} -f .mfiles
+%files -f api/.mfiles
-%doc ../spec/src/main/asciidoc/cdi-spec.asciidoc
+%doc spec/src/main/doc/cdi-spec.%{adoc}
-%license ../spec/src/main/asciidoc/license-asl2.asciidoc
+%license spec/src/main/doc/license-asl2.%{adoc}
-%license ../spec/src/main/asciidoc/license-jcp-final.asciidoc
+%license spec/src/main/doc/license-jcp.%{adoc}
+
+%files javadoc -f api/.mfiles-javadoc
+%license spec/src/main/doc/license-asl2.%{adoc}
+%license spec/src/main/doc/license-jcp.%{adoc}
 
 %changelog
-* 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
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-9
-- Mass rebuild for javapackages-tools 201901
-
 * Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-8
 - Remove javax.enterprise.inject directory and provides