Compare commits
No commits in common. "c9s" and "c8-stream-3.6" have entirely different histories.
c9s
...
c8-stream-
1
.cdi-api.metadata
Normal file
1
.cdi-api.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
f11bb11a6e280c65c16641861667179ee34ffa68 SOURCES/2.0.1.tar.gz
|
||||||
10
.gitignore
vendored
10
.gitignore
vendored
@ -1,9 +1 @@
|
|||||||
/results_*
|
SOURCES/2.0.1.tar.gz
|
||||||
/*.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
|
|
||||||
|
|||||||
@ -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
|
Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
|
||||||
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
|
||||||
|
|
||||||
Patch1: 0001-Remove-dependency-on-glassfish-el.patch
|
BuildRequires: maven-local-openjdk8
|
||||||
|
BuildRequires: %{?module_prefix}mvn(javax.inject:javax.inject)
|
||||||
BuildRequires: maven-local
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
%if %{with bootstrap}
|
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||||
BuildRequires: javapackages-bootstrap
|
BuildRequires: mvn(org.apache.maven.surefire:surefire-testng)
|
||||||
%else
|
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
|
||||||
BuildRequires: %{?module_prefix}mvn(jakarta.inject:jakarta.inject-api)
|
BuildRequires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec)
|
||||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
BuildRequires: mvn(org.jboss.weld:weld-parent:pom:)
|
||||||
%endif
|
BuildRequires: mvn(org.testng:testng::jdk15:)
|
||||||
|
|
||||||
%description
|
%description
|
||||||
APIs for JSR-299: Contexts and Dependency Injection for Java EE
|
APIs for JSR-299: Contexts and Dependency Injection for Java EE
|
||||||
|
|
||||||
|
%{?module_package}
|
||||||
%{?javadoc_package}
|
%{?javadoc_package}
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n cdi-%{version}
|
%setup -q -n cdi-%{version}/api
|
||||||
|
|
||||||
%pom_remove_parent
|
%patch1 -p2
|
||||||
%pom_remove_parent api
|
|
||||||
%pom_disable_module spec
|
|
||||||
%pom_remove_plugin -r :maven-javadoc-plugin
|
|
||||||
|
|
||||||
%pom_remove_dep :jakarta.el-api api
|
# J2EE API directory
|
||||||
%pom_remove_dep :jakarta.interceptor-api api
|
%mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1
|
||||||
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
|
%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
|
%build
|
||||||
%mvn_build -f
|
%mvn_build -- -Denforcer.skip
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%mvn_install
|
%mvn_install
|
||||||
|
|
||||||
%files -f .mfiles
|
%files -n %{?module_prefix}%{name} -f .mfiles
|
||||||
%doc README.md
|
%doc ../spec/src/main/asciidoc/cdi-spec.asciidoc
|
||||||
%license LICENSE.txt
|
%license ../spec/src/main/asciidoc/license-asl2.asciidoc
|
||||||
|
%license ../spec/src/main/asciidoc/license-jcp-final.asciidoc
|
||||||
|
|
||||||
%changelog
|
%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
|
|
||||||
|
|
||||||
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.2-3
|
|
||||||
- Bootstrap Maven for CentOS Stream 9
|
|
||||||
|
|
||||||
* 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
|
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.1-3
|
||||||
- Build with OpenJDK 8
|
- 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
|
* Wed Sep 18 2019 Marian Koncek <mkoncek@redhat.com> - 2.0.1-1
|
||||||
- Update to upstream version 2.0.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
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-9
|
||||||
- Mass rebuild for javapackages-tools 201901
|
- 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
|
* Wed Apr 18 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2-8
|
||||||
- Remove javax.enterprise.inject directory and provides
|
- Remove javax.enterprise.inject directory and provides
|
||||||
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
--- !Policy
|
|
||||||
product_versions:
|
|
||||||
- rhel-9
|
|
||||||
decision_contexts:
|
|
||||||
- osci_compose_gate
|
|
||||||
rules:
|
|
||||||
# https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test
|
|
||||||
- !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap}
|
|
||||||
Loading…
Reference in New Issue
Block a user