From 8bf06992a8f44743a75fa7cb24481325fe34382f296df76b773c5224f782e689 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 10 Jun 2024 16:33:36 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-javadoc-plugin?expand=0&rev=53

---
 maven-javadoc-plugin.changes | 5 +++++
 maven-javadoc-plugin.spec    | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/maven-javadoc-plugin.changes b/maven-javadoc-plugin.changes
index 1b51719..476a055 100644
--- a/maven-javadoc-plugin.changes
+++ b/maven-javadoc-plugin.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 10 16:33:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on jakarta-inject, needed by google-guice 6.0.0
+
 -------------------------------------------------------------------
 Tue Apr  2 17:26:28 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index df3d5d3..ae17678 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -44,6 +44,7 @@ BuildRequires:  google-guice
 BuildRequires:  guava
 BuildRequires:  httpcomponents-client
 BuildRequires:  httpcomponents-core
+BuildRequires:  jakarta-inject
 BuildRequires:  javapackages-local
 BuildRequires:  jdom2
 BuildRequires:  maven-archiver
@@ -147,6 +148,7 @@ build-jar-repository -s lib \
     guice/google-guice-no_aop \
     httpcomponents/httpclient \
     httpcomponents/httpcore \
+    jakarta-inject \
     jdom2/jdom2 \
     maven-archiver/maven-archiver \
     maven-common-artifact-filters/maven-common-artifact-filters \

From ce20f5ef6ec99b3f909ffba44029dd56981892eeec76714d57bf14c9e99cb215 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 10 Jun 2024 17:20:26 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-javadoc-plugin?expand=0&rev=54

---
 maven-javadoc-plugin-build.xml | 64 ++--------------------------------
 maven-javadoc-plugin.changes   |  4 ++-
 maven-javadoc-plugin.spec      | 27 +-------------
 3 files changed, 7 insertions(+), 88 deletions(-)

diff --git a/maven-javadoc-plugin-build.xml b/maven-javadoc-plugin-build.xml
index 3786763..3a64dc6 100644
--- a/maven-javadoc-plugin-build.xml
+++ b/maven-javadoc-plugin-build.xml
@@ -142,34 +142,6 @@
     <copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Target to generate Plexus component.xml                                -->
-  <!-- ====================================================================== -->
-
-  <target name="plexus"
-          depends="compile"
-          description="Generate Plexus component.xml">
-    <mkdir dir="${build.outputDir}/META-INF/plexus"/>
-    <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
-          failonerror="true"
-          fork="true">
-      <!-- <jvmarg value="-verbose"/> -->
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-      </classpath>
-      <arg value="-X"/>
-      <arg value="-s"/>
-      <arg value="${build.srcDir}"/>
-      <arg value="-c"/>
-      <arg value="${build.outputDir}"/>
-      <arg value="-m"/>
-      <arg value="${build.outputDir}/META-INF/plexus"/>
-      <arg value="-o"/>
-      <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
-    </java>
-  </target>
-
   <!-- ====================================================================== -->
   <!-- Sisu javax.inject.Named generation target                              -->
   <!-- ====================================================================== -->
@@ -197,7 +169,7 @@
   <!-- ====================================================================== -->
 
   <target name="compile-tests"
-          depends="plexus"
+          depends="compile"
           description="Compile the test code"
           unless="test.skip">
     <mkdir dir="${build.testOutputDir}"/>
@@ -224,42 +196,12 @@
     </copy>
   </target>
 
-  <!-- ====================================================================== -->
-  <!-- Target to generate Plexus component.xml                                -->
-  <!-- ====================================================================== -->
-
-  <target name="plexus-tests"
-          depends="compile-tests"
-          description="Generate Plexus component.xml for tests"
-          unless="test.skip">
-    <mkdir dir="${build.outputDir}/META-INF/plexus"/>
-    <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
-          failonerror="true"
-          fork="true">
-      <!-- <jvmarg value="-verbose"/> -->
-      <classpath>
-        <path refid="build.testclasspath"/>
-        <pathelement location="${build.outputDir}"/>
-        <pathelement location="${build.restOutputDir}"/>
-      </classpath>
-      <arg value="-X"/>
-      <arg value="-s"/>
-      <arg value="${build.testDir}"/>
-      <arg value="-c"/>
-      <arg value="${build.restOutputDir}"/>
-      <arg value="-m"/>
-      <arg value="${build.restOutputDir}/META-INF/plexus"/>
-      <arg value="-o"/>
-      <arg value="${build.restOutputDir}/META-INF/plexus/components.xml"/>
-    </java>
-  </target>
-
   <!-- ====================================================================== -->
   <!-- Run all tests                                                          -->
   <!-- ====================================================================== -->
 
   <target name="test"
