diff --git a/0001-Support-threads-and-skipTests-params.patch b/0001-Support-threads-and-skipTests-params.patch new file mode 100644 index 0000000000000000000000000000000000000000..f6df52cb39a5b6227a54ed17d42c4f856e7112f6 --- /dev/null +++ b/0001-Support-threads-and-skipTests-params.patch @@ -0,0 +1,57 @@ +From d42f9bd30116e3427762c8640156ff0259621f45 Mon Sep 17 00:00:00 2001 +From: maminjie +Date: Fri, 16 Apr 2021 11:15:07 +0800 +Subject: [PATCH] Support threads and skipTests params + +--- + java-utils/mvn_build.py | 17 ++++++++++++++--- + 1 file changed, 14 insertions(+), 3 deletions(-) + +diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py +index 9847996..759a1c5 100644 +--- a/java-utils/mvn_build.py ++++ b/java-utils/mvn_build.py +@@ -71,6 +71,9 @@ if __name__ == "__main__": + parser.add_option("-f", "--force", "--skip-tests", + action="store_true", + help="Skip test compilation and execution.") ++ parser.add_option("--skipTests", ++ action="store_true", ++ help="Skip test execution.") + parser.add_option("-g", "--goal-before", "--pre", + dest="goal_before", + action="callback", +@@ -99,6 +102,8 @@ if __name__ == "__main__": + parser.add_option("--xmvn-javadoc", + action="store_true", + help="Use experimental XMvn javadoc MOJO to generate javadocs.") ++ parser.add_option("-T", "--threads", ++ help="Thread count, for instance 2.0C, where C is core multiplied.") + + sys.argv = args_to_unicode(sys.argv) + +@@ -130,12 +135,18 @@ if __name__ == "__main__": + if options.debug: + mvn_args.append("--debug") + ++ if options.threads: ++ mvn_args.append("-T %s" % (options.threads)) ++ + if options.xmvn_debug or options.debug: + mvn_args.append("-Dxmvn.debug") + +- if options.force: +- mvn_args.append("-Dmaven.test.skip=true") +- xc.add_custom_option("buildSettings/skipTests", "true") ++ if options.force or options.skipTests: ++ if options.force: ++ mvn_args.append("-Dmaven.test.skip=true") ++ xc.add_custom_option("buildSettings/skipTests", "true") ++ else: ++ mvn_args.append("-DskipTests=true") + if options.gradle: + base_goal = "assemble" + else: +-- +2.23.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 0f76b90048c0fb37a1f9dbc1ed5b890d512f0b57..dcc7e2b02952ad0fe9012e8e1abca092c1cd3a73 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -3,11 +3,12 @@ Name: javapackages-tools Version: 5.3.0 -Release: 2 +Release: 3 Summary: Support for Java packaging with macros and scripts License: BSD URL: https://github.com/fedora-java/javapackages Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz +Patch0000: 0001-Support-threads-and-skipTests-params.patch BuildArch: noarch BuildRequires: coreutils which make asciidoc xmlto python3-devel python3-lxml BuildRequires: python3-setuptools python3-nose python3-six @@ -113,5 +114,8 @@ sed -e 's/.[17]$/&*/' -i files-* %license LICENSE %changelog +* Fri Apr 16 2021 maminjie - 5.3.0-3 +- Support threads and skipTests params + * Tue Dec 10 2019 yanzhihua4 - 5.3.0-2 - Package init