Change-Id: I40b2546033c48b89ba3551e492022027a6121010
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5402
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Srinidhi Rao <srinidhir@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,30 +0,0 @@ |
1 |
-+++ b/build.xml 2017-05-10 10:38:09.665212759 -0700 |
|
2 |
-@@ -414,11 +414,11 @@ |
|
3 |
- <dependency groupId="org.jacoco" artifactId="org.jacoco.agent" version="${jacoco.version}"/> |
|
4 |
- <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" version="${jacoco.version}"/> |
|
5 |
- |
|
6 |
-+ <dependency groupId="org.jboss.byteman" artifactId="byteman-install" version="${byteman.version}" scope="test"/> |
|
7 |
- <dependency groupId="org.jboss.byteman" artifactId="byteman" version="${byteman.version}"/> |
|
8 |
- <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" version="${byteman.version}"/> |
|
9 |
- <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" version="${byteman.version}"/> |
|
10 |
- |
|
11 |
-- |
|
12 |
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-core" version="1.13"/> |
|
13 |
- <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess" version="1.13"/> |
|
14 |
- |
|
15 |
-@@ -539,9 +539,10 @@ |
|
16 |
- version="${version}"/> |
|
17 |
- <dependency groupId="org.jacoco" artifactId="org.jacoco.agent"/> |
|
18 |
- <dependency groupId="org.jacoco" artifactId="org.jacoco.ant" /> |
|
19 |
-- <dependency groupId="org.jboss.byteman" artifactId="byteman"/> |
|
20 |
-- <dependency groupId="org.jboss.byteman" artifactId="byteman-submit"/> |
|
21 |
-- <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit"/> |
|
22 |
-+ <dependency groupId="org.jboss.byteman" artifactId="byteman-install" scope="test"/> |
|
23 |
-+ <dependency groupId="org.jboss.byteman" artifactId="byteman" scope="test"/> |
|
24 |
-+ <dependency groupId="org.jboss.byteman" artifactId="byteman-submit" scope="test"/> |
|
25 |
-+ <dependency groupId="org.jboss.byteman" artifactId="byteman-bmunit" scope="test"/> |
|
26 |
- </artifact:pom> |
|
27 |
- |
|
28 |
- <artifact:pom id="test-deps-pom" |
|
29 |
- |
... | ... |
@@ -2,17 +2,16 @@ |
2 | 2 |
%global __os_install_post %{nil} |
3 | 3 |
Summary: Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store |
4 | 4 |
Name: cassandra |
5 |
-Version: 3.10 |
|
6 |
-Release: 8%{?dist} |
|
5 |
+Version: 3.11.2 |
|
6 |
+Release: 1%{?dist} |
|
7 | 7 |
URL: http://cassandra.apache.org/ |
8 | 8 |
License: Apache License, Version 2.0 |
9 | 9 |
Group: Applications/System |
10 | 10 |
Vendor: VMware, Inc. |
11 | 11 |
Distribution: Photon |
12 |
-Source0: https://repo1.maven.org/maven2/org/apache/cassandra/apache-cassandra/3.10/apache-%{name}-%{version}-src.tar.gz |
|
13 |
-%define sha1 apache-cassandra=fa2bbeb62f930f5ff6fccee60cfb837d0794633a |
|
12 |
+Source0: https://github.com/apache/cassandra/archive/%{name}-%{version}.tar.gz |
|
13 |
+%define sha1 %{name}-%{version}.tar.gz=e4eb73614b0cc103bb6030ff0008982990abd205 |
|
14 | 14 |
Source1: cassandra.service |
15 |
-Patch0: build-fix.patch |
|
16 | 15 |
BuildRequires: apache-ant |
17 | 16 |
BuildRequires: unzip zip |
18 | 17 |
BuildRequires: openjdk8 |
... | ... |
@@ -23,8 +22,7 @@ Requires: gawk |
23 | 23 |
Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store. Cassandra brings together the distributed systems technologies from Dynamo and the log-structured storage engine from Google's BigTable. |
24 | 24 |
|
25 | 25 |
%prep |
26 |
-%setup -qn apache-%{name}-%{version}-src |
|
27 |
-%patch0 -p1 |
|
26 |
+%setup -qn %{name}-%{name}-%{version} |
|
28 | 27 |
sed -i 's#\"logback-core\" version=\"1.1.3\"#\"logback-core\" version=\"1.2.0\"#g' build.xml |
29 | 28 |
sed -i 's#\"logback-classic\" version=\"1.1.3\"#\"logback-classic\" version=\"1.2.0\"#g' build.xml |
30 | 29 |
rm lib/logback-* |
... | ... |
@@ -128,6 +126,8 @@ fi |
128 | 128 |
%exclude /var/opt/cassandra/build/lib |
129 | 129 |
|
130 | 130 |
%changelog |
131 |
+* Wed Jul 25 2018 Tapas Kundu <tkundu@vmware,com> 3.11.2-1 |
|
132 |
+- Upgraded cassandra to 3.11.2 version |
|
131 | 133 |
* Tue Apr 24 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-8 |
132 | 134 |
- Remove patch to build on openjdk-1.8.0.162, updated openjdk to 1.8.0.172 |
133 | 135 |
* Sat Jan 20 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-7 |