diff --git a/.atinject.metadata b/.atinject.metadata index ce36b26..6d52532 100644 --- a/.atinject.metadata +++ b/.atinject.metadata @@ -1 +1 @@ -67addd5415643f08e02cf21b762a527aa982bb17 SOURCES/atinject-1.tar.xz +946fdc2b2072f30c125d1850c5fead61b2440636 SOURCES/1.0.5.tar.gz diff --git a/.gitignore b/.gitignore index aec23fc..b1c06aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/atinject-1.tar.xz +SOURCES/1.0.5.tar.gz diff --git a/SOURCES/LICENSE-2.0.txt b/SOURCES/LICENSE-2.0.txt deleted file mode 100644 index d645695..0000000 --- a/SOURCES/LICENSE-2.0.txt +++ /dev/null @@ -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. diff --git a/SOURCES/MANIFEST-TCK.MF b/SOURCES/MANIFEST-TCK.MF deleted file mode 100644 index 1b41118..0000000 --- a/SOURCES/MANIFEST-TCK.MF +++ /dev/null @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Tck -Bundle-SymbolicName: com.google.code.atinject.tck -Bundle-Version: 1.0.0 -Bundle-Vendor: GOOGLE -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.junit;bundle-version="3.8.2" -Export-Package: org.atinject.tck, - org.atinject.tck.auto;x-internal:=true, - org.atinject.tck.auto.accessories;x-internal:=true -Import-Package: javax.inject;version="1.0.0" -JavaPackages-GroupId: javax.inject -JavaPackages-ArtifactId: javax.inject-tck -JavaPackages-Version: 1.1.SNAPSHOT diff --git a/SOURCES/MANIFEST.MF b/SOURCES/MANIFEST.MF deleted file mode 100644 index a187cb1..0000000 --- a/SOURCES/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Atinject Dependency Injection Annotations -Bundle-SymbolicName: javax.inject -Bundle-Version: 1.0.0.v20091030 -Bundle-ClassPath: . -Bundle-Vendor: Eclipse.org -Bundle-Localization: plugin -Export-Package: javax.inject;version="1.0.0" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -JavaPackages-GroupId: javax.inject -JavaPackages-ArtifactId: javax.inject -JavaPackages-Version: 1 - diff --git a/SOURCES/atinject-target-1.6.patch b/SOURCES/atinject-target-1.6.patch deleted file mode 100644 index 097412a..0000000 --- a/SOURCES/atinject-target-1.6.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- atinject-1/build.sh~ 2009-10-14 01:36:31.000000000 +0200 -+++ atinject-1/build.sh 2014-06-09 08:21:06.686274678 +0200 -@@ -10,8 +10,8 @@ - mkdir -p build/tck/dist - - # Compile classes. --javac -g -d build/classes `find src -name *.java` --javac -g -classpath build/classes:lib/junit.jar -d build/tck/classes \ -+javac -source 1.6 -target 1.6 -g -d build/classes `find src -name *.java` -+javac -source 1.6 -target 1.6 -g -classpath build/classes:lib/junit.jar -d build/tck/classes \ - `find tck -name *.java` - - FOOTER="Copyright (C) 2009 \ diff --git a/SPECS/atinject.spec b/SPECS/atinject.spec index 0d66060..2b2f65d 100644 --- a/SPECS/atinject.spec +++ b/SPECS/atinject.spec @@ -1,101 +1,145 @@ +%bcond_with bootstrap + Name: atinject -Version: 1 -Release: 31.20100611svn86%{?dist} -Summary: Dependency injection specification for Java (JSR-330) -License: ASL 2.0 -URL: http://code.google.com/p/atinject/ +Version: 1.0.5 +Release: 14%{?dist} +Summary: Jakarta Dependency Injection +License: Apache-2.0 +URL: https://jakarta.ee/specifications/dependency-injection/1.0/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -# latest release doesn't generate javadocs and there is no source -# tarball with pom.xml or ant build file -# -# svn export -r86 http://atinject.googlecode.com/svn/trunk atinject-1 -# rm -rf atinject-1/{lib,javadoc}/ -# tar caf atinject-1.tar.xz atinject-1 -Source0: %{name}-%{version}.tar.xz -# These manifests based on the ones shipped by eclipse.org -Source1: MANIFEST.MF -Source2: MANIFEST-TCK.MF -Source3: http://www.apache.org/licenses/LICENSE-2.0.txt +Source0: https://github.com/jakartaee/inject/archive/%{version}.tar.gz -# Compile with source/target 1.6 -Patch0: %{name}-target-1.6.patch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +%endif -BuildRequires: javapackages-local -BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: junit +Provides: jakarta-inject1.0 = %{version}-%{release} %description -This package specifies a means for obtaining objects in such a way as -to maximize reusability, testability and maintainability compared to -traditional approaches such as constructors, factories, and service -locators (e.g., JNDI). This process, known as dependency injection, is -beneficial to most nontrivial applications. +Jakarta Dependency Injection specifies a means for obtaining objects +in such a way as to maximize reusability, testability and +maintainability compared to traditional approaches such as +constructors, factories, and service locators (e.g., JNDI). +This process, known as dependency injection, is beneficial +to most nontrivial applications. -%package tck -Summary: TCK for testing %{name} compatibility with JSR-330 -Requires: %{name} = %{version}-%{release} -Requires: junit - -%description tck -%{summary}. - -%{?module_package} %{?javadoc_package} %prep -%setup -q -cp %{SOURCE3} LICENSE -mkdir lib -build-jar-repository -p lib junit +%autosetup -p1 -n inject-%{version} -%patch0 -p1 +%pom_remove_parent +%pom_xpath_set pom:project/pom:groupId javax.inject +%pom_xpath_set pom:project/pom:artifactId javax.inject +%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :moditect-maven-plugin -# Fix dep in TCK pom -sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml - -# J2EE API symlinks -%mvn_file :javax.inject atinject javax.inject/atinject - -# TCK sub-package -%mvn_file :javax.inject-tck atinject-tck -%mvn_package :javax.inject-tck tck +%mvn_file : atinject %build -set -e -alias rm=: -alias xargs=: -alias javadoc='javadoc -Xdoclint:none' -export PATH="%{_jvmlibdir}/java-1.8.0-openjdk/bin:${PATH}" -. ./build.sh - -# Inject OSGi manifests required by Eclipse. -jar umf %{SOURCE1} build/dist/javax.inject.jar -jar umf %{SOURCE2} build/tck/dist/javax.inject-tck.jar - -%mvn_artifact pom.xml build/dist/javax.inject.jar -%mvn_artifact tck-pom.xml build/tck/dist/javax.inject-tck.jar - -mv build/tck/javadoc build/javadoc/tck +%mvn_build %install -%mvn_install -J build/javadoc +%mvn_install -%files -n %{?module_prefix}%{name} -f .mfiles -%license LICENSE - -%files tck -f .mfiles-tck +%files -f .mfiles +%license LICENSE.txt NOTICE.md %changelog +* Wed Dec 18 2024 Mikolaj Izdebski - 1.0.5-14 +- Sync with Fedora + +* Tue Oct 29 2024 Troy Dawson - 1.0.5-13 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Thu Aug 01 2024 Troy Dawson - 1.0.5-12 +- Bump release for Aug 2024 java mass rebuild + +* Mon Jun 24 2024 Troy Dawson - 1.0.5-11 +- Bump release for June 2024 mass rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.0.5-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 1.0.5-8 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.0.5-7 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.0.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.0.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.0.5-3 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1.0.5-1 +- Update to upstream version 1.0.5 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.0.3-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1-36.20100611svn86 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Oct 05 2020 Mikolaj Izdebski - 1.0.3-1 +- Update to upstream version 1.0.3 + +* Mon Jul 27 2020 Fedora Release Engineering - 1-35.20100611svn86 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1-34.20100611svn86 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Sat Jun 20 2020 Mat Booth - 1-33.20100611svn86 +- Allow building against Java 11 + +* Sat May 16 2020 Mikolaj Izdebski - 1.0.1-1 +- Update to upstream version 1.0.1 + +* Tue Jan 28 2020 Fedora Release Engineering - 1-32.20100611svn86 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 25 2020 Mikolaj Izdebski - 1-31.20100611svn86 - Build with OpenJDK 8 * Tue Nov 05 2019 Mikolaj Izdebski - 1-30.20100611svn86 - Mass rebuild for javapackages-tools 201902 +* Wed Jul 24 2019 Fedora Release Engineering - 1-31.20100611svn86 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 1-29.20100611svn86 - Mass rebuild for javapackages-tools 201901 +* Thu Jan 31 2019 Fedora Release Engineering - 1-30.20100611svn86 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1-29.20100611svn86 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Apr 18 2018 Mikolaj Izdebski - 1-28.20100611svn86 - Remove javax.inject Provides