pbrobinson pushed to hbase (master). "Merge branch 'f22'"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 22 08:34:55 UTC 2015
>From 292734ad9f9b3d88ee64c9eb3510b66b4c37c222 Mon Sep 17 00:00:00 2001
From: Swapnil Kulkarni <coolsvap at gmail.com>
Date: Wed, 18 Mar 2015 11:49:25 +0000
Subject: Update netty3 patch for 3.9.3
diff --git a/hbase-netty-3-Final.patch b/hbase-netty-3-Final.patch
new file mode 100644
index 0000000..3003c61
--- /dev/null
+++ b/hbase-netty-3-Final.patch
@@ -0,0 +1,22 @@
+diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
+index 67a1e20..1205b62 100644
+--- a/hbase-server/pom.xml
++++ b/hbase-server/pom.xml
+@@ -672,7 +672,7 @@
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.6.2.Final</version>
++ <version>3.9.3.Final</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+@@ -728,7 +728,7 @@
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.6.2.Final</version>
++ <version>3.9.3.Final</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
diff --git a/hbase.spec b/hbase.spec
index c957929..fc027c6 100644
--- a/hbase.spec
+++ b/hbase.spec
@@ -17,7 +17,7 @@
Name: hbase
Version: 0.98.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A database for Apache Hadoop
License: ASL 2.0
URL: http://hbase.apache.org/
@@ -30,6 +30,8 @@ Patch0: %{name}-fedora-integration.patch
Patch1: %{name}-java8.patch
# Update to guava 17.0
Patch2: %{name}-guava.patch
+# Update to netty 3.9.3
+Patch3: %{name}-netty-3-Final.patch
BuildArch: noarch
# There is no hadoop on ARM
ExcludeArch: %{arm}
@@ -384,6 +386,9 @@ fi
%files -f .mfiles-%{name}-tests tests
%changelog
+* Wed Mar 18 2015 Swapnil Kulkarni <coolsvap at gmail.com> 0.98.3-3
+- Update netty3 patch for 3.9.3
+
* Mon Sep 29 2014 Robert Rati <rrati at redhat> - 0.98.3-2
- Rebuild
--
cgit v0.10.2
>From 112cb4ec338dd66cfaa8fd8331c0f1e5197a3a29 Mon Sep 17 00:00:00 2001
From: Swapnil Kulkarni <coolsvap at gmail.com>
Date: Wed, 18 Mar 2015 11:49:25 +0000
Subject: Update netty3 patch for 3.9.3
diff --git a/hbase-netty-3-Final.patch b/hbase-netty-3-Final.patch
new file mode 100644
index 0000000..3003c61
--- /dev/null
+++ b/hbase-netty-3-Final.patch
@@ -0,0 +1,22 @@
+diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
+index 67a1e20..1205b62 100644
+--- a/hbase-server/pom.xml
++++ b/hbase-server/pom.xml
+@@ -672,7 +672,7 @@
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.6.2.Final</version>
++ <version>3.9.3.Final</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+@@ -728,7 +728,7 @@
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+- <version>3.6.2.Final</version>
++ <version>3.9.3.Final</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
diff --git a/hbase.spec b/hbase.spec
index c957929..fc027c6 100644
--- a/hbase.spec
+++ b/hbase.spec
@@ -17,7 +17,7 @@
Name: hbase
Version: 0.98.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A database for Apache Hadoop
License: ASL 2.0
URL: http://hbase.apache.org/
@@ -30,6 +30,8 @@ Patch0: %{name}-fedora-integration.patch
Patch1: %{name}-java8.patch
# Update to guava 17.0
Patch2: %{name}-guava.patch
+# Update to netty 3.9.3
+Patch3: %{name}-netty-3-Final.patch
BuildArch: noarch
# There is no hadoop on ARM
ExcludeArch: %{arm}
@@ -384,6 +386,9 @@ fi
%files -f .mfiles-%{name}-tests tests
%changelog
+* Wed Mar 18 2015 Swapnil Kulkarni <coolsvap at gmail.com> 0.98.3-3
+- Update netty3 patch for 3.9.3
+
* Mon Sep 29 2014 Robert Rati <rrati at redhat> - 0.98.3-2
- Rebuild
--
cgit v0.10.2
>From f278995d51c27f50171c08899d92454362595e69 Mon Sep 17 00:00:00 2001
From: Swapnil Kulkarni <coolsvap at gmail.com>
Date: Thu, 19 Mar 2015 03:08:40 +0000
Subject: Update netty 3.9.3
diff --git a/hbase-fedora-integration.patch b/hbase-fedora-integration.patch
index 8fcfd53..aed6944 100644
--- a/hbase-fedora-integration.patch
+++ b/hbase-fedora-integration.patch
@@ -1041,7 +1041,7 @@ index fd989bf..6ef73c1 100644
</dependencies>
<profiles>
diff --git a/pom.xml b/pom.xml
-index 3770152..3a69610 100644
+index 3770152..8413cdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -889,18 +889,19 @@
@@ -1070,6 +1070,15 @@ index 3770152..3a69610 100644
<junit.version>4.11</junit.version>
<htrace.version>2.04</htrace.version>
<log4j.version>1.2.17</log4j.version>
+@@ -913,7 +914,7 @@
+ <clover.version>2.6.3</clover.version>
+ <jamon-runtime.version>2.3.1</jamon-runtime.version>
+ <jettison.version>1.3.1</jettison.version>
+- <netty.version>3.6.6.Final</netty.version>
++ <netty.version>3.9.3.Final</netty.version>
+ <!-- Plugin Dependencies -->
+ <maven.assembly.version>2.4</maven.assembly.version>
+ <maven.antrun.version>1.6</maven.antrun.version>
@@ -1090,7 +1091,7 @@
<version>${slf4j.version}</version>
</dependency>
diff --git a/hbase-netty-3-Final.patch b/hbase-netty-3-Final.patch
deleted file mode 100644
index 3003c61..0000000
--- a/hbase-netty-3-Final.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
-index 67a1e20..1205b62 100644
---- a/hbase-server/pom.xml
-+++ b/hbase-server/pom.xml
-@@ -672,7 +672,7 @@
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
-- <version>3.6.2.Final</version>
-+ <version>3.9.3.Final</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-@@ -728,7 +728,7 @@
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty</artifactId>
-- <version>3.6.2.Final</version>
-+ <version>3.9.3.Final</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
diff --git a/hbase.spec b/hbase.spec
index fc027c6..a5d871f 100644
--- a/hbase.spec
+++ b/hbase.spec
@@ -30,8 +30,6 @@ Patch0: %{name}-fedora-integration.patch
Patch1: %{name}-java8.patch
# Update to guava 17.0
Patch2: %{name}-guava.patch
-# Update to netty 3.9.3
-Patch3: %{name}-netty-3-Final.patch
BuildArch: noarch
# There is no hadoop on ARM
ExcludeArch: %{arm}
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/hbase.git/commit/?h=master&id=67c0560eadba0bf2a1461a51ca2566ba98ff1dd1
More information about the scm-commits
mailing list