From e0b4381306ad7d9b4077f55eba3554e9d4738daa518d9cf190b876ada628262a Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 7 Jun 2021 12:51:57 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-native?expand=0&rev=11

---
 maven-native.changes            |  5 --
 maven-native.spec               | 12 ++++-
 plexus_components-bcc.xml       | 33 ------------
 plexus_components-generic-c.xml | 32 -----------
 plexus_components-manager.xml   | 96 ---------------------------------
 plexus_components-msvc.xml      | 38 -------------
 6 files changed, 11 insertions(+), 205 deletions(-)
 delete mode 100644 plexus_components-bcc.xml
 delete mode 100644 plexus_components-generic-c.xml
 delete mode 100644 plexus_components-manager.xml
 delete mode 100644 plexus_components-msvc.xml

diff --git a/maven-native.changes b/maven-native.changes
index ada8561..503c466 100644
--- a/maven-native.changes
+++ b/maven-native.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Mon Jun  7 12:22:16 UTC 2021 - Fridrich Strba <fstrba@suse.com>
-
-- Add missing plexus-component.xml files
-
 -------------------------------------------------------------------
 Thu Oct  8 12:21:43 UTC 2020 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-native.spec b/maven-native.spec
index a6651ad..1020e0b 100644
--- a/maven-native.spec
+++ b/maven-native.spec
@@ -28,6 +28,7 @@ URL:            https://www.mojohaus.org/plugins.html
 Source0:        https://repo1.maven.org/maven2/org/codehaus/mojo/natives/%{name}/%{namedversion}/%{name}-%{namedversion}-source-release.zip
 BuildRequires:  fdupes
 BuildRequires:  maven-local
+BuildRequires:  mojo-parent
 BuildRequires:  unzip
 BuildRequires:  mvn(org.apache.bcel:bcel)
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
@@ -104,7 +105,16 @@ sed -i "s|edu.emory.mathcs.backport.java.util.concurrent|java.util.concurrent|"
 
 %build
 
-%{mvn_build} -f -s -- -Dmojo.java.target=1.7 -Dsource=7
+#  junit.framework.AssertionFailedError: Failed to create plexus container.
+# native-maven-plugin with maven3 test failures:
+# Caused by: java.lang.ClassNotFoundException: org.apache.maven.artifact.repository.Authentication
+#  java.lang.VerifyError: (class: org/apache/maven/project/MavenProject,
+# method: getSnapshotArtifactRepository signature: ()Lorg/apache/maven/artifact/repository/ArtifactRepository;)
+# Incompatible argument to function
+# force org.codehaus.plexus plexus-container-default 1.5.5 apis
+# test skipped cause: [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.15:test (default-test) on project native-maven-plugin: Execution default-test of goal org.apache.maven.plugins:maven-surefire-plugin:2.15:test failed: There was an error in the forked process
+# [ERROR] java.lang.NoClassDefFoundError: org/sonatype/aether/RepositorySystemSession
+%{mvn_build} -f -s -- -Dmojo.java.target=1.7 -Dmaven.test.failure.ignore=true -Dsource=7
 
 %install
 %mvn_install
diff --git a/plexus_components-bcc.xml b/plexus_components-bcc.xml
deleted file mode 100644
index b9b2ac3..0000000
--- a/plexus_components-bcc.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<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
deleted file mode 100644
index bf681b0..0000000
--- a/plexus_components-generic-c.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<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
deleted file mode 100644
index 9c1f734..0000000
--- a/plexus_components-manager.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<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
deleted file mode 100644
index 2ca3d17..0000000
--- a/plexus_components-msvc.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<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>