-          depends="plexus-tests, junit-missing"
+          depends="junit-missing"
           unless="junit.skipped"
           description="Run the test cases">
     <mkdir dir="${test.reports}"/>
@@ -355,7 +297,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="sisu,plexus,test" description="Package the application">
+  <target name="package" depends="sisu,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"
diff --git a/maven-javadoc-plugin.changes b/maven-javadoc-plugin.changes
index 476a055..65ca0fb 100644
--- a/maven-javadoc-plugin.changes
+++ b/maven-javadoc-plugin.changes
@@ -1,7 +1,9 @@
 -------------------------------------------------------------------
 Mon Jun 10 16:33:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
-- Add dependency on jakarta-inject, needed by google-guice 6.0.0
+- Remove dependency on plexus-metadata-generator,
+  plexus-component-metadata and on their dependencies, since there
+  is no plexus @Component annotation any more
 
 -------------------------------------------------------------------
 Tue Apr  2 17:26:28 UTC 2024 - Fridrich Strba <fstrba@suse.com>
diff --git a/maven-javadoc-plugin.spec b/maven-javadoc-plugin.spec
index ae17678..3da0f1d 100644
--- a/maven-javadoc-plugin.spec
+++ b/maven-javadoc-plugin.spec
@@ -34,19 +34,13 @@ Source1:        %{base_name}-build.xml
 Patch0:         %{base_name}-bootstrap-resources.patch
 Patch1:         stale-data-encoding.patch
 Patch2:         no-override.patch
-BuildRequires:  apache-commons-cli
-BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
 BuildRequires:  apache-commons-text
 BuildRequires:  atinject
 BuildRequires:  fdupes
-BuildRequires:  google-guice
-BuildRequires:  guava
 BuildRequires:  httpcomponents-client
 BuildRequires:  httpcomponents-core
-BuildRequires:  jakarta-inject
 BuildRequires:  javapackages-local
-BuildRequires:  jdom2
 BuildRequires:  maven-archiver
 BuildRequires:  maven-common-artifact-filters
 BuildRequires:  maven-doxia-core
@@ -62,11 +56,7 @@ BuildRequires:  maven-resolver-api
 BuildRequires:  maven-resolver-util
 BuildRequires:  maven-shared-utils
 BuildRequires:  maven-wagon-provider-api
-BuildRequires:  objectweb-asm
 BuildRequires:  plexus-archiver
-BuildRequires:  plexus-classworlds
-BuildRequires:  plexus-cli
-BuildRequires:  plexus-containers-component-annotations
 BuildRequires:  plexus-interactivity-api
 BuildRequires:  plexus-io
 BuildRequires:  plexus-languages
@@ -76,7 +66,6 @@ BuildRequires:  qdox
 BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
 BuildRequires:  unzip
-BuildRequires:  xbean
 BuildRequires:  xmvn-install
 BuildRequires:  xmvn-resolve
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
@@ -85,7 +74,6 @@ BuildArch:      noarch
 Name:           %{base_name}-bootstrap
 BuildRequires:  ant
 BuildRequires:  modello >= 2.0.0
-BuildRequires:  plexus-metadata-generator
 %else
 Name:           %{base_name}
 BuildRequires:  xmvn
@@ -97,7 +85,6 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:) >= 40
 BuildRequires:  mvn(org.apache.maven.plugins:maven-resources-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-surefire-plugin)
 BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 Obsoletes:      %{base_name}-bootstrap
 #!BuildRequires: maven-compiler-plugin-bootstrap
@@ -142,14 +129,8 @@ build-jar-repository -s lib \
     apache-commons-lang3 \
     apache-commons-text \
     atinject \
-    commons-cli \
-    commons-io \
-    guava/guava \
-    guice/google-guice-no_aop \
     httpcomponents/httpclient \
     httpcomponents/httpcore \
-    jakarta-inject \
-    jdom2/jdom2 \
     maven-archiver/maven-archiver \
     maven-common-artifact-filters/maven-common-artifact-filters \
     maven-doxia/doxia-core \
@@ -171,21 +152,15 @@ build-jar-repository -s lib \
     maven-reporting-api/maven-reporting-api \
     maven-shared-utils/maven-shared-utils \
     maven-wagon/provider-api \
-    objectweb-asm/asm \
     org.eclipse.sisu.inject \
     org.eclipse.sisu.plexus \
     plexus/archiver \
-    plexus-classworlds \
-    plexus/cli \
-    plexus-containers/plexus-component-annotations \
     plexus/interactivity-api \
     plexus/io \
     plexus-languages/plexus-java \
-    plexus-metadata-generator \
     plexus/utils \
     plexus/xml \
-    qdox \
-    xbean/xbean-reflect
+    qdox
 %{ant} -Dtest.skip=true jar
 %else
 xmvn --batch-mode --offline \