Merge modular branch

.gitignore

@@ -2,3 +2,5 @@
 /LICENSE-2.0.txt
 /noarch
 /*.src.rpm
+/1.0.1.tar.gz
+/1.0.3.tar.gz

atinject.spec

@@ -1,26 +1,21 @@
+%bcond_without bootstrap
+
 Name:           atinject
-Version:        1
+Version:        1.0.3
-Release:        36.20100611svn86%{?dist}
+Release:        1%{?dist}
 Summary:        Dependency injection specification for Java (JSR-330)
 License:        ASL 2.0
-URL:            http://code.google.com/p/atinject/
+URL:            https://github.com/eclipse-ee4j/injection-api
 BuildArch:      noarch
 
-# latest release doesn't generate javadocs and there is no source
+Source0:        https://github.com/eclipse-ee4j/injection-api/archive/%{version}.tar.gz
-# 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
 
-BuildRequires:  javapackages-local
+BuildRequires:  maven-local
-BuildRequires:  java-devel
+%if %{with bootstrap}
-BuildRequires:  junit
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+%endif
 
 %description
 This package specifies a means for obtaining objects in such a way as
@@ -29,61 +24,33 @@ 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}.
-
 %{?javadoc_package}
 
 %prep
-%setup -q
+%setup -q -n injection-api-%{version}
-cp %{SOURCE3} LICENSE
-mkdir lib
-build-jar-repository -p lib junit
 
-# Fix dep in TCK pom
+%pom_remove_parent
-sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml
+%pom_remove_plugin -r :maven-javadoc-plugin
 
-# J2EE API symlinks
+%mvn_alias : javax.inject:javax.inject
-%mvn_file :javax.inject atinject javax.inject/atinject
+%mvn_file : atinject
-
-# TCK sub-package
-%mvn_file :javax.inject-tck atinject-tck
-%mvn_package :javax.inject-tck tck
 
 %build
-set -e
+%mvn_build
-alias rm=:
-alias xargs=:
-alias javac="javac -source 1.8 -target 1.8"
-alias javadoc="javadoc -source 1.8 -Xdoclint:none"
-. ./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
 
 %install
-%mvn_install -J build/javadoc
+%mvn_install
 
-%files -f .mfiles
+%files -n %{?module_prefix}%{name} -f .mfiles
-%license LICENSE
+%license LICENSE.txt NOTICE.md
-
-%files tck -f .mfiles-tck
 
 %changelog
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1-36.20100611svn86
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Mon Oct 05 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.3-1
+- Update to upstream version 1.0.3
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1-35.20100611svn86
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -93,12 +60,24 @@ mv build/tck/javadoc build/javadoc/tck
 * Sat Jun 20 2020 Mat Booth <mat.booth@redhat.com> - 1-33.20100611svn86
 - Allow building against Java 11
 
+* Sat May 16 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.0.1-1
+- Update to upstream version 1.0.1
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1-32.20100611svn86
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-31.20100611svn86
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-30.20100611svn86
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1-31.20100611svn86
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1-29.20100611svn86
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1-30.20100611svn86
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1,2 +1 @@
-5ed77767af2fa4ba8ef66c3e966bd2b2  atinject-1.tar.xz
+SHA512 (1.0.3.tar.gz) = 394fefb51a8bc5e793870b9899bf2f946c2cb4d5a5d377e4bc8e8668c4b4419dd2afddbbf3bf3d0e3202625b60ff545671f363d927a8c6c3d09387ba519c29a4
-3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt