已开启
Upgrade to 5.18.1 #7
wang_kun11创建于 2025年9月23日
Upgrade to 5.18.1 #7
已开启
从refs/pull/7/head合入到openEuler-22.03-LTS-SP4
共 4 个文件变更+57-73
Binary files do not support preview
| @@ -1,92 +1,76 @@ | |||
| 1 | -%bcond_without buildtex | 1 | +%global codegen_version 3.8.9 |
| 2 | -%global jarname rabbitmq-client | 2 | +Name: rabbitmq-java-client |
| 3 | -%global failjava true | 3 | +Version: 5.18.0 |
| 4 | -%global failjunit no | 4 | +Release: 1 |
| 5 | -Name: rabbitmq-java-client | 5 | +Summary: Java AMQP client library |
| 6 | -Version: 3.6.5 | 6 | +License: Apache-2.0 AND GPL-2.0-or-later AND MPL-2.0 |
| 7 | -Release: 3 | 7 | +Group: Development/Libraries/Java |
| 8 | -Summary: Java Advanced Message Queue Protocol client library | 8 | +URL: https://www.rabbitmq.com/java-client.html |
| 9 | -License: Apache-2.0 and GPL-2.0-or-later and MPL-1.1 | 9 | +Source0: https://github.com/rabbitmq/rabbitmq-java-client/archive/refs/tags/v%{version}.tar.gz#/rabbitmq-java-client-%{version}.tar.gz |
| 10 | -URL: http://www.rabbitmq.com/java-client.html | 10 | +Source1: https://github.com/rabbitmq/rabbitmq-codegen/archive/refs/tags/v%{codegen_version}.tar.gz#/rabbitmq-codegen-%{codegen_version}.tar.gz |
| 11 | -Source0: https://github.com/rabbitmq/rabbitmq-java-client/archive/refs/tags/rabbitmq_v3_6_5.tar.gz | 11 | +BuildRequires: fdupes |
| 12 | -Source1: https://github.com/rabbitmq/rabbitmq-codegen/archive/refs/tags/rabbitmq_v3_6_5.zip | 12 | +BuildRequires: maven-local |
| 13 | -BuildArch: noarch | 13 | +BuildRequires: python3 |
| 14 | -BuildRequires: maven-local mvn(commons-cli:commons-cli) mvn(commons-io:commons-io) mvn(junit:junit) | 14 | +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) |
| 15 | -BuildRequires: ant ant-junit java-headless python3-devel >= 2.6 python3-simplejson | 15 | +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) |
| 16 | -%if 0%{?with buildtex} | 16 | +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) |
| 17 | -BuildRequires: texi2html texlive-base | 17 | +BuildRequires: mvn(org.slf4j:slf4j-api) |
| 18 | -%endif | 18 | +BuildArch: noarch |
| 19 | -BuildRequires: rabbitmq-server hostname procps-ng | ||
| 20 | -Suggests: rabbitmq-server | ||
| 21 | -Suggests: activemq | ||
| 22 | -%description | ||
| 23 | -The library allows Java code to interface to AMQP servers. | ||
| 24 | -Please see the specification page for more information on AMQP | ||
| 25 | -inter-operation and standards-conformance | ||
| 26 | -You will need an AMQP server, such as our very own RabbitMQ server, | ||
| 27 | -to use with the client library. | ||
| 28 | 19 | ||
| 29 | -%package doc | 20 | +%description |
| 30 | -Summary: Documentation for %{name} | 21 | +The RabbitMQ Java client library allows Java code to interface to AMQP servers. |
| 31 | -Requires: %{name} = %{version}-%{release} | ||
| 32 | -%description doc | ||
| 33 | -This package contains additional documentation for %{name}. | ||
| 34 | 22 | ||
| 35 | %package javadoc | 23 | %package javadoc |
| 36 | -Summary: Javadoc for %{name} | 24 | +Summary: API documentation for %{name} |
| 25 | +Group: Documentation/HTML | ||
| 26 | + | ||
| 37 | %description javadoc | 27 | %description javadoc |
| 38 | -This package contains javadoc for %{name}. | 28 | +API documentation for %{name}. |
| 39 | 29 | ||
| 40 | %prep | 30 | %prep |
| 41 | -%setup -q -n %{name}-rabbitmq_v3_6_5 | 31 | +%setup -q -a1 |
| 42 | -cp %{SOURCE1} . | 32 | + |
| 43 | -unzip rabbitmq_v3_6_5.zip | 33 | +%pom_remove_dep org.junit:junit-bom |
| 44 | -mv rabbitmq-codegen-rabbitmq_v3_6_5 codegen | 34 | + |
| 45 | -find . -name "*.bat" -delete | 35 | +# Exclude optional dependencies |
| 46 | -find . -name "*.class" -delete | 36 | +%pom_remove_dep io.dropwizard.metrics:metrics-core |
| 47 | -find . -name "*.jar" -print -delete | 37 | +rm -f src/main/java/com/rabbitmq/client/impl/StandardMetricsCollector.java |
| 48 | -rm Makefile | 38 | + |
| 49 | -ln -sf $(build-classpath commons-cli) lib/ | 39 | +%pom_remove_dep io.micrometer:micrometer-core |
| 50 | -ln -sf $(build-classpath commons-io) lib/ | 40 | +rm -f src/main/java/com/rabbitmq/client/impl/MicrometerMetricsCollector.java |
| 51 | -ln -sf $(build-classpath junit) lib/ | 41 | +rm -rf src/main/java/com/rabbitmq/client/observation/micrometer |
| 52 | -sed -i "s|, bundlor.do||" build.xml | 42 | + |
| 53 | -sed -i "s|, test-bundlor.do||" build.xml | 43 | +%pom_remove_dep io.opentelemetry:opentelemetry-api |
| 54 | -sed -i 's,\(\"haltOnFailureJunit\" value=\"\).*\",\1%{failjunit}\",' build.xml | 44 | +rm -f src/main/java/com/rabbitmq/client/impl/OpenTelemetryMetricsCollector.java |
| 55 | -sed -i 's,\(\"haltOnFailureJava\" value=\"\).*\",\1%{failjava}\",' build.xml | 45 | + |
| 56 | -%mvn_file com.rabbitmq:amqp-client %{name} %{jarname} amqp-client | 46 | +%pom_remove_plugin :groovy-maven-plugin |
| 47 | +%pom_remove_plugin :maven-source-plugin | ||
| 48 | +%pom_remove_plugin :keytool-maven-plugin | ||
| 49 | +%pom_xpath_remove pom:project/pom:build/pom:extensions | ||
| 57 | 50 | ||
| 58 | %build | 51 | %build |
| 59 | -%ant -Dimpl.version=%{version} -Dpython.bin=%{__python3} maven-bundle | 52 | +export PYTHONPATH=rabbitmq-codegen-%{codegen_version} |
| 60 | -cd doc/channels | 53 | +python3 ./codegen.py header ${PYTHONPATH}/amqp-rabbitmq-0.9.1.json src/main/java/com/rabbitmq/client/AMQP.java |
| 61 | -%if 0%{?with buildtex} | 54 | +python3 ./codegen.py body ${PYTHONPATH}/amqp-rabbitmq-0.9.1.json src/main/java/com/rabbitmq/client/impl/AMQImpl.java |
| 62 | -find . -name \*.tex -print -exec 'texi2html {} ; pdflatex {}' \; -delete | 55 | +%{mvn_build} -f -- \ |
| 63 | -%endif | 56 | + -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \ |
| 64 | -find . -not -name channels.\* -delete | 57 | + -DskipTests=true |
| 65 | 58 | ||
| 66 | %install | 59 | %install |
| 67 | -%mvn_artifact build/bundle/amqp-client-%{version}.pom build/bundle/amqp-client-%{version}.jar | 60 | +%mvn_install |
| 68 | -%mvn_install -J build/doc/api | 61 | +%fdupes -s %{buildroot}%{_javadocdir} |
| 69 | - | ||
| 70 | -%check | ||
| 71 | -ant test-jar | ||
| 72 | -ant test-server | ||
| 73 | -export RABBITMQ_LOG_BASE=. | ||
| 74 | -export RABBITMQ_MNESIA_BASE=. | ||
| 75 | -%{_prefix}/lib/rabbitmq/bin/rabbitmq-server start -detached | ||
| 76 | -pgrep -cf rabbitmq_server && ant test-client | ||
| 77 | -pkill -f rabbitmq_server ||: | ||
| 78 | 62 | ||
| 79 | %files -f .mfiles | 63 | %files -f .mfiles |
| 80 | -%license LICENSE* | 64 | +%license LICENSE LICENSE-APACHE2 LICENSE-GPL2 LICENSE-MPL-RabbitMQ |
| 81 | -%doc README* | 65 | +%doc README.md |
| 82 | - | ||
| 83 | -%files doc | ||
| 84 | -%doc doc/* | ||
| 85 | 66 | ||
| 86 | %files javadoc -f .mfiles-javadoc | 67 | %files javadoc -f .mfiles-javadoc |
| 87 | -%license LICENSE* | 68 | +%license LICENSE LICENSE-APACHE2 LICENSE-GPL2 LICENSE-MPL-RabbitMQ |
| 88 | 69 | ||
| 89 | %changelog | 70 | %changelog |
| 71 | +* Tue Sep 23 2025 wang kun <wang_kun1@hoperun.com> - 5.18.0-1 | ||
| 72 | +- Upgrade to 5.18.1 | ||
| 73 | + | ||
| 90 | * Mon Nov 14 2022 Ge Wang <wangge20@h-partners.com> - 3.6.5-3 | 74 | * Mon Nov 14 2022 Ge Wang <wangge20@h-partners.com> - 3.6.5-3 |
| 91 | - bring source file into correspondence with described in spec file | 75 | - bring source file into correspondence with described in spec file |
| 92 | 76 | ||
Binary files do not support preview