From 707f636c96e5c4c9c2a00926401bb8d856e5b12b Mon Sep 17 00:00:00 2001 From: houyingchao <1348375921@qq.com> Date: Thu, 10 Mar 2022 15:05:41 +0800 Subject: [PATCH] Fix compilation failed (cherry picked from commit 2eb6f4acaf404fc09dfc5cc2455997fc738343c6) --- cassandra-java-driver.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cassandra-java-driver.spec b/cassandra-java-driver.spec index 6aae995..44591fb 100644 --- a/cassandra-java-driver.spec +++ b/cassandra-java-driver.spec @@ -1,6 +1,6 @@ Name: cassandra-java-driver Version: 3.4.0 -Release: 1 +Release: 2 Summary: DataStax Java Driver for Apache Cassandra License: ASL 2.0 URL: https://github.com/datastax/java-driver @@ -10,7 +10,7 @@ BuildRequires: maven-local mvn(io.dropwizard.metrics:metrics-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) mvn(com.google.guava:guava) BuildRequires: mvn(io.netty:netty-handler) mvn(io.netty:netty-transport-native-epoll) BuildRequires: mvn(javax.json:javax.json-api) mvn(joda-time:joda-time) mvn(log4j:log4j:1.2.17) -BuildRequires: mvn(net.jpountz.lz4:lz4) mvn(org.apache.commons:commons-exec) +BuildRequires: mvn(org.lz4:lz4-java) mvn(org.apache.commons:commons-exec) BuildRequires: mvn(org.assertj:assertj-core) mvn(org.hdrhistogram:HdrHistogram) BuildRequires: mvn(org.mockito:mockito-all) mvn(org.ow2.asm:asm-all) mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-log4j12) mvn(org.sonatype.oss:oss-parent:pom:) @@ -71,6 +71,12 @@ This package contains javadoc for %{name}. %pom_remove_plugin -r :maven-shade-plugin driver-core rm manual/statements/.nav rm manual/object_mapper/.nav +%pom_change_dep net.jpountz.lz4:lz4 org.lz4:lz4-java driver-core +%pom_change_dep net.jpountz.lz4:lz4 org.lz4:lz4-java +index=`awk '/net.jpountz.lz4/{print NR}' pom.xml` +start=$((index-1)) +end=$((index+3)) +sed -i "${start}, ${end}d" pom.xml %mvn_package ":cassandra-driver-tests-parent" tests %mvn_package ":cassandra-driver-tests-osgi" tests @@ -97,5 +103,8 @@ rm manual/object_mapper/.nav %license LICENSE %changelog +* Thu Mar 10 2022 houyingchao - 3.4.0-2 +- Fix compilation failed + * Tue Aug 25 2020 wangyue - 3.4.0-1 - package init