Skip execution of various Maven plugins
This commit is contained in:
parent
e13aca838f
commit
813ab6d574
@ -1,7 +1,7 @@
|
|||||||
From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001
|
From 760c3e7a568295ded8229b06e651915c78475ccd Mon Sep 17 00:00:00 2001
|
||||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
Date: Fri, 26 Apr 2019 00:50:00 +0200
|
Date: Fri, 26 Apr 2019 00:50:00 +0200
|
||||||
Subject: [PATCH 1/3] Move python modules under java-utils directory
|
Subject: [PATCH 1/4] Move python modules under java-utils directory
|
||||||
|
|
||||||
---
|
---
|
||||||
depgenerators/javadoc.req | 3 +++
|
depgenerators/javadoc.req | 3 +++
|
||||||
@ -241,5 +241,5 @@ index 68cb1119..55dfd985 100644
|
|||||||
install_maven_artifact)
|
install_maven_artifact)
|
||||||
|
|
||||||
--
|
--
|
||||||
2.21.0
|
2.25.4
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001
|
From 48f5467fea8006cf0fe091d28fd879e6aed5a4b1 Mon Sep 17 00:00:00 2001
|
||||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
Date: Fri, 28 Jun 2019 14:53:26 +0200
|
Date: Fri, 28 Jun 2019 14:53:26 +0200
|
||||||
Subject: [PATCH 2/3] Enable namespaced dependency generation
|
Subject: [PATCH 2/4] Enable namespaced dependency generation
|
||||||
|
|
||||||
---
|
---
|
||||||
depgenerators/fileattrs/javadoc.attr | 2 +-
|
depgenerators/fileattrs/javadoc.attr | 2 +-
|
||||||
@ -44,5 +44,5 @@ index 7c3ea03d..3ccc8b65 100644
|
|||||||
+%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))}
|
+%__osgi_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))}
|
||||||
%__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
|
%__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
|
||||||
--
|
--
|
||||||
2.21.0
|
2.25.4
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001
|
From 0b0f93a4bc050a67e6885a647270a716f3d9cdce Mon Sep 17 00:00:00 2001
|
||||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
Date: Mon, 2 Sep 2019 18:10:01 +0200
|
Date: Mon, 2 Sep 2019 18:10:01 +0200
|
||||||
Subject: [PATCH 3/3] Fix use of illegal characters in rpmfc generator names
|
Subject: [PATCH 3/4] Fix use of illegal characters in rpmfc generator names
|
||||||
|
|
||||||
---
|
---
|
||||||
configure-base.sh | 2 +-
|
configure-base.sh | 2 +-
|
||||||
@ -63,5 +63,5 @@ index 3ccc8b65..8b0f15f7 100644
|
|||||||
+%__osgi@{scl_suffix}_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))}
|
+%__osgi@{scl_suffix}_requires_opts --cachedir %{_builddir}/%{?buildsubdir} --rpm-pid %{lua:print(math.floor(posix.getprocessid("pid")))}
|
||||||
+%__osgi@{scl_suffix}_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
|
+%__osgi@{scl_suffix}_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$
|
||||||
--
|
--
|
||||||
2.21.0
|
2.25.4
|
||||||
|
|
||||||
|
80
0004-Skip-execution-of-various-Maven-plugins.patch
Normal file
80
0004-Skip-execution-of-various-Maven-plugins.patch
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
From 4e9d0cd44cc47e88f48f160e5b2fd74d944147e5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||||
|
Date: Sat, 29 Jun 2019 12:09:25 +0200
|
||||||
|
Subject: [PATCH 4/4] Skip execution of various Maven plugins
|
||||||
|
|
||||||
|
Resolves: #70
|
||||||
|
---
|
||||||
|
configs/configuration.xml | 56 +++++++++++++++++++++++++++++++++++++++
|
||||||
|
1 file changed, 56 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/configs/configuration.xml b/configs/configuration.xml
|
||||||
|
index b6288fea..2c1a941b 100644
|
||||||
|
--- a/configs/configuration.xml
|
||||||
|
+++ b/configs/configuration.xml
|
||||||
|
@@ -4,6 +4,62 @@
|
||||||
|
<metadataRepositories>
|
||||||
|
<repository>/usr/share/maven-metadata</repository>
|
||||||
|
</metadataRepositories>
|
||||||
|
+ <skippedPlugins>
|
||||||
|
+ <!-- Version of Java and bytecode level is always fixed in distro -->
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.codehaus.mojo</groupId>
|
||||||
|
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.apache.maven.plugins</groupId>
|
||||||
|
+ <artifactId>maven-enforcer-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <!-- Static analysis and code style is upstream's business -->
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.codehaus.moj</groupId>
|
||||||
|
+ <artifactId>findbugs-maven-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>com.github.spotbug</groupId>
|
||||||
|
+ <artifactId>spotbugs-maven-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.apache.maven.plugins</groupId>
|
||||||
|
+ <artifactId>maven-checkstyle-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.apache.maven.plugins</groupId>
|
||||||
|
+ <artifactId>maven-pmd-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <!-- Code coverage is upstream's business -->
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.jacoco</groupId>
|
||||||
|
+ <artifactId>jacoco-maven-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.eluder.coveralls</groupId>
|
||||||
|
+ <artifactId>coveralls-maven-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.codehaus.mojo</groupId>
|
||||||
|
+ <artifactId>cobertura-maven-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <!-- Release auditing is upstream's business -->
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.apache.rat</groupId>
|
||||||
|
+ <artifactId>apache-rat-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <!-- Cannot code sign in downstream builds -->
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.apache.maven.plugins</groupId>
|
||||||
|
+ <artifactId>maven-gpg-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ <!-- Cannot push artifacts to Nexus server -->
|
||||||
|
+ <plugin>
|
||||||
|
+ <groupId>org.sonatype.plugins</groupId>
|
||||||
|
+ <artifactId>nexus-staging-maven-plugin</artifactId>
|
||||||
|
+ </plugin>
|
||||||
|
+ </skippedPlugins>
|
||||||
|
</resolverSettings>
|
||||||
|
<installerSettings>
|
||||||
|
<metadataDir>usr/share/maven-metadata</metadataDir>
|
||||||
|
--
|
||||||
|
2.25.4
|
||||||
|
|
@ -37,6 +37,7 @@ Source2: toolchains-openjdk8.xml
|
|||||||
Patch1: 0001-Move-python-modules-under-java-utils-directory.patch
|
Patch1: 0001-Move-python-modules-under-java-utils-directory.patch
|
||||||
Patch2: 0002-Enable-namespaced-dependency-generation.patch
|
Patch2: 0002-Enable-namespaced-dependency-generation.patch
|
||||||
Patch3: 0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch
|
Patch3: 0003-Fix-use-of-illegal-characters-in-rpmfc-generator-nam.patch
|
||||||
|
Patch4: 0004-Skip-execution-of-various-Maven-plugins.patch
|
||||||
|
|
||||||
BuildRequires: coreutils
|
BuildRequires: coreutils
|
||||||
BuildRequires: which
|
BuildRequires: which
|
||||||
@ -140,6 +141,7 @@ OpenJDK 8 toolchain for XMvn
|
|||||||
%patch1 -p1
|
%patch1 -p1
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
|
%patch4 -p1
|
||||||
|
|
||||||
sed -i '/^manpage /d' build
|
sed -i '/^manpage /d' build
|
||||||
sed -i '/${mandir}/d' install
|
sed -i '/${mandir}/d' install
|
||||||
|
Loading…
Reference in New Issue
Block a user