forked from pool/cdi-api
Accepting request 966707 from Java:packages
2.0.2 OBS-URL: https://build.opensuse.org/request/show/966707 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cdi-api?expand=0&rev=5
This commit is contained in:
commit
f1b205efc3
52
0001-Remove-dependency-on-glassfish-el.patch
Normal file
52
0001-Remove-dependency-on-glassfish-el.patch
Normal file
@ -0,0 +1,52 @@
|
||||
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
|
||||
|
202
LICENSE-2.0.txt
202
LICENSE-2.0.txt
@ -1,202 +0,0 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
8
_service
8
_service
@ -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>
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f38b66047deaf0f79004f41b68be1dbbe2061d8e94a42401b93f9c911484f14f
|
||||
size 46560
|
BIN
cdi-2.0.2.tar.xz
(Stored with Git LFS)
Normal file
BIN
cdi-2.0.2.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -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>
|
||||
@ -91,100 +72,6 @@
|
||||
</copy>
|
||||
</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.enterprise.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>
|
||||
|
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 4 04:30:33 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 20 19:41:42 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
48
cdi-api.spec
48
cdi-api.spec
@ -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 @@ Group: Documentation/HTML
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user