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: + *

+ * +- *

@Inject ++ *
@Inject + * FieldModifiersopt + * Type +- * VariableDeclarators;
 ++ * VariableDeclarators;
+ * + *

Injectable methods: + *

+ * +- *

@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:
+  * 
    
+- *   
  1. Find a TimeSource
+- *   
  2. Construct a Stopwatch with the TimeSource
+- *   
  3. Construct a StopwatchWidget with the Stopwatch
++ *   
  4. Find a TimeSource
++ *   
  5. Construct a Stopwatch with the TimeSource
++ *   
  6. 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 015c51a..7e1e55e 100644
--- a/atinject.changes
+++ b/atinject.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Mar 19 16:24:33 UTC 2022 - Fridrich Strba 
+
+- Build with source/target levels 8
+- Added patch:
+  * atinject-javadoc.patch
+    + fix build with javadoc 17
+
 -------------------------------------------------------------------
 Wed Oct 24 21:00:03 UTC 2018 - Fridrich Strba 
 
diff --git a/atinject.spec b/atinject.spec
index 24e0204..9e6fedc 100644
--- a/atinject.spec
+++ b/atinject.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package atinject
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@ Release:        0
 Summary:        Dependency injection specification for Java (JSR-330)
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://javax-inject.github.io/javax-inject/
+URL:            https://javax-inject.github.io/javax-inject/
 # git clone --bare git@github.com:javax-inject/javax-inject
 # git --git-dir=javax-inject.git archive --prefix %{name}-%{base_version}/ --format tar %{git_tag} | xz >%{name}-%{base_version}.tar.xz
 Source0:        %{name}-%{base_version}.tar.xz
@@ -33,8 +33,9 @@ Source0:        %{name}-%{base_version}.tar.xz
 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.6
+BuildRequires:  java-devel > 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  junit
 BuildRequires:  xz
@@ -65,6 +66,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{base_version}
+%patch0 -p1
 cp %{SOURCE3} LICENSE
 rm -rf lib/*
 build-jar-repository -p lib junit
@@ -76,8 +78,8 @@ sed -i -e 's/pom\.groupId/project.groupId/' tck-pom.xml
 set -e
 alias rm=:
 alias xargs=:
-alias javadoc='javadoc -source 6 -notimestamp'
-alias javac='javac -source 6 -target 6'
+alias javadoc='javadoc -source 8 -notimestamp'
+alias javac='javac -source 8 -target 8'
 . ./build.sh
 
 # Inject OSGi manifests required by Eclipse.