Sync from SUSE:SLFO:Main maven-javadoc-plugin revision 2cd3fc0e19d89e1763071683392320f3

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"

maven-javadoc-plugin.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 10 16:33:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- 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>
 

maven-javadoc-plugin.spec

@@ -34,18 +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:  javapackages-local
-BuildRequires:  jdom2
 BuildRequires:  maven-archiver
 BuildRequires:  maven-common-artifact-filters
 BuildRequires:  maven-doxia-core
@@ -61,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
@@ -75,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:)
@@ -84,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
@@ -96,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
@@ -141,13 +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 \
-    jdom2/jdom2 \
     maven-archiver/maven-archiver \
     maven-common-artifact-filters/maven-common-artifact-filters \
     maven-doxia/doxia-core \
@@ -169,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 \