From 43a6ad2670681eb068f2cb95fb81b03ef1ec2b5e Mon Sep 17 00:00:00 2001 From: Tomas Repik Date: Jan 31 2017 09:15:39 +0000 Subject: version update --- diff --git a/.gitignore b/.gitignore index a681fa0..05507f7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /3.0.0.tar.gz +/3.1.3.tar.gz diff --git a/cassandra-java-driver.spec b/cassandra-java-driver.spec index 49c397a..db9f1f4 100644 --- a/cassandra-java-driver.spec +++ b/cassandra-java-driver.spec @@ -1,65 +1,84 @@ -Name: cassandra-java-driver -Version: 3.0.0 -Release: 2%{?dist} -Summary: DataStax Java Driver for Apache Cassandra -License: ASL 2.0 -URL: https://github.com/datastax/java-driver -Source0: https://github.com/datastax/java-driver/archive/%{version}.tar.gz - -BuildRequires: maven-local +Name: cassandra-java-driver +Version: 3.1.3 +Release: 1%{?dist} +Summary: DataStax Java Driver for Apache Cassandra +License: ASL 2.0 +URL: https://github.com/datastax/java-driver +Source0: https://github.com/datastax/java-driver/archive/%{version}.tar.gz + +# added --allow-script-in-comments option to javadoc plugin +# https://bugzilla.redhat.com/show_bug.cgi?id=1417677 +Patch0: %{name}-%{version}-allow-script-in-comments.patch + +BuildRequires: maven-local %if %{?fedora} <= 23 -BuildRequires: mvn(com.codahale.metrics:metrics-core) +BuildRequires: mvn(com.codahale.metrics:metrics-core) %else -BuildRequires: mvn(io.dropwizard.metrics:metrics-core) +BuildRequires: mvn(io.dropwizard.metrics:metrics-core) %endif -BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) -BuildRequires: mvn(com.google.guava:guava) -BuildRequires: mvn(io.netty:netty-handler) -BuildRequires: mvn(io.netty:netty-tcnative) -BuildRequires: mvn(io.netty:netty-transport-native-epoll) -BuildRequires: mvn(javax.json:javax.json-api) -BuildRequires: mvn(joda-time:joda-time) -BuildRequires: mvn(log4j:log4j:1.2.17) -BuildRequires: mvn(net.jpountz.lz4:lz4) -BuildRequires: mvn(org.apache.commons:commons-exec) -BuildRequires: mvn(org.assertj:assertj-core) -BuildRequires: mvn(org.glassfish:javax.json) -BuildRequires: mvn(org.hdrhistogram:HdrHistogram) -BuildRequires: mvn(org.mockito:mockito-all) -BuildRequires: mvn(org.ow2.asm:asm-all) -BuildRequires: mvn(org.slf4j:slf4j-log4j12) -BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) -BuildRequires: mvn(org.testng:testng) -BuildRequires: mvn(org.xerial.snappy:snappy-java) -# fedora 25 -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) - -BuildArch: noarch +BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) +BuildRequires: mvn(com.google.guava:guava) +BuildRequires: mvn(io.netty:netty-handler) +BuildRequires: mvn(io.netty:netty-tcnative) +BuildRequires: mvn(io.netty:netty-transport-native-epoll) +BuildRequires: mvn(javax.json:javax.json-api) +BuildRequires: mvn(joda-time:joda-time) +BuildRequires: mvn(log4j:log4j:1.2.17) +BuildRequires: mvn(net.jpountz.lz4:lz4) +BuildRequires: mvn(org.apache.commons:commons-exec) +BuildRequires: mvn(org.assertj:assertj-core) +BuildRequires: mvn(org.glassfish:javax.json) +BuildRequires: mvn(org.hdrhistogram:HdrHistogram) +BuildRequires: mvn(org.mockito:mockito-all) +BuildRequires: mvn(org.ow2.asm:asm-all) +BuildRequires: mvn(org.slf4j:slf4j-log4j12) +BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:) +BuildRequires: mvn(org.testng:testng) +BuildRequires: mvn(org.xerial.snappy:snappy-java) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(com.github.jnr:jnr-ffi) +BuildRequires: mvn(com.github.jnr:jnr-posix) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) +BuildRequires: mvn(org.apache.felix:org.apache.felix.framework) +# driver-tests stress module dependencies +#BuildRequires: mvn(net.sf.jopt-simple:jopt-simple) +#BuildRequires: mvn(com.yammer.metrics:metrics-core) missing +BuildArch: noarch %description A driver for Apache Cassandra 1.2+ that works exclusively with the Cassandra Query Language version 3 (CQL3) and Cassandra's binary protocol. %package extras -Summary: DataStax Java Driver for Apache Cassandra - Extras +Summary: DataStax Java Driver for Apache Cassandra - Extras +Requires: %{name} = %{version}-%{release} %description extras Extended functionality for the Java driver. %package mapping -Summary: DataStax Java Driver for Apache Cassandra - Object Mapping +Summary: DataStax Java Driver for Apache Cassandra - Object Mapping +Requires: %{name} = %{version}-%{release} %description mapping Object mapper for the DataStax CQL Java Driver. %package parent -Summary: DataStax Java Driver for Apache Cassandra - Parent POM +Summary: DataStax Java Driver for Apache Cassandra - Parent POM %description parent Parent POM for the DataStax Java Driver. +%package tests +Summary: DataStax Java Driver for Apache Cassandra - Tests +Requires: %{name} = %{version}-%{release} + +%description tests +Tests for the DataStax Java Driver. + %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc for %{name} %description javadoc This package contains javadoc for %{name}. @@ -67,9 +86,14 @@ This package contains javadoc for %{name}. %prep %setup -qn java-driver-%{version} +# allow-script-in-comments.patch +%patch0 -p1 + # Unneeded features %pom_disable_module driver-dist %pom_disable_module driver-examples +# missing dependency for stress tests +%pom_disable_module stress driver-tests # Unavailable plugins %pom_remove_plugin -r :animal-sniffer-maven-plugin: %pom_remove_plugin -r :clirr-maven-plugin @@ -79,6 +103,7 @@ This package contains javadoc for %{name}. # Unwanted tasks %pom_remove_plugin -r :maven-source-plugin %pom_remove_plugin -r :maven-release-plugin +%pom_remove_plugin :gmaven-plugin driver-mapping %pom_xpath_remove "pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions/pom:execution/pom:goals" # Disable shaded copy of netty artifacts %pom_remove_plugin -r :maven-shade-plugin driver-core @@ -91,6 +116,9 @@ This package contains javadoc for %{name}. rm manual/statements/.nav rm manual/object_mapper/.nav +%mvn_package ":cassandra-driver-tests-parent" tests +%mvn_package ":cassandra-driver-tests-osgi" tests + %build # Unavailable test dep org.cassandra:java-client:0.11.0 @@ -108,10 +136,15 @@ rm manual/object_mapper/.nav %files parent -f .mfiles-cassandra-driver-parent %license LICENSE +%files tests -f .mfiles-tests + %files javadoc -f .mfiles-javadoc %license LICENSE %changelog +* Mon Jan 30 2017 Tomas Repik - 3.1.3-1 +- version update + * Tue Jun 21 2016 Tomas Repik - 3.0.0-2 - Added maven-bundle-plugin as a dependency diff --git a/sources b/sources index 93fb400..9bc10c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8ca57b85aaa3d58b5296531cb08f70a2 3.0.0.tar.gz +SHA512 (3.1.3.tar.gz) = 84d3378be872c82452cf5feeec36ca6f661fc74279ac8fdfcd2d6eb6cfbac84f5d3dd659ce785f9fbfcc9c5bcf3867639ec22e22420a20d4da6fce5f7f8734f7