!19 [sync] PR-17: Rebuild for branch 24.03-LTS

From: @openeuler-sync-bot 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530

0001-Support-threads-and-skipTests-params.patch

@@ -0,0 +1,57 @@
+From d42f9bd30116e3427762c8640156ff0259621f45 Mon Sep 17 00:00:00 2001
+From: maminjie <maminjie1@huawei.com>
+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
+

0001-make-glob-pattern-work-with-python3.10.patch

@@ -0,0 +1,24 @@
+From 245030d5b245b348ccc4304f7e1c54991e1427a1 Mon Sep 17 00:00:00 2001
+From: baizg1107 <preloyalwhite@163.com>
+Date: Fri, 11 Feb 2022 11:13:49 +0800
+Subject: [PATCH] make glob pattern work with python3.10
+
+---
+ install | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/install b/install
+index 9a5f108..3b2c350 100755
+--- a/install
++++ b/install
+@@ -256,5 +256,5 @@ inst_data target/gradle_build.7 "${mandir}/man7"
+ 
+ exec >files-python
+ (cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2
+-echo "${prefix}/lib/python?.?/site-packages/javapackages"
+-echo "${prefix}/lib/python?.?/site-packages/javapackages-*.egg-info"
++echo "${prefix}/lib/python*/site-packages/javapackages"
++echo "${prefix}/lib/python*/site-packages/javapackages-*.egg-info"
+-- 
+2.27.0
+

javapackages-tools.spec

@@ -3,14 +3,16 @@
 
 Name:           javapackages-tools
 Version:        5.3.0
-Release:        2
+Release:        6
 Summary:        Support for Java packaging with macros and scripts
-License:        BSD
+License:        BSD-3-Clause
 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
+Patch0001:	0001-make-glob-pattern-work-with-python3.10.patch
 BuildArch:      noarch
 BuildRequires:  coreutils which make asciidoc xmlto python3-devel python3-lxml
-BuildRequires:  python3-setuptools python3-nose python3-six
+BuildRequires:  python3-setuptools python3-six
 Requires:       javapackages-filesystem = %{version}-%{release} coreutils
 Requires:       findutils which java-1.8.0-openjdk-headless
 Provides:       jpackage-utils = %{version}-%{release} mvn(com.sun:tools) = SYSTEM
@@ -95,7 +97,11 @@ Java packaging.
 sed -e 's/.[17]$/&*/' -i files-*
 
 %check
-./check
+. ./config.status
+for test in test/java-functions/*_test.sh; do
+    echo "`basename $test`:"
+    sh $test
+done
 
 %files -f files-tools
 
@@ -113,5 +119,17 @@ sed -e 's/.[17]$/&*/' -i files-*
 %license LICENSE
 
 %changelog
+* Fri Mar 29 2024 Ge Wang <wang__ge@126.com> - 5.3.0-6
+- Rebuild for next release
+
+* Wed May 11 2022 Ge Wang <wangge20@h-partner.com> - 5.3.0-5
+- License compliance rectification
+
+* Fri Feb 11 2022 baizhonggui <baizhonggui@huawei.com> - 5.3.0-4
+- Deprecate python-nose and fix python version not recognized
+
+* Fri Apr 16 2021 maminjie <maminjie1@huawei.com> - 5.3.0-3
+- Support threads and skipTests params
+
 * Tue Dec 10 2019 yanzhihua4 <yanzhihua4@huawei.com> - 5.3.0-2
 - Package init

javapackages-tools.yaml

@@ -0,0 +1,4 @@
+version_control: github
+src_repo:  fedora-java/javapackages
+tag_prefix: ^v
+seperator: .