From 6af72f74c202f6c7dd6450ef14eb6a18b4be37de868ddb5bdd3e38a293ff6dda Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 25 Mar 2022 07:59:48 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-native?expand=0&rev=14

---
 maven-native.changes            |  6 +++
 maven-native.spec               | 15 +++++-
 plexus_components-bcc.xml       | 33 ++++++++++++
 plexus_components-generic-c.xml | 32 +++++++++++
 plexus_components-manager.xml   | 96 +++++++++++++++++++++++++++++++++
 plexus_components-msvc.xml      | 38 +++++++++++++
 6 files changed, 218 insertions(+), 2 deletions(-)
 create mode 100644 plexus_components-bcc.xml
 create mode 100644 plexus_components-generic-c.xml
 create mode 100644 plexus_components-manager.xml
 create mode 100644 plexus_components-msvc.xml

diff --git a/maven-native.changes b/maven-native.changes
index d91ae00..59344b1 100644
--- a/maven-native.changes
+++ b/maven-native.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 25 07:57:38 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Put back the plexus components.xml files from alpha-8, since
+  they are not correctly genrated from the annotations 
+
 -------------------------------------------------------------------
 Wed Jul 28 07:38:26 UTC 2021 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-native.spec b/maven-native.spec
index 1768824..43fe0ba 100644
--- a/maven-native.spec
+++ b/maven-native.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package maven-native
 #
-# Copyright (c) 2021 SUSE LLC
+# 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
@@ -26,7 +26,12 @@ Group:          Development/Libraries/Java
 URL:            https://www.mojohaus.org/plugins.html
 # Source code available @ https://github.com/mojohaus/maven-native
 Source0:        https://repo1.maven.org/maven2/org/codehaus/mojo/natives/%{name}/%{namedversion}/%{name}-%{namedversion}-source-release.zip
+Source1:        plexus_components-bcc.xml
+Source2:        plexus_components-generic-c.xml
+Source3:        plexus_components-manager.xml
+Source4:        plexus_components-msvc.xml
 BuildRequires:  fdupes
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  maven-local
 BuildRequires:  mojo-parent
 BuildRequires:  unzip
@@ -103,9 +108,15 @@ sed -i "s|edu.emory.mathcs.backport.java.util.concurrent|java.util.concurrent|"
 %{mvn_package} ":%{name}-mingw" components
 %{mvn_package} ":native-maven-plugin" native-maven-plugin
 
+mkdir -p maven-native-components/maven-native-{bcc,generic-c,manager,msvc}/src/main/resources/META-INF/plexus/
+cp -a %{SOURCE1} maven-native-components/maven-native-bcc/src/main/resources/META-INF/plexus/components.xml
+cp -a %{SOURCE2} maven-native-components/maven-native-generic-c/src/main/resources/META-INF/plexus/components.xml
+cp -a %{SOURCE3} maven-native-components/maven-native-manager/src/main/resources/META-INF/plexus/components.xml
+cp -a %{SOURCE4} maven-native-components/maven-native-msvc/src/main/resources/META-INF/plexus/components.xml
+
 %build
 
-%{mvn_build} -f -s -- -Dmojo.java.target=1.7 -Dmaven.test.failure.ignore=true -Dsource=7
+%{mvn_build} -f -s -- -Dmojo.java.target=1.8 -Dmaven.test.failure.ignore=true -Dsource=8
 
 %install
 %mvn_install
