Accepting request 750844 from Java:packages

3.1.1

OBS-URL: https://build.opensuse.org/request/show/750844
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-javadoc-plugin?expand=0&rev=4

maven-javadoc-plugin-3.0.1-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3450bd9ea4739d275c3dc68975c3042ab1eb7d0a4a7f334a93e004f5f084266a
-size 3143304

maven-javadoc-plugin-3.1.1-source-release.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4d77714fee454bad1921c4cec87d3aa067d2e949557a0458ea1762fc269d5de2
+size 3382572

maven-javadoc-plugin-build.xml

@@ -14,10 +14,10 @@
             value="The Apache Maven Javadoc Plugin is a plugin that uses the javadoc tool for generating javadocs for the specified project."/>
   <property name="project.groupId" value="org.apache.maven.plugins"/>
   <property name="project.artifactId" value="maven-javadoc-plugin"/>
-  <property name="project.version" value="3.0.1"/>
+  <property name="project.version" value="3.1.1"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.0"/>
+  <property name="spec.version" value="3.1"/>
 
   <property name="compiler.source" value="1.7"/>
   <property name="compiler.target" value="${compiler.source}"/>

maven-javadoc-plugin.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Nov 24 17:40:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to version 3.1.1
+- Modified patch:
+  * maven-javadoc-plugin-bootstrap-resources.patch
+    + Regenerate patch from the non-bootstrap build
+
+-------------------------------------------------------------------
+Thu Nov 21 16:33:35 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Fix build with maven-invoker-3.0.1 that has a new dependency
+  on maven-shared-utils
+
 -------------------------------------------------------------------
 Mon Oct  7 13:50:06 UTC 2019 - Bernhard Wiedemann <bwiedemann@suse.com>
 

maven-javadoc-plugin.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package maven
+# spec file for package maven-javadoc-plugin
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %bcond_with bootstrap
 %endif
 %global base_name maven-javadoc-plugin
-Version:        3.0.1
+Version:        3.1.1
 Release:        0
 Summary:        Maven plugin for creating javadocs
 License:        Apache-2.0
@@ -58,6 +58,7 @@ BuildRequires:  maven-invoker
 BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
 BuildRequires:  maven-reporting-api
+BuildRequires:  maven-shared-utils
 BuildRequires:  maven-wagon-provider-api
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-archiver
@@ -125,8 +126,7 @@ cp %{SOURCE1} build.xml
 %patch1 -p1
 %patch2 -p1
 
-%pom_remove_plugin :maven-enforcer-plugin
-
+%pom_xpath_remove pom:project/pom:parent/pom:relativePath
 %pom_remove_dep :::test:
 
 %build
@@ -159,6 +159,7 @@ build-jar-repository -s lib \
 	maven/maven-settings \
 	maven-plugin-tools/maven-plugin-annotations \
 	maven-reporting-api/maven-reporting-api \
+	maven-shared-utils/maven-shared-utils \
 	maven-wagon/provider-api \
 	objectweb-asm/asm \
 	org.eclipse.sisu.inject \
@@ -178,6 +179,9 @@ build-jar-repository -s lib \
 %else
 xmvn --batch-mode --offline \
 	-Dmaven.test.skip=true -DmavenVersion=3.5.0 \
+%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
+	-Dmaven.compiler.release=7 \
+%endif
 	package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
 %endif