已开启
Bump version to 0.5.0-3 #13
crrs666创建于 8 天前
Bump version to 0.5.0-3 #13
已开启
共 3 个文件变更+48-14
Binary files do not support preview
| @@ -1,33 +1,60 @@ | |||
| 1 | +# | ||
| 2 | +# java-client-kubevirt | ||
| 3 | +# Copyright (C) 2019 Red Hat, Inc. | ||
| 4 | +# | ||
| 5 | +# This library is free software; you can redistribute it and/or | ||
| 6 | +# modify it under the terms of the GNU Lesser General Public | ||
| 7 | +# License as published by the Free Software Foundation; either | ||
| 8 | +# version 2.1 of the License, or (at your option) any later version. | ||
| 9 | +# | ||
| 10 | +# This library is distributed in the hope that it will be useful, | ||
| 11 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 12 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| 13 | +# Lesser General Public License for more details. | ||
| 14 | +# | ||
| 15 | +# You should have received a copy of the GNU Lesser General Public | ||
| 16 | +# License along with this library; if not, write to the Free Software | ||
| 17 | +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | ||
| 18 | +# | ||
| 19 | + | ||
| 1 | %global package_version 0.5.0 | 20 | %global package_version 0.5.0 |
| 2 | %global package_maven_version 0.5.0 | 21 | %global package_maven_version 0.5.0 |
| 3 | 22 | ||
| 4 | -%global _java_jdk_home /usr/lib/jvm/java-11-openjdk | ||
| 5 | - | ||
| 6 | Summary: Kubevirt java client (%{name}) for oVirt | 23 | Summary: Kubevirt java client (%{name}) for oVirt |
| 7 | Name: java-client-kubevirt | 24 | Name: java-client-kubevirt |
| 8 | Version: 0.5.0 | 25 | Version: 0.5.0 |
| 9 | -Release: 2 | 26 | +Release: 3 |
| 10 | License: LGPLv2+ | 27 | License: LGPLv2+ |
| 11 | URL: http://www.ovirt.org | 28 | URL: http://www.ovirt.org |
| 12 | -Source: http://resources.ovirt.org/pub/ovirt-master-snapshot/src/%{name}/%{name}-%{package_version}.tar.gz | 29 | +Source0: http://resources.ovirt.org/pub/ovirt-master-snapshot/src/%{name}/%{name}-%{package_version}.tar.gz |
| 30 | +Source1: artifact-deps.tar.gz | ||
| 13 | Group: Development/Libraries | 31 | Group: Development/Libraries |
| 14 | 32 | ||
| 15 | BuildArch: noarch | 33 | BuildArch: noarch |
| 16 | 34 | ||
| 17 | BuildRequires: gcc | 35 | BuildRequires: gcc |
| 18 | -BuildRequires: java-11-openjdk-devel >= 11.0.4 | 36 | +BuildRequires: (java-11-openjdk or java-21-openjdk-devel) |
| 37 | + | ||
| 38 | + | ||
| 19 | BuildRequires: javapackages-local | 39 | BuildRequires: javapackages-local |
| 20 | BuildRequires: maven >= 3.5.0 | 40 | BuildRequires: maven >= 3.5.0 |
| 21 | -BuildRequires: maven-local | 41 | +BuildRequires: maven-local-openjdk21 |
| 42 | +BuildRequires: maven-dependency-plugin | ||
| 22 | BuildRequires: maven-shade-plugin | 43 | BuildRequires: maven-shade-plugin |
| 23 | BuildRequires: maven-source-plugin | 44 | BuildRequires: maven-source-plugin |
| 24 | -BuildRequires: maven-compiler-plugin | 45 | +BuildRequires: maven-compiler-plugin |
| 25 | -BuildRequires: maven-profile | 46 | +# Add by wd |
| 26 | -BuildRequires: maven-plugin-registry | 47 | +BuildRequires: maven-install-plugin |
| 48 | +BuildRequires: maven-clean-plugin | ||
| 49 | +# A few depencies are not yet packaged. Allowing xmvn to fetch them | ||
| 50 | +BuildRequires: maven-wagon-http | ||
| 51 | +BuildRequires: maven-resolver-connector-basic | ||
| 52 | +BuildRequires: maven-resolver-transport-wagon | ||
| 27 | 53 | ||
| 28 | # All are provided by our fat jar | 54 | # All are provided by our fat jar |
| 29 | Provides: mvn(io.kubernetes:client-java) = 6.0.1 | 55 | Provides: mvn(io.kubernetes:client-java) = 6.0.1 |
| 30 | Provides: mvn(io.gsonfire:gson-fire) = 1.8.3 | 56 | Provides: mvn(io.gsonfire:gson-fire) = 1.8.3 |
| 57 | +Provides: mvn(javax.annotation:javax.annotation-api) = 1.3.2 | ||
| 31 | 58 | ||
| 32 | %description | 59 | %description |
| 33 | java client kubevirt | 60 | java client kubevirt |
| @@ -41,17 +68,21 @@ This package contains the API documentation for %{name}. | |||
| 41 | 68 | ||
| 42 | %prep | 69 | %prep |
| 43 | %setup -q -n %{name}-%{package_version} | 70 | %setup -q -n %{name}-%{package_version} |
| 71 | +%setup -q -D -T -a 1 | ||
| 72 | +# No need for maven-javadoc-plugin in RHEL 8, xmvn will take care of it. | ||
| 73 | +%pom_remove_plugin -r :maven-javadoc-plugin pom.xml.in | ||
| 74 | + | ||
| 75 | +# No need for central-publishing-maven-plugin, this is only used for deployments. | ||
| 76 | +%pom_remove_plugin org.sonatype.central:central-publishing-maven-plugin pom.xml.in | ||
| 44 | 77 | ||
| 45 | %build | 78 | %build |
| 46 | %configure MVN="xmvn" | 79 | %configure MVN="xmvn" |
| 80 | + | ||
| 47 | # this step is necessary to resolve mvn dependencies that are not available | 81 | # this step is necessary to resolve mvn dependencies that are not available |
| 48 | # as RPM distribution | 82 | # as RPM distribution |
| 49 | -make %{?_smp_mflags} | 83 | +#make %{?_smp_mflags} |
| 50 | 84 | ||
| 51 | -# necessary because jdk 1.8 comes as default with xmvn | 85 | +%mvn_build -i -X -d -- %{?_mvn_opts} -Dmaven.repo.local=$(pwd)/localrepo |
| 52 | -export JAVA_HOME="%{_java_jdk_home}" | ||
| 53 | - | ||
| 54 | -%mvn_build -i -- %{?_mvn_opts} | ||
| 55 | %mvn_artifact dependency-reduced-pom.xml target/java-client-kubevirt-%{version}.jar | 86 | %mvn_artifact dependency-reduced-pom.xml target/java-client-kubevirt-%{version}.jar |
| 56 | 87 | ||
| 57 | %install | 88 | %install |
| @@ -63,6 +94,9 @@ export JAVA_HOME="%{_java_jdk_home}" | |||
| 63 | %files javadoc -f .mfiles-javadoc | 94 | %files javadoc -f .mfiles-javadoc |
| 64 | 95 | ||
| 65 | %changelog | 96 | %changelog |
| 97 | +* Tue Sep 01 2026 crrs666 <wangdi@kylinos.cn> - 0.5.0-3 | ||
| 98 | +- Bump version to 0.5.0-3 | ||
| 99 | + | ||
| 66 | * Tue Nov 30 2021 caodongxia <caodongxia@huawei.com> - 0.5.0-2 | 100 | * Tue Nov 30 2021 caodongxia <caodongxia@huawei.com> - 0.5.0-2 |
| 67 | - Remove useless provided | 101 | - Remove useless provided |
| 68 | 102 | ||