From 8525f342ef4f92d822adee468520737104ba3d2a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:06:43 +0000 Subject: [PATCH 01/17] Switch to SHA512 sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 09783a3..4d46b4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7472edb48b045bf3c2718b664fb75044 1.2.tar.gz +SHA512 (1.2.tar.gz) = 0da8ab15ff80f2df743db479d735c732648191c8f4897cabd5df1baa8d43a6b008b68e7a293494a67700b748df7d915c01684c87f0fafc390c2de6e20e15020d From 39d8fb78184a632fba1108069eb09b12eb6d6a7c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 02/17] Expand conditionals --- cdi-api.spec | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/cdi-api.spec b/cdi-api.spec index 75b5304..495a672 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,4 +1,3 @@ -%bcond_without asciidoc %global namedreltag .NOTHING %global namedversion %{version}%{?namedreltag} @@ -23,10 +22,6 @@ 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 @@ -54,15 +49,7 @@ 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 From 82fea3a5723359cfaababbac2add2b7b6a9f2342 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:28 +0200 Subject: [PATCH 03/17] Mass rebuild for javapackages-tools 201901 --- cdi-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cdi-api.spec b/cdi-api.spec index 495a672..49e62fb 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -4,7 +4,7 @@ Name: cdi-api Version: 1.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: CDI API License: ASL 2.0 URL: http://seamframework.org/Weld @@ -65,6 +65,9 @@ cd api %license spec/src/main/doc/license-jcp.%{adoc} %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.2-9 +- Mass rebuild for javapackages-tools 201901 + * Wed Apr 18 2018 Mikolaj Izdebski - 1.2-8 - Remove javax.enterprise.inject directory and provides From 372139ac20da2758a5f87038c277459920065668 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:36:23 +0200 Subject: [PATCH 04/17] Use javadoc_package macro --- cdi-api.spec | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/cdi-api.spec b/cdi-api.spec index 49e62fb..0a98401 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,7 +1,3 @@ - -%global namedreltag .NOTHING -%global namedversion %{version}%{?namedreltag} - Name: cdi-api Version: 1.2 Release: 9%{?dist} @@ -26,11 +22,7 @@ BuildRequires: mvn(org.testng:testng::jdk15:) %description APIs for JSR-299: Contexts and Dependency Injection for Java EE -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains the API documentation for %{name}. +%{?javadoc_package} %prep %setup -q -n cdi-%{version} @@ -60,10 +52,6 @@ cd api %license spec/src/main/doc/license-asl2.%{adoc} %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 * Fri May 24 2019 Mikolaj Izdebski - 1.2-9 - Mass rebuild for javapackages-tools 201901 From dee8545bba52299971f6803d3d088e4179e58860 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:37:03 +0200 Subject: [PATCH 05/17] Declare module package --- cdi-api.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cdi-api.spec b/cdi-api.spec index 0a98401..4269ba4 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -22,6 +22,7 @@ BuildRequires: mvn(org.testng:testng::jdk15:) %description APIs for JSR-299: Contexts and Dependency Injection for Java EE +%{?module_package} %{?javadoc_package} %prep @@ -47,7 +48,7 @@ cd api cd api %mvn_install -%files -f api/.mfiles +%files -n %{?module_prefix}%{name} -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} From 97380b6bf83bd3141a9ce8a15f673a32d1986046 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:38:21 +0200 Subject: [PATCH 06/17] Namespace buildrequires --- cdi-api.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cdi-api.spec b/cdi-api.spec index 4269ba4..d49f2c9 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -9,13 +9,13 @@ 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: %{?module_prefix}mvn(javax.el:javax.el-api) +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: %{?module_prefix}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:) From ec90fc448da86d8dfaf995b1edc90ba889d01903 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:57:38 +0200 Subject: [PATCH 07/17] Rely on %setup instead of manually changing CWD --- cdi-api.spec | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/cdi-api.spec b/cdi-api.spec index d49f2c9..f6804e7 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -26,9 +26,8 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE %{?javadoc_package} %prep -%setup -q -n cdi-%{version} +%setup -q -n cdi-%{version}/api -cd api # J2EE API directory %mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1 @@ -36,22 +35,15 @@ cd api %pom_change_dep "javax.interceptor:javax.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec" %build - -( - cd api - %mvn_build -- -Denforcer.skip -) - -%global adoc asciidoc +%mvn_build -- -Denforcer.skip %install -cd api %mvn_install -%files -n %{?module_prefix}%{name} -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} +%files -n %{?module_prefix}%{name} -f .mfiles +%doc ../spec/src/main/doc/cdi-spec.asciidoc +%license ../spec/src/main/doc/license-asl2.asciidoc +%license ../spec/src/main/doc/license-jcp.asciidoc %changelog * Fri May 24 2019 Mikolaj Izdebski - 1.2-9 From 397fdd4a355ab4393011c38693b6160fcc73f6ab Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 10:06:34 +0200 Subject: [PATCH 08/17] De-namespace glassfish-el and jboss-interceptors-1.2-api --- cdi-api.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cdi-api.spec b/cdi-api.spec index f6804e7..ce85ccb 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -9,13 +9,13 @@ BuildArch: noarch Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz BuildRequires: maven-local -BuildRequires: %{?module_prefix}mvn(javax.el:javax.el-api) +BuildRequires: mvn(javax.el:javax.el-api) 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: %{?module_prefix}mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec) +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:) From e3b1216f9d856b70c4fee2e4d79a75945ad264ff Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 1 Jul 2019 10:09:59 +0200 Subject: [PATCH 09/17] Set glassfish-el and jboss-interceptors-1.2-api dependency scopes to provided --- cdi-api.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cdi-api.spec b/cdi-api.spec index ce85ccb..7cd43fd 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -31,8 +31,10 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE # J2EE API directory %mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1 +# Change EL API scope to provided +%pom_change_dep :javax.el-api :::provided # 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" +%pom_change_dep :javax.interceptor-api org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec::provided %build %mvn_build -- -Denforcer.skip From e664e39c5c4a18ff70a76829b64784b2db1af7f0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 18 Sep 2019 17:09:12 +0200 Subject: [PATCH 10/17] Update to upstream version 2.0.1 --- .gitignore | 1 + cdi-api.spec | 27 ++++++++++++++++++--------- sources | 2 +- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ee87c40..b133eaf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /cdi-api-1.0.SP4.tar.xz /1.1.tar.gz /1.2.tar.gz +/2.0.1.tar.gz diff --git a/cdi-api.spec b/cdi-api.spec index 7cd43fd..fd229a6 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,6 +1,6 @@ Name: cdi-api -Version: 1.2 -Release: 9%{?dist} +Version: 2.0.1 +Release: 1%{?dist} Summary: CDI API License: ASL 2.0 URL: http://seamframework.org/Weld @@ -8,8 +8,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: %{?module_prefix}mvn(javax.inject:javax.inject) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -28,13 +29,18 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE %prep %setup -q -n cdi-%{version}/api +%patch1 -p2 + # J2EE API directory %mvn_file :{cdi-api} %{name}/@1 javax.enterprise.inject/@1 -# Change EL API scope to provided -%pom_change_dep :javax.el-api :::provided +%pom_remove_dep :jakarta.el-api + # Use newer version of interceptors API -%pom_change_dep :javax.interceptor-api org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec::provided +%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' %build %mvn_build -- -Denforcer.skip @@ -43,11 +49,14 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE %mvn_install %files -n %{?module_prefix}%{name} -f .mfiles -%doc ../spec/src/main/doc/cdi-spec.asciidoc -%license ../spec/src/main/doc/license-asl2.asciidoc -%license ../spec/src/main/doc/license-jcp.asciidoc +%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 +* Wed Sep 18 2019 Marian Koncek - 2.0.1-1 +- Update to upstream version 2.0.1 + * Fri May 24 2019 Mikolaj Izdebski - 1.2-9 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 4d46b4d..17dab93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (1.2.tar.gz) = 0da8ab15ff80f2df743db479d735c732648191c8f4897cabd5df1baa8d43a6b008b68e7a293494a67700b748df7d915c01684c87f0fafc390c2de6e20e15020d +SHA512 (2.0.1.tar.gz) = fba21578e0652db01f88abd0c9f60cad7c02c3c32e8c9d4809856976e1c10d5bb401ed2fdb02078f0b059e4bb10facaec40986505a1d348b87a2de56e850fd7b From 026eda85b43aade85897ff2d95b7f4f662e794a5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 18 Sep 2019 17:16:06 +0200 Subject: [PATCH 11/17] Add patch file --- 0001-Remove-dependency-on-glassfish-el.patch | 52 ++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 0001-Remove-dependency-on-glassfish-el.patch diff --git a/0001-Remove-dependency-on-glassfish-el.patch b/0001-Remove-dependency-on-glassfish-el.patch new file mode 100644 index 0000000..c6d578b --- /dev/null +++ b/0001-Remove-dependency-on-glassfish-el.patch @@ -0,0 +1,52 @@ +From b8570328d6d781b9f7fd96381423c4b3cef352fe Mon Sep 17 00:00:00 2001 +From: Marian Koncek +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 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 + From 80058d0ab0d49ca7bbdb430e44688b816b60e73f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 18 Sep 2019 17:33:44 +0200 Subject: [PATCH 12/17] Add alias for javax --- cdi-api.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cdi-api.spec b/cdi-api.spec index fd229a6..95aee65 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -42,6 +42,8 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE # 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 From 4f61245ddcc8a6500701fc1be4b7c49c40652329 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 13/17] Mass rebuild for javapackages-tools 201902 --- cdi-api.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cdi-api.spec b/cdi-api.spec index 95aee65..d3cff33 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,6 +1,6 @@ Name: cdi-api Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CDI API License: ASL 2.0 URL: http://seamframework.org/Weld @@ -56,6 +56,9 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE %license ../spec/src/main/asciidoc/license-jcp-final.asciidoc %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0.1-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Sep 18 2019 Marian Koncek - 2.0.1-1 - Update to upstream version 2.0.1 From 18e8a7768867aa200a6411027431d34d2c02bbd9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 14/17] Build with OpenJDK 8 --- cdi-api.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cdi-api.spec b/cdi-api.spec index d3cff33..d910841 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,6 +1,6 @@ Name: cdi-api Version: 2.0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: CDI API License: ASL 2.0 URL: http://seamframework.org/Weld @@ -10,7 +10,7 @@ Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz Patch1: 0001-Remove-dependency-on-glassfish-el.patch -BuildRequires: maven-local +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) @@ -56,6 +56,9 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE %license ../spec/src/main/asciidoc/license-jcp-final.asciidoc %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 2.0.1-3 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 2.0.1-2 - Mass rebuild for javapackages-tools 201902 From d9d518a0bc6cf28b2553fd24c9d2c6dc59b5ce0d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 16 May 2020 15:45:20 +0200 Subject: [PATCH 15/17] Update to upstream version 2.0.2 --- .gitignore | 1 + cdi-api.spec | 62 +++++++++++++++++++++++----------------------------- sources | 2 +- 3 files changed, 29 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index b133eaf..2dca9aa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /1.1.tar.gz /1.2.tar.gz /2.0.1.tar.gz +/2.0.2.tar.gz diff --git a/cdi-api.spec b/cdi-api.spec index d910841..b4713c7 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,24 +1,18 @@ -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: 1%{?dist} +Summary: CDI API +License: ASL 2.0 +URL: https://github.com/eclipse-ee4j/cdi +BuildArch: 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 -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:) +BuildRequires: maven-local +BuildRequires: %{?module_prefix}mvn(jakarta.inject:jakarta.inject-api) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %description APIs for JSR-299: Contexts and Dependency Injection for Java EE @@ -27,35 +21,33 @@ APIs for JSR-299: Contexts and Dependency Injection for Java EE %{?javadoc_package} %prep -%setup -q -n cdi-%{version}/api +%setup -q -n cdi-%{version} -%patch1 -p2 +%pom_remove_parent +%pom_remove_parent api +%pom_disable_module spec +%pom_remove_plugin -r :maven-javadoc-plugin -# 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} -%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 +%mvn_alias :jakarta.enterprise.cdi-api javax.enterprise:cdi-api %build -%mvn_build -- -Denforcer.skip +%mvn_build -f %install %mvn_install %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 +%doc README.md +%license LICENSE.txt %changelog +* Sat May 16 2020 Mikolaj Izdebski - 2.0.2-1 +- Update to upstream version 2.0.2 + * Sat Jan 25 2020 Mikolaj Izdebski - 2.0.1-3 - Build with OpenJDK 8 diff --git a/sources b/sources index 17dab93..364ab61 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (2.0.1.tar.gz) = fba21578e0652db01f88abd0c9f60cad7c02c3c32e8c9d4809856976e1c10d5bb401ed2fdb02078f0b059e4bb10facaec40986505a1d348b87a2de56e850fd7b +SHA512 (2.0.2.tar.gz) = 90c942115a6835ce0f8b69aa9722198d6615d7b5b09fbd4260b2f89196895d674d7acd22c15499e7d17e7345d8ed78ce0e40c99a9a04915245641ca47c23b6c2 From 75cadd43f54fba7c80d5a68cb286c1fcbcd05665 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 16/17] Conditionalize buildrequires in bootstrap mode --- cdi-api.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cdi-api.spec b/cdi-api.spec index b4713c7..bbe4714 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: cdi-api Version: 2.0.2 Release: 1%{?dist} @@ -11,8 +13,12 @@ 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) +%endif %description APIs for JSR-299: Contexts and Dependency Injection for Java EE From 60be7b251a5d60becfb3031eee1eb20ac01d1429 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 17/17] Turn off bootstrap mode by default --- cdi-api.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdi-api.spec b/cdi-api.spec index bbe4714..f6925cd 100644 --- a/cdi-api.spec +++ b/cdi-api.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: cdi-api Version: 2.0.2