OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-javadoc-plugin?expand=0&rev=75

maven-javadoc-plugin.spec

@@ -35,7 +35,6 @@ Patch0:         %{base_name}-bootstrap-resources.patch
 Patch1:         0001-Be-consistent-about-data-encoding-when-copying-files.patch
 Patch2:         0002-Make-the-legacyMode-consistent-and-actually-useful.patch
 Patch3:         0003-reproducible-from-environment.patch
-Patch4:         0004-Do-not-touch-the-outputTimeStamp-at-all-if-SOURCE_DA.patch
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
 BuildRequires:  apache-commons-text
@@ -49,6 +48,7 @@ BuildRequires:  maven-common-artifact-filters
 BuildRequires:  maven-doxia-sink-api
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-invoker
+BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
 BuildRequires:  maven-reporting-api
 BuildRequires:  maven-reporting-impl
@@ -57,7 +57,6 @@ BuildRequires:  maven-resolver-impl
 BuildRequires:  maven-resolver-util
 BuildRequires:  maven-shared-utils
 BuildRequires:  maven-wagon-provider-api
-BuildRequires:  maven3-lib
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-archiver
 BuildRequires:  plexus-interactivity-api
@@ -120,15 +119,9 @@ cp %{SOURCE1} build.xml
 %patch -P 1 -p1
 %patch -P 2 -p1
 %patch -P 3 -p1
-%patch -P 4 -p1
 
 %pom_remove_dep :::test:
 
-%pom_xpath_set pom:project/pom:properties/pom:mavenVersion 3
-%pom_change_dep org.apache.maven::\${mavenVersion}:provided :::compile
-%pom_xpath_set pom:project/pom:properties/pom:resolverVersion 1
-%pom_change_dep org.apache.maven.resolver::\${resolverVersion}:provided :::compile
-
 %build
 %if %{with bootstrap}
 mkdir -p lib
@@ -146,12 +139,12 @@ build-jar-repository -s lib \
     maven-doxia-sitetools/doxia-integration-tools \
     maven-doxia-sitetools/doxia-site-renderer \
     maven-invoker/maven-invoker \
-    maven/maven-artifact-3 \
-    maven/maven-core-3 \
-    maven/maven-model-3 \
-    maven/maven-model-builder-3 \
-    maven/maven-plugin-api-3 \
-    maven/maven-settings-3 \
+    maven/maven-artifact \
+    maven/maven-core \
+    maven/maven-model \
+    maven/maven-model-builder \
+    maven/maven-plugin-api \
+    maven/maven-settings \
     maven-plugin-tools/maven-plugin-annotations \
     maven-resolver/maven-resolver-api \
     maven-resolver/maven-resolver-util \
@@ -171,9 +164,8 @@ build-jar-repository -s lib \
     slf4j/api
 ant -Dtest.skip=true jar
 %else
-mkdir -p .mvn
 xmvn --batch-mode --offline \
-    -Dmaven.test.skip=true \
+    -Dmaven.test.skip=true -DmavenVersion=3.5.0 \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
     -Dmaven.compiler.release=8 \
 %endif