Browse code
Bug 1923295: Remove hadoop jars & update logback jars
Change-Id: I232d3d65af9542dcffed86514f88be963bccaa4f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3382
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
harishspqr authored on 2017/07/28 03:41:58Showing 1 changed files
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: Cassandra is a highly scalable, eventually consistent, distributed, structured key-value store |
| 4 | 4 |
Name: cassandra |
| 5 | 5 |
Version: 3.10 |
| 6 |
-Release: 4%{?dist}
|
|
| 6 |
+Release: 5%{?dist}
|
|
| 7 | 7 |
URL: http://cassandra.apache.org/ |
| 8 | 8 |
License: Apache License, Version 2.0 |
| 9 | 9 |
Group: Applications/System |
| ... | ... |
@@ -16,6 +16,7 @@ Patch0: build-fix.patch |
| 16 | 16 |
BuildRequires: apache-ant |
| 17 | 17 |
BuildRequires: unzip zip |
| 18 | 18 |
BuildRequires: openjdk |
| 19 |
+BuildRequires: wget |
|
| 19 | 20 |
Requires: openjre |
| 20 | 21 |
%description |
| 21 | 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,6 +24,13 @@ Cassandra is a highly scalable, eventually consistent, distributed, structured k |
| 23 | 23 |
%prep |
| 24 | 24 |
%setup -qn apache-%{name}-%{version}-src
|
| 25 | 25 |
%patch0 -p1 |
| 26 |
+sed -i 's#\"logback-core\" version=\"1.1.3\"#\"logback-core\" version=\"1.2.0\"#g' build.xml |
|
| 27 |
+sed -i 's#\"logback-classic\" version=\"1.1.3\"#\"logback-classic\" version=\"1.2.0\"#g' build.xml |
|
| 28 |
+rm lib/logback-* |
|
| 29 |
+mv lib/licenses/logback-core-1.1.3.txt lib/licenses/logback-core-1.2.0.txt |
|
| 30 |
+mv lib/licenses/logback-classic-1.1.3.txt lib/licenses/logback-classic-1.2.0.txt |
|
| 31 |
+wget http://central.maven.org/maven2/ch/qos/logback/logback-classic/1.2.0/logback-classic-1.2.0.jar -P lib |
|
| 32 |
+wget http://central.maven.org/maven2/ch/qos/logback/logback-core/1.2.0/logback-core-1.2.0.jar -P lib |
|
| 26 | 33 |
|
| 27 | 34 |
%build |
| 28 | 35 |
export JAVA_HOME=/usr/lib/jvm/OpenJDK-%{JAVA_VERSION}
|
| ... | ... |
@@ -40,6 +48,9 @@ mkdir -p %{buildroot}/var/run/cassandra
|
| 40 | 40 |
mkdir -p %{buildroot}/etc/profile.d
|
| 41 | 41 |
mkdir -p %{buildroot}/var/opt/cassandra
|
| 42 | 42 |
|
| 43 |
+rm build/lib/jars/hadoop-* |
|
| 44 |
+rm build/classes/main/org/apache/cassandra/hadoop/HadoopCompat.class |
|
| 45 |
+ |
|
| 43 | 46 |
cp bin/%{name} %{buildroot}%{_sbindir}
|
| 44 | 47 |
cp bin/%{name}.in.sh %{buildroot}%{_datadir}/cassandra/
|
| 45 | 48 |
cp bin/nodetool %{buildroot}%{_bindir}/
|
| ... | ... |
@@ -106,6 +117,7 @@ fi |
| 106 | 106 |
%files |
| 107 | 107 |
%defattr(-,root,root) |
| 108 | 108 |
%doc README.asc CHANGES.txt NEWS.txt conf/cqlshrc.sample LICENSE.txt NOTICE.txt |
| 109 |
+%dir /var/opt/cassandra |
|
| 109 | 110 |
%{_bindir}/*
|
| 110 | 111 |
%{_datadir}/cassandra
|
| 111 | 112 |
/var/run/cassandra |
| ... | ... |
@@ -117,6 +129,8 @@ fi |
| 117 | 117 |
/lib/systemd/system/cassandra.service |
| 118 | 118 |
|
| 119 | 119 |
%changelog |
| 120 |
+* Thu Jul 27 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-5 |
|
| 121 |
+* Update logback jar (dependency) & remove hadoop jars |
|
| 120 | 122 |
* Tue Jul 18 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.10-4 |
| 121 | 123 |
- Change cassandra service type as simple |
| 122 | 124 |
* Mon Jul 10 2017 Xiaolin Li <xiaolinl@vmware.com> 3.10-3 |