Revert "HBASE-15789 PB related changes to work with offheap"

This reverts commit fb15e3d.
Breaks the build

hbase-assembly/pom.xml

@@ -161,6 +161,10 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hbase</groupId>
+      <artifactId>hbase-thrift</artifactId>
+    </dependency>
     <!-- To dump tools in hbase-procedure into cached_classpath.txt. -->
     <dependency>
       <groupId>org.apache.hbase</groupId>

hbase-protocol-shaded/README.txt

@@ -16,10 +16,6 @@ protobuf Message class is at
 org.apache.hadoop.hbase.shaded.com.google.protobuf.Message
 rather than at com.google.protobuf.Message.
 
-Finally, this module also includes patches applied on top of
-protobuf to add functionality not yet in protobuf that we
-need now.
-
 Below we describe how to generate the java files for this
 module. Run this step any time you change the proto files
 in this module or if you change the protobuf version. If you
@@ -48,9 +44,5 @@ profile. When finished, the content of
 src/main/java/org/apache/hadoop/hbase/shaded will have
 been updated. Check in the changes.
 
-If you have patches for the protobuf, add them to
-src/main/patches directory. They will be applied after
-protobuf is shaded and unbundled into src/main/java.
-
 See the pom.xml under the generate-shaded-classes profile
 for more info on how this step works.

hbase-protocol-shaded/pom.xml

@@ -191,7 +191,7 @@
         <!--When the compile for this profile runs, make sure it makes jars that
              can be related back to this shading profile. Give them a shading prefix.
          -->
-        <jar.finalName>${profile.id}.${project.artifactId}-${project.version}</jar.finalName>
+        <jar.finalName>${profile.id}.${artifactId}-${project.version}</jar.finalName>
       </properties>
       <build>
         <plugins>
@@ -337,32 +337,9 @@
               </execution>
             </executions>
           </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-patch-plugin</artifactId>
-        <version>1.2</version>
-        <configuration>
-           <!--Patches are made at top-level-->
-           <targetDirectory>${basedir}/..</targetDirectory>
-          <skipApplication>false</skipApplication>
-        </configuration>
-        <executions>
-          <execution>
-            <id>patch</id>
-            <configuration>
-               <strip>1</strip>
-              <patchDirectory>src/main/patches</patchDirectory>
-              <patchTrackingFile>${project.build.directory}/patches-applied.txt</patchTrackingFile>
-              <naturalOrderProcessing>true</naturalOrderProcessing>
-            </configuration>
-            <phase>package</phase>
-            <goals>
-              <!--This should run after the above unpack phase-->
-              <goal>apply</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
+          <!--Patch the files here!!!
+               Use maven-patch-plugin
+               -->
         </plugins>
       </build>
     </profile>