forked from pool/maven-javadoc-plugin
This commit is contained in:
parent
e28313a0c4
commit
49ec9021f4
39
maven-javadoc-plugin-ioexception.patch
Normal file
39
maven-javadoc-plugin-ioexception.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
diff -urEbwB maven-javadoc-plugin-3.3.2.orig/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
|
||||||
|
--- maven-javadoc-plugin-3.3.2.orig/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 2022-10-25 16:12:07.505444128 +0200
|
||||||
|
+++ maven-javadoc-plugin-3.3.2/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java 2022-10-25 16:13:29.526000064 +0200
|
||||||
|
@@ -1154,7 +1154,7 @@
|
||||||
|
{
|
||||||
|
mavenHome = CommandLineUtils.getSystemEnvVars().getProperty( "M2_HOME" );
|
||||||
|
}
|
||||||
|
- catch ( IOException e )
|
||||||
|
+ catch ( Exception e )
|
||||||
|
{
|
||||||
|
if ( log != null && log.isDebugEnabled() )
|
||||||
|
{
|
||||||
|
@@ -1188,7 +1188,7 @@
|
||||||
|
{
|
||||||
|
mavenOpts = CommandLineUtils.getSystemEnvVars().getProperty( "MAVEN_OPTS" );
|
||||||
|
}
|
||||||
|
- catch ( IOException e )
|
||||||
|
+ catch ( Exception e )
|
||||||
|
{
|
||||||
|
if ( log != null && log.isDebugEnabled() )
|
||||||
|
{
|
||||||
|
@@ -1215,7 +1215,7 @@
|
||||||
|
{
|
||||||
|
javaHomeValue = CommandLineUtils.getSystemEnvVars().getProperty( "JAVA_HOME" );
|
||||||
|
}
|
||||||
|
- catch ( IOException e )
|
||||||
|
+ catch ( Exception e )
|
||||||
|
{
|
||||||
|
if ( log != null && log.isDebugEnabled() )
|
||||||
|
{
|
||||||
|
@@ -1266,7 +1266,7 @@
|
||||||
|
{
|
||||||
|
javaOpts = CommandLineUtils.getSystemEnvVars().getProperty( "JAVA_OPTS" );
|
||||||
|
}
|
||||||
|
- catch ( IOException e )
|
||||||
|
+ catch ( Exception e )
|
||||||
|
{
|
||||||
|
if ( log != null && log.isDebugEnabled() )
|
||||||
|
{
|
@ -1,3 +1,12 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Oct 25 14:16:58 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
- Added patch:
|
||||||
|
* maven-javadoc-plugin-ioexception.patch
|
||||||
|
+ allow building with wider range of plexus-utils versions,
|
||||||
|
including the 3.5.0 that does not declare IOException as
|
||||||
|
thrown in functions where it is actually not thrown.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri May 13 09:41:52 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
Fri May 13 09:41:52 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||||
|
|
||||||
|
@ -33,6 +33,7 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_n
|
|||||||
Source1: %{base_name}-build.xml
|
Source1: %{base_name}-build.xml
|
||||||
Patch0: %{base_name}-bootstrap-resources.patch
|
Patch0: %{base_name}-bootstrap-resources.patch
|
||||||
Patch1: stale-data-encoding.patch
|
Patch1: stale-data-encoding.patch
|
||||||
|
Patch2: maven-javadoc-plugin-ioexception.patch
|
||||||
BuildRequires: apache-commons-cli
|
BuildRequires: apache-commons-cli
|
||||||
BuildRequires: apache-commons-io
|
BuildRequires: apache-commons-io
|
||||||
BuildRequires: apache-commons-lang3
|
BuildRequires: apache-commons-lang3
|
||||||
@ -122,6 +123,7 @@ cp %{SOURCE1} build.xml
|
|||||||
%patch0 -p1
|
%patch0 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
|
%patch2 -p1
|
||||||
|
|
||||||
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
|
%pom_xpath_remove pom:project/pom:parent/pom:relativePath
|
||||||
%pom_remove_dep :::test:
|
%pom_remove_dep :::test:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user