diff --git a/plexus_components-bcc.xml b/plexus_components-bcc.xml
new file mode 100644
index 0000000..b9b2ac3
--- /dev/null
+++ b/plexus_components-bcc.xml
@@ -0,0 +1,33 @@
+<component-set>
+  <components>
+
+    <component>
+      <role>org.codehaus.mojo.natives.compiler.Compiler</role>
+      <role-hint>bcc</role-hint>
+      <implementation>org.codehaus.mojo.natives.bcc.BCCCompiler</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.linker.Linker</role>
+      <role-hint>tlib</role-hint>
+      <implementation>org.codehaus.mojo.natives.bcc.TLibLinker</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
+
+
+    <component>
+      <role>org.codehaus.mojo.natives.linker.Linker</role>
+      <role-hint>bcc</role-hint>
+      <implementation>org.codehaus.mojo.natives.bcc.BCCLinker</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.compiler.ResourceCompiler</role>
+      <role-hint>bcc</role-hint>
+      <implementation>org.codehaus.mojo.natives.bcc.BCCResourceCompiler</implementation>
+    </component>
+
+  </components>
+</component-set>
diff --git a/plexus_components-generic-c.xml b/plexus_components-generic-c.xml
new file mode 100644
index 0000000..bf681b0
--- /dev/null
+++ b/plexus_components-generic-c.xml
@@ -0,0 +1,32 @@
+<component-set>
+  <components>
+
+    <component>
+      <role>org.codehaus.mojo.natives.compiler.Compiler</role>
+      <role-hint>generic</role-hint>
+      <implementation>org.codehaus.mojo.natives.c.CCompiler</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.linker.Linker</role>
+      <role-hint>generic</role-hint>
+      <implementation>org.codehaus.mojo.natives.c.CLinker</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.compiler.Compiler</role>
+      <role-hint>generic-classic</role-hint>
+      <implementation>org.codehaus.mojo.natives.c.CCompilerClassic</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.linker.Linker</role>
+      <role-hint>generic-classic</role-hint>
+      <implementation>org.codehaus.mojo.natives.c.CLinkerClassic</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
+  </components>
+</component-set>
diff --git a/plexus_components-manager.xml b/plexus_components-manager.xml
new file mode 100644
index 0000000..9c1f734
--- /dev/null
+++ b/plexus_components-manager.xml
@@ -0,0 +1,96 @@
+<component-set>
+  <components>
+    <component>
+      <role>org.codehaus.mojo.natives.manager.CompilerManager</role>
+      <role-hint>native-compiler-provider-manager</role-hint>
+      <implementation>org.codehaus.mojo.natives.manager.DefaultCompilerManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.mojo.natives.compiler.Compiler</role>
+          <field-name>providers</field-name>
+        </requirement>
+      </requirements>
+
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.manager.LinkerManager</role>
+      <role-hint>native-linker-provider-manager</role-hint>
+      <implementation>org.codehaus.mojo.natives.manager.DefaultLinkerManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.mojo.natives.linker.Linker</role>
+          <field-name>providers</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.manager.JavahManager</role>
+      <role-hint>native-javah-provider-manager</role-hint>
+      <implementation>org.codehaus.mojo.natives.manager.DefaultJavahManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.mojo.natives.javah.Javah</role>
+          <field-name>providers</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.manager.MessageCompilerManager</role>
+      <role-hint>native-message-compiler-provider-manager</role-hint>
+      <implementation>org.codehaus.mojo.natives.manager.DefaultMessageCompilerManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.mojo.natives.compiler.MessageCompiler</role>
+          <field-name>providers</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.manager.ResourceCompilerManager</role>
+      <role-hint>native-resource-compiler-provider-manager</role-hint>
+      <implementation>org.codehaus.mojo.natives.manager.DefaultResourceCompilerManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.mojo.natives.compiler.ResourceCompiler</role>
+          <field-name>providers</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.manager.RanlibManager</role>
+      <role-hint>native-ranlib-provider-manager</role-hint>
+      <implementation>org.codehaus.mojo.natives.manager.DefaultRanlibManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.mojo.natives.linker.Ranlib</role>
+          <field-name>providers</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.manager.ManifestManager</role>
+      <role-hint>native-manifest-provider-manager</role-hint>
+      <implementation>org.codehaus.mojo.natives.manager.DefaultManifestManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.codehaus.mojo.natives.linker.Manifest</role>
+          <field-name>providers</field-name>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.manager.EnvFactoryManager</role>
+      <role-hint>default</role-hint>
+      <implementation>org.codehaus.mojo.natives.manager.DefaultEnvFactoryManager</implementation>
+      <instantiation-strategy>singleton</instantiation-strategy>
+    </component>
+
+  </components>
+</component-set>
diff --git a/plexus_components-msvc.xml b/plexus_components-msvc.xml
new file mode 100644
index 0000000..2ca3d17
--- /dev/null
+++ b/plexus_components-msvc.xml
@@ -0,0 +1,38 @@
+<component-set>
+  <components>
+
+    <!-- | Generic MSVC compiler and linker, user must call MSVC setup up script -->
+    <component>
+      <role>org.codehaus.mojo.natives.compiler.Compiler</role>
+      <role-hint>msvc</role-hint>
+      <implementation>org.codehaus.mojo.natives.msvc.MSVCCompiler</implementation>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.linker.Linker</role>
+      <role-hint>msvc</role-hint>
+      <implementation>org.codehaus.mojo.natives.msvc.MSVCLinker</implementation>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.compiler.MessageCompiler</role>
+      <role-hint>msvc</role-hint>
+      <implementation>org.codehaus.mojo.natives.msvc.MSVCMessageCompiler</implementation>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.compiler.ResourceCompiler</role>
+      <role-hint>msvc</role-hint>
+      <implementation>org.codehaus.mojo.natives.msvc.MSVCResourceCompiler</implementation>
+    </component>
+
+    <component>
+      <role>org.codehaus.mojo.natives.linker.Manifest</role>
+      <role-hint>msvc</role-hint>
+      <implementation>org.codehaus.mojo.natives.msvc.MSVCManifest</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>
+
+
+  </components>
+</component-set>