diff --git a/1.0.5.tar.gz b/1.0.5.tar.gz
deleted file mode 100644
index a85804a..0000000
--- a/1.0.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e1ea99beee783b0f7bf4a366e052abe09255cbd51b806841c0841bab8184c420
-size 15258
diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
new file mode 100644
index 0000000..81fbaf6
--- /dev/null
+++ b/LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+ 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/MANIFEST-TCK.MF b/MANIFEST-TCK.MF
new file mode 100644
index 0000000..c24931b
--- /dev/null
+++ b/MANIFEST-TCK.MF
@@ -0,0 +1,15 @@
+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/MANIFEST.MF b/MANIFEST.MF
new file mode 100644
index 0000000..c67f0b5
--- /dev/null
+++ b/MANIFEST.MF
@@ -0,0 +1,14 @@
+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/_service b/_service
new file mode 100644
index 0000000..9bdd62a
--- /dev/null
+++ b/_service
@@ -0,0 +1,15 @@
+
+
+ git
+ https://github.com/javax-inject/javax-inject.git
+ 1f74ea7bd05ce4a3a62ddfe4a2511bf1b4287a61
+ 1
+ @PARENT_TAG@+%cdgit%h
+ atinject
+
+
+ *.tar
+ xz
+
+
+
diff --git a/atinject-1+20160610git1f74ea7.tar.xz b/atinject-1+20160610git1f74ea7.tar.xz
new file mode 100644
index 0000000..28a9dd3
--- /dev/null
+++ b/atinject-1+20160610git1f74ea7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc3cd558ec50728218744bd466740d5be6658352417d17ef2fbce1eab747cc96
+size 170392
diff --git a/atinject-build.xml b/atinject-build.xml
deleted file mode 100644
index 69ab550..0000000
--- a/atinject-build.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/atinject-javadoc.patch b/atinject-javadoc.patch
new file mode 100644
index 0000000..c82c0c2
--- /dev/null
+++ b/atinject-javadoc.patch
@@ -0,0 +1,107 @@
+--- atinject-1/src/javax/inject/Inject.java 2022-03-19 14:42:45.820084838 +0100
++++ atinject-1/src/javax/inject/Inject.java 2022-03-19 17:20:21.093084432 +0100
+@@ -36,23 +36,23 @@
+ * zero or more dependencies as arguments. {@code @Inject} can apply to at most
+ * one constructor per class.
+ *
+- * @Inject
++ * @Inject
+ * ConstructorModifiersopt
+ * SimpleTypeName(FormalParameterListopt)
+ * Throwsopt
+- * ConstructorBody
++ * ConstructorBody
+ *
+ *
{@code @Inject} is optional for public, no-argument constructors when no
+ * other constructors are present. This enables injectors to invoke default
+ * constructors.
+ *
+- *
++ *
+ * {@literal @}Injectopt
+ * Annotationsopt
+ * public
+ * SimpleTypeName()
+ * Throwsopt
+- * ConstructorBody
++ * ConstructorBody
+ *
+ *
Injectable fields:
+ *
+@@ -60,10 +60,10 @@
+ * - are not final.
+ *
- may have any otherwise valid name.
+ *
+- * @Inject
++ * @Inject
+ * FieldModifiersopt
+ * Type
+- * VariableDeclarators;
++ * VariableDeclarators;
+ *
+ *
Injectable methods:
+ *
+@@ -74,12 +74,12 @@
+ * - may have any otherwise valid name.
+ * - accept zero or more dependencies as arguments.
+ *
+- * @Inject
++ * @Inject
+ * MethodModifiersopt
+ * ResultType
+ * Identifier(FormalParameterListopt)
+ * Throwsopt
+- * MethodBody
++ * MethodBody
+ *
+ *
The injector ignores the result of an injected method, but
+ * non-{@code void} return types are allowed to support use of the method in
+@@ -107,11 +107,11 @@
+ *
+ *
Injection of members annotated with {@code @Inject} is required. While an
+ * injectable member may use any accessibility modifier (including
+- * private), platform or injector limitations (like security
++ * private), platform or injector limitations (like security
+ * restrictions or lack of reflection support) might preclude injection
+ * of non-public members.
+ *
+- *
Qualifiers
++ * Qualifiers
+ *
+ * A {@linkplain Qualifier qualifier} may annotate an injectable field
+ * or parameter and, combined with the type, identify the implementation to
+--- atinject-1/src/javax/inject/package-info.java 2022-03-19 14:42:45.820084838 +0100
++++ atinject-1/src/javax/inject/package-info.java 2022-03-19 17:21:38.093548148 +0100
+@@ -21,8 +21,8 @@
+ * locators (e.g., JNDI). This process, known as dependency
+ * injection, is beneficial to most nontrivial applications.
+ *
+- *
Many types depend on other types. For example, a Stopwatch might
+- * depend on a TimeSource. The types on which a type depends are
++ *
Many types depend on other types. For example, a Stopwatch might
++ * depend on a TimeSource. The types on which a type depends are
+ * known as its dependencies. The process of finding an instance of a
+ * dependency to use at run time is known as resolving the dependency.
+ * If no such instance can be found, the dependency is said to be
+@@ -100,7 +100,7 @@
+ *
+ *
The injector further passes dependencies to other dependencies until it
+ * constructs the entire object graph. For example, suppose the programmer
+- * asked an injector to create a StopwatchWidget instance:
++ * asked an injector to create a StopwatchWidget instance:
+ *
+ *
/** GUI for a Stopwatch */
+ * class StopwatchWidget {
+@@ -110,9 +110,9 @@
+ *
+ * The injector might:
+ *
+- * - Find a TimeSource
+- *
- Construct a Stopwatch with the TimeSource
+- *
- Construct a StopwatchWidget with the Stopwatch
++ *
- Find a
TimeSource
++ * - Construct a
Stopwatch with the TimeSource
++ * - Construct a
StopwatchWidget with the Stopwatch
+ *
+ *
+ * This leaves the programmer's code clean, flexible, and relatively free
diff --git a/atinject.changes b/atinject.changes
index 0a0c01a..706a0a3 100644
--- a/atinject.changes
+++ b/atinject.changes
@@ -1,19 +1,9 @@
-------------------------------------------------------------------
-Thu Mar 24 12:21:45 UTC 2022 - Fridrich Strba
+Thu Mar 24 13:21:22 UTC 2022 - Fridrich Strba
-- Force the old Symbolic-Bundle-Name, so that eclipse build works
-
--------------------------------------------------------------------
-Tue Mar 22 06:10:29 UTC 2022 - Fridrich Strba
-
-- Upgrade to upstream version 1.0.5
-- Generate and customize ant build system based on maven pom.xml
- file
-- Require java-devel >= 9 for building and compile the
- module-info.java files
-- Removed patch:
- * atinject-javadoc.patch
- + not needed any more
+- Fetch the sources using a source service
+- Do not use the upstream build.sh, but use it to write a
+ necessary part directly to the spec file
-------------------------------------------------------------------
Sat Mar 19 16:24:33 UTC 2022 - Fridrich Strba
diff --git a/atinject.spec b/atinject.spec
index 8ae186b..d1edcd5 100644
--- a/atinject.spec
+++ b/atinject.spec
@@ -17,18 +17,23 @@
Name: atinject
-Version: 1.0.5
+Version: 1+20160610git1f74ea7%{cd}git%{h}
Release: 0
Summary: Dependency injection specification for Java (JSR-330)
License: Apache-2.0
-URL: https://github.com/eclipse-ee4j/injection-api
-Source0: https://github.com/eclipse-ee4j/injection-api/archive/%{version}.tar.gz
-Source1: %{name}-build.xml
-BuildRequires: ant
+Group: Development/Libraries/Java
+URL: https://javax-inject.github.io/javax-inject/
+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
+Patch0: atinject-javadoc.patch
BuildRequires: fdupes
-BuildRequires: java-devel >= 1.8
+BuildRequires: java-devel > 1.8
BuildRequires: javapackages-local
-Obsoletes: %{name}-tck
+BuildRequires: junit
+BuildRequires: xz
BuildArch: noarch
%description
@@ -38,42 +43,84 @@ 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
+Group: Development/Libraries/Java
+Requires: %{name} = %{version}
+Requires: junit
+
+%description tck
+%{summary}.
+
%package javadoc
-Summary: Javadoc for %{name}
+Summary: API documentation for %{name}
Group: Documentation/HTML
%description javadoc
-This package contains the API documentation for %{name}.
+API documentation for %{name}.
%prep
-%setup -q -n injection-api-%{version}
-cp %{SOURCE1} build.xml
+%setup -q
+%patch0 -p1
+cp %{SOURCE3} LICENSE
-%pom_remove_parent
+# Fix dep in TCK pom
+sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml
%build
-%{ant} package javadoc
+rm -rf build
+mkdir -p build/classes
+mkdir -p build/tck
+mkdir -p build/dist
+mkdir -p build/tck/classes
+mkdir -p build/tck/dist
+
+# Compile classes.
+javac -source 8 -target 8 -g -d build/classes `find src -name \*.java`
+javac -source 8 -target 8 -g -classpath build/classes:$(build-classpath junit) -d build/tck/classes \
+ `find tck -name \*.java`
+
+FOOTER="Copyright (C) 2009 \
+The JSR-330 Expert Group. \
+Licensed under the Apache \
+License, Version 2.0."
+
+# Generate Javadocs.
+javadoc -source 8 -protected -bottom "${FOOTER}" \
+ -header "This is a DRAFT specification." \
+ -sourcepath src -d build/javadoc javax.inject
+javadoc -source 8 -classpath build/classes:lib/junit.jar -protected -bottom "$FOOTER" \
+ -sourcepath tck -d build/javadoc/tck org.atinject.tck \
+ org.atinject.tck.auto org.atinject.tck.auto.accessories
+
+jar cmf %{SOURCE1} build/dist/javax.inject.jar -C build/classes .
+jar cmf %{SOURCE2} build/tck/dist/javax.inject-tck.jar -C build/tck/classes .
%install
# jars
install -dm 755 %{buildroot}%{_javadir}/javax.inject
-install -m 0644 target/jakarta.inject-api-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 0644 build/dist/javax.inject.jar %{buildroot}%{_javadir}/%{name}.jar
(cd %{buildroot}%{_javadir}/javax.inject && ln -s ../%{name}.jar .)
+install -m 0644 build/tck/dist/javax.inject-tck.jar %{buildroot}%{_javadir}/%{name}-tck.jar
-# pom
+# poms
install -dm 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
-%add_maven_depmap %{name}.pom %{name}.jar -a javax.inject:javax.inject
+install -m 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+install -m 0644 tck-pom.xml %{buildroot}%{_mavenpomdir}/%{name}-tck.pom
+%add_maven_depmap %{name}.pom %{name}.jar
+%add_maven_depmap %{name}-tck.pom %{name}-tck.jar -f tck
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
-%fdupes -s %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
+%fdupes -s %{buildroot}%{_javadocdir}/%{name}/
%files -f .mfiles
-%license LICENSE.txt NOTICE.md
+%license LICENSE
%{_javadir}/javax.inject
+%files tck -f .mfiles-tck
+
%files javadoc
%{_javadocdir}/%{name}