Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cdi-api for openSUSE:Factory checked in at 2022-04-04 19:26:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cdi-api (Old) and /work/SRC/openSUSE:Factory/.cdi-api.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cdi-api" Mon Apr 4 19:26:26 2022 rev:5 rq:966707 version:2.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cdi-api/cdi-api.changes 2022-03-21 20:11:03.196381030 +0100 +++ /work/SRC/openSUSE:Factory/.cdi-api.new.1900/cdi-api.changes 2022-04-04 19:26:50.624226808 +0200 @@ -1,0 +2,8 @@ +Mon Apr 4 04:30:33 UTC 2022 - Fridrich Strba <[email protected]> + +- Update to upsteam release 2.0.2 +- Added patch: + * 0001-Remove-dependency-on-glassfish-el.patch + + patch out the two el wrapper functions that are unused + +------------------------------------------------------------------- Old: ---- LICENSE-2.0.txt cdi-1.2.tar.xz New: ---- 0001-Remove-dependency-on-glassfish-el.patch cdi-2.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdi-api.spec ++++++ --- /var/tmp/diff_new_pack.jxUQPR/_old 2022-04-04 19:26:51.072221672 +0200 +++ /var/tmp/diff_new_pack.jxUQPR/_new 2022-04-04 19:26:51.076221626 +0200 @@ -16,25 +16,21 @@ # -%bcond_with tests Name: cdi-api -Version: 1.2 +Version: 2.0.2 Release: 0 Summary: Contexts and Dependency Injection for Java EE License: Apache-2.0 Group: Development/Libraries/Java -URL: http://seamframework.org/Weld -# sh create-tarball.sh %%{version} +URL: https://seamframework.org/Weld Source0: cdi-%{version}.tar.xz Source1: %{name}-build.xml -Source2: http://www.apache.org/licenses/LICENSE-2.0.txt +Patch0: 0001-Remove-dependency-on-glassfish-el.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes -BuildRequires: glassfish-el-api BuildRequires: javapackages-local BuildRequires: jboss-interceptors-1.2-api -Requires: mvn(javax.el:javax.el-api) Requires: mvn(javax.inject:javax.inject) Requires: mvn(org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec) BuildArch: noarch @@ -50,50 +46,46 @@ This package contains the API documentation for %{name}. %prep -%setup -qn cdi-%{version} -pushd api/ -cp %{SOURCE1} build.xml -cp %{SOURCE2} LICENSE +%setup -q -n cdi-%{version} +%patch0 -p1 +cp %{SOURCE1} api/build.xml # 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 "jakarta.interceptor:jakarta.interceptor-api" "org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.2_spec" api -%pom_remove_parent -popd +%pom_remove_parent api +%pom_remove_dep :jakarta.el-api api %build pushd api/ mkdir -p lib -build-jar-repository -s lib glassfish-el-api jboss-interceptors-1.2-api javax.inject -%{ant} \ -%if %{without tests} - -Dtest.skip=true \ -%endif - jar javadoc +build-jar-repository -s lib javax.inject jboss-interceptors-1.2-api +%{ant} jar javadoc popd %install -pushd api/ # jar install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 api/target/jakarta.enterprise.cdi-api-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar install -dm 0755 %{buildroot}%{_javadir}/javax.enterprise.inject -install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar ln -sf ../%{name}/%{name}.jar %{buildroot}%{_javadir}/javax.enterprise.inject/%{name}.jar + # pom install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom -%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +install -pm 0644 api/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "javax.enterprise:cdi-api" # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} -cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ -popd +cp -pr api/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} -%files -f api/.mfiles -%license api/LICENSE +%files -f .mfiles %{_javadir}/javax.enterprise.inject +%license LICENSE.txt +%doc README.md %files javadoc %{_javadocdir}/%{name} +%license LICENSE.txt %changelog ++++++ 0001-Remove-dependency-on-glassfish-el.patch ++++++ >From b8570328d6d781b9f7fd96381423c4b3cef352fe Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> 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 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.jxUQPR/_old 2022-04-04 19:26:51.112221213 +0200 +++ /var/tmp/diff_new_pack.jxUQPR/_new 2022-04-04 19:26:51.112221213 +0200 @@ -1,10 +1,12 @@ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> - <param name="url">git://github.com/cdi-spec/cdi</param> - <param name="revision">1.2</param> - <param name="versionformat">1.2</param> + <param name="url">https://github.com/cdi-spec/cdi</param> + <param name="revision">2.0.2</param> + <param name="versionformat">@PARENT_TAG@</param> <param name="include">api</param> + <param name="include">LICENSE.txt</param> + <param name="include">README.md</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ cdi-1.2.tar.xz -> cdi-2.0.2.tar.xz ++++++ ++++ 11050 lines of diff (skipped) ++++++ cdi-api-build.xml ++++++ --- /var/tmp/diff_new_pack.jxUQPR/_old 2022-04-04 19:26:51.212220067 +0200 +++ /var/tmp/diff_new_pack.jxUQPR/_new 2022-04-04 19:26:51.216220020 +0200 @@ -8,22 +8,16 @@ <property file="build.properties"/> - <property name="project.groupId" value="javax.enterprise"/> - <property name="project.artifactId" value="cdi-api"/> - <property name="project.version" value="1.2"/> - <property name="project.name" value="CDI APIs"/> - <property name="project.description" value="APIs for CDI (Contexts and Dependency Injection for Java EE)"/> - <property name="project.url" value="http://cdi-spec.org"/> - <property name="project.license.url" value="http://www.apache.org/licenses/LICENSE-2.0.html"/> + <property name="project.groupId" value="jakarta.enterprise"/> + <property name="project.artifactId" value="jakarta.enterprise.cdi-api"/> + <property name="project.version" value="2.0.2"/> + <property name="project.name" value="Jakarta CDI"/> + <property name="project.description" value="APIs for Jakarta CDI (Contexts and Dependency Injection)"/> + <property name="project.license.url" value="https://repository.jboss.org/licenses/apache-2.0.txt"/> - <property name="project.organization.name" value="JBoss by Red Hat, Inc."/> - <property name="project.organization.url" value="http://jboss.org"/> + <property name="project.organization.name" value="Eclipse Foundation"/> + <property name="project.organization.url" value="https://jakarta.ee"/> - <property name="bundle.version" value="${project.version}.0"/> - - <property name="spec.title" value="JSR-346 Contexts and Dependency Injection for the Java EE platform"/> - <property name="spec.version" value="${project.version}"/> - <property name="compiler.source" value="1.8"/> <property name="compiler.target" value="${compiler.source}"/> @@ -32,10 +26,7 @@ <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> <property name="build.resourceDir" value="src/main/resources"/> - <property name="build.testOutputDir" value="${build.dir}/test-classes"/> - <property name="build.testDir" value="src/test/java"/> - <property name="build.testResourceDir" value="src/test/resources"/> - <property name="test.reports" value="${build.dir}/test-reports"/> + <property name="reporting.outputDirectory" value="${build.dir}/site"/> <!-- ====================================================================== --> @@ -44,16 +35,6 @@ <path id="build.classpath"> <fileset dir="lib"> - <!-- javax.el-api-3.0.0 jboss-interceptors-api_1.2_spec-1.0.0 - javax.inject-1 --> - <include name="**/*"/> - </fileset> - </path> - <path id="build.test.classpath"> - <fileset dir="lib"> - <!-- javax.el-api-3.0.0 jboss-interceptors-api_1.2_spec-1.0.0 - javax.inject-1.jar testng-5.10-jdk15 jcommander-1.64 - snakeyaml-1.17 base64coder commons-codec --> <include name="**/*"/> </fileset> </path> @@ -92,100 +73,6 @@ </target> <!-- ====================================================================== --> - <!-- Test-compilation target --> - <!-- ====================================================================== --> - - <target name="compile-tests" - depends="compile" - description="Compile the test code" - unless="test.skip"> - <mkdir dir="${build.testOutputDir}"/> - <javac destdir="${build.testOutputDir}" - nowarn="false" - debug="true" - optimize="false" - deprecation="true" - target="${compiler.target}" - verbose="false" - fork="false" - source="${compiler.source}"> - <src> - <pathelement location="${build.testDir}"/> - </src> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - </classpath> - </javac> - <copy todir="${build.testOutputDir}"> - <fileset dir="${build.testResourceDir}"/> - </copy> - </target> - - <!-- ====================================================================== --> - <!-- Run all tests --> - <!-- ====================================================================== --> - - <target name="test" - depends="compile-tests, junit-missing" - unless="junit.skipped" - description="Run the test cases"> - <mkdir dir="${test.reports}"/> - <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir="."> - <sysproperty key="basedir" value="."/> - <formatter type="xml"/> - <formatter type="plain" usefile="false"/> - <classpath> - <path refid="build.test.classpath"/> - <pathelement location="${build.outputDir}"/> - <pathelement location="${build.testOutputDir}"/> - </classpath> - <batchtest todir="${test.reports}" unless="test"> - <fileset dir="${build.testDir}"> - <include name="**/Test*.java"/> - <include name="**/*Test.java"/> - <include name="**/*TestCase.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - <batchtest todir="${test.reports}" if="test"> - <fileset dir="${build.testDir}"> - <include name="**/${test}.java"/> - <exclude name="**/*Abstract*Test.java"/> - </fileset> - </batchtest> - </junit> - </target> - - <target name="test-junit-present"> - <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/> - </target> - - <target name="test-junit-status" - depends="test-junit-present"> - <condition property="junit.missing"> - <and> - <isfalse value="${junit.present}"/> - <isfalse value="${test.skip}"/> - </and> - </condition> - <condition property="junit.skipped"> - <or> - <isfalse value="${junit.present}"/> - <istrue value="${test.skip}"/> - </or> - </condition> - </target> - - <target name="junit-missing" - depends="test-junit-status" - if="junit.missing"> - <echo>=================================== WARNING ===================================</echo> - <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo> - <echo>===============================================================================</echo> - </target> - - <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> @@ -217,7 +104,7 @@ <!-- Package target --> <!-- ====================================================================== --> - <target name="package" depends="compile,test" description="Package the application"> + <target name="package" depends="compile" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" @@ -229,16 +116,12 @@ <attribute name="Bundle-License" value="${project.license.url}"/> <attribute name="Bundle-ManifestVersion" value="2"/> <attribute name="Bundle-Name" value="${project.name}"/> - <attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/> + <attribute name="Bundle-SymbolicName" value="${project.artifactId}"/> <attribute name="Bundle-Vendor" value="${project.organization.name}"/> - <attribute name="Bundle-Version" value="${bundle.version}"/> - <attribute name="Export-Package" value="javax.decorator;version="1.1";uses:="javax.enterprise.inject",javax.enterprise.context;version="1.1";uses:="javax.inject",javax.enterprise.context.spi;version="1.1",javax.enterprise.event;version="1.1";uses:="javax.enterprise.util",javax.enterprise.inject;version="1.1";uses:="javax.enterprise.context,javax.enterprise.util,javax.inject",javax.enterprise.inject.spi;version="1.1";uses:="javax.el,javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.interceptor",javax.enterprise.util;version="1.1""/> - <attribute name="Implementation-Title" value="${project.name}"/> - <attribute name="Implementation-Version" value="${project.version}"/> - <attribute name="Import-Package" value="javax.el;version="2.2",javax.enterprise.context;version="[1.1,2)",javax.enterprise.context.spi;version="[1.1,2)",javax.enterprise.event;version="[1.1,2)",javax.enterprise.inject;version="[1.1,2)",javax.enterprise.util;version="[1.1,2)",javax.inject;version="[1.0,2)",javax.interceptor;version="[${project.version},2)""/> + <attribute name="Bundle-Version" value="${project.version}"/> + <attribute name="Export-Package" value="javax.decorator;version="2.0";uses:="javax.enterprise.inject",javax.enterprise.context.control;version="2.0";uses:="javax.enterprise.context,javax.interceptor",javax.enterprise.context.spi;version="2.0",javax.enterprise.context;version="2.0";uses:="javax.enterprise.util,javax.inject",javax.enterprise.event;version="2.0";uses:="javax.enterprise.util",javax.enterprise.inject.literal;version="2.0";uses:="javax.enterprise.util,javax.inject",javax.enterprise.inject.se;version="2.0";uses:="javax.enterprise.inject,javax.enterprise.inject.spi",javax.enterprise.inject.spi.configurator;version="2.0";uses:="javax.enterprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.enterprise.inject.spi,javax.enterprise.util",javax.enterprise.inject.spi;version="2.0";uses:="javax.ente rprise.context.spi,javax.enterprise.event,javax.enterprise.inject,javax.enterprise.inject.spi.configurator,javax.interceptor",javax.enterprise.inject;version="2.0";uses:="javax.enterprise.context,javax.enterprise.util,javax.inject",javax.enterprise.util;version="2.0""/> + <attribute name="Import-Package" value="javax.enterprise.context.spi;version="[2.0,3)",javax.enterprise.context;version="[2.0,3)",javax.enterprise.event;version="[2.0,3)",javax.enterprise.inject.spi.configurator;version="[2.0,3)",javax.enterprise.inject.spi;version="[2.0,3)",javax.enterprise.inject;version="[2.0,3)",javax.enterprise.util;version="[2.0,3)",javax.inject,javax.interceptor;version="[1.2,2)""/> <attribute name="Require-Capability" value="osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=${compiler.target}))""/> - <attribute name="Specification-Title" value="${spec.title}"/> - <attribute name="Specification-Version" value="${spec.version}"/> </manifest> </jar> </target>
