Browse code

Upgrading cassandra to 3.11.2

Change-Id: Ic3f6d5ea828258f70a3e341343eff0c829f2b1f8
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5403
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Tapas Kundu authored on 2018/07/26 04:44:18
Showing 2 changed files
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,15 +2,15 @@
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.11.1
6
-Release:        3%{?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/%{version}/apache-%{name}-%{version}-src.tar.gz
13
-%define sha1 apache-cassandra=f5e76a5007b947970e18142e6ba6e0b9d7cdaa29
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 15
 BuildRequires:  apache-ant
16 16
 BuildRequires:  unzip zip
... ...
@@ -22,7 +22,7 @@ Requires:       gawk
22 22
 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.
23 23
 
24 24
 %prep
25
-%setup -qn apache-%{name}-%{version}-src
25
+%setup -qn %{name}-%{name}-%{version}
26 26
 sed -i 's#\"logback-core\" version=\"1.1.3\"#\"logback-core\" version=\"1.2.0\"#g' build.xml
27 27
 sed -i 's#\"logback-classic\" version=\"1.1.3\"#\"logback-classic\" version=\"1.2.0\"#g' build.xml
28 28
 rm lib/logback-*
... ...
@@ -126,6 +126,8 @@ fi
126 126
 %exclude /var/opt/cassandra/build/lib
127 127
 
128 128
 %changelog
129
+*   Wed Jul 25 2018 Tapas Kundu <tkundu@vmware.com> 3.11.2-1
130
+-   Upgraded cassandra to 3.11.2.
129 131
 *   Wed Apr 25 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.11.1-3
130 132
 -   Remove patch to build on openjdk-1.8.0.162, updated openjdk to 1.8.0.172
131 133
 *   Sat Jan 20 2018 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.11.1-2