.cdi-api.metadata

@@ -1 +1 @@
-43043d92152899310b0aa092ad99f99a945700a5 SOURCES/2.0.2.tar.gz
+f11bb11a6e280c65c16641861667179ee34ffa68 SOURCES/2.0.1.tar.gz

.gitignore

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

SPECS/cdi-api.spec

@@ -1,93 +1,61 @@
-%bcond_with bootstrap
+Name:             cdi-api
+Version:          2.0.1
+Release:          3%{?dist}
+Summary:          CDI API
+License:          ASL 2.0
+URL:              http://seamframework.org/Weld
+BuildArch:        noarch
 
-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
-ExclusiveArch:  %{java_arches} noarch
+Source0:          https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
 
-Source0:        https://github.com/eclipse-ee4j/cdi/archive/%{version}.tar.gz
+Patch1:           0001-Remove-dependency-on-glassfish-el.patch
 
-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
+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:)
 
 %description
 APIs for JSR-299: Contexts and Dependency Injection for Java EE
 
+%{?module_package}
 %{?javadoc_package}
 
 %prep
-%setup -q -n cdi-%{version}
+%setup -q -n cdi-%{version}/api
 
-%pom_remove_parent
-%pom_remove_parent api
-%pom_disable_module spec
-%pom_remove_plugin -r :maven-javadoc-plugin
+%patch1 -p2
 
-%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}
+# J2EE API directory
+%mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1
 
-%mvn_alias :jakarta.enterprise.cdi-api javax.enterprise:cdi-api
+%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 -f
+%mvn_build -- -Denforcer.skip
 
 %install
 %mvn_install
 
-%files -f .mfiles
-%doc README.md
-%license LICENSE.txt
+%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
-* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.2-7
-- Rebuild to regenerate auto-requires
-
-* 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
 
@@ -97,18 +65,9 @@ rm -rf api/src/main/java/javax/enterprise/{context/,inject/spi/,inject/se/,injec
 * 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