Revert "use offstack buildpack for modules (apache#200)" (apache#205)

This reverts commit 70f6120.

Author: hgromer

.blazar.yaml

@@ -1,5 +1,5 @@
 buildpack:
-  name: Blazar-Buildpack-Java-oss-fork
+  name: Blazar-Buildpack-Java-single-module
 
 env:
   MAVEN_PHASE: "package assembly:single deploy"

hubspot-client-bundles/.blazar.yaml

@@ -1,5 +1,6 @@
 buildpack:
-  name: Blazar-Buildpack-Java-oss-fork
+  name: Blazar-Buildpack-Java
+  branch: rm-test-hbase
 
 env:
   # Below variables are generated in prepare_environment.sh.
@@ -22,7 +23,3 @@ depends:
   - hbase
 provides:
   - hubspot-client-bundles
-  - hbase-backup-restore-bundle
-  - hbase-client-bundle
-  - hbase-mapreduce-bundle
-  - hbase-server-it-bundle

hubspot-client-bundles/hbase-backup-restore-bundle/.blazar.yaml

@@ -0,0 +1,26 @@
+buildpack:
+  name: Blazar-Buildpack-Java
+  branch: rm-test-hbase
+env:
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  REPO_NAME: ""
+  SET_VERSION: ""
+  HBASE_VERSION: ""
+  PKG_RELEASE: ""
+  FULL_BUILD_VERSION: ""
+  MAVEN_BUILD_ARGS: ""
+
+before:
+  - description: "Prepare build environment"
+    commands:
+      - $WORKSPACE/build-scripts/prepare_environment.sh
+
+depends:
+  - hubspot-client-bundles
+  - hbase-client-bundle
+  - hbase-mapreduce-bundle
+provides:
+  - hbase-backup-restore-bundle

hubspot-client-bundles/hbase-client-bundle/.blazar.yaml

@@ -0,0 +1,26 @@
+buildpack:
+  name: Blazar-Buildpack-Java
+  branch: rm-test-hbase
+
+env:
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  REPO_NAME: ""
+  SET_VERSION: ""
+  HBASE_VERSION: ""
+  PKG_RELEASE: ""
+  FULL_BUILD_VERSION: ""
+  MAVEN_BUILD_ARGS: ""
+
+before:
+  - description: "Prepare build environment"
+    commands:
+      - $WORKSPACE/build-scripts/prepare_environment.sh
+
+depends:
+  - hubspot-client-bundles
+provides:
+  - hbase-client-bundle
+

hubspot-client-bundles/hbase-mapreduce-bundle/.blazar.yaml

@@ -0,0 +1,26 @@
+buildpack:
+  name: Blazar-Buildpack-Java
+  branch: rm-test-hbase
+
+env:
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  REPO_NAME: ""
+  SET_VERSION: ""
+  HBASE_VERSION: ""
+  PKG_RELEASE: ""
+  FULL_BUILD_VERSION: ""
+  MAVEN_BUILD_ARGS: ""
+
+before:
+  - description: "Prepare build environment"
+    commands:
+      - $WORKSPACE/build-scripts/prepare_environment.sh
+
+depends:
+  - hubspot-client-bundles
+  - hbase-client-bundle
+provides:
+  - hbase-mapreduce-bundle

hubspot-client-bundles/hbase-server-it-bundle/.blazar.yaml

@@ -0,0 +1,26 @@
+buildpack:
+  name: Blazar-Buildpack-Java
+  branch: rm-test-hbase
+env:
+  # Below variables are generated in prepare_environment.sh.
+  # The build environment requires environment variables to be explicitly defined before they may
+  # be modified by the `write-build-env-var` utilty script to persist changes to an environment variable
+  # throughout a build
+  YUM_REPO_UPLOAD_OVERRIDE_CENTOS_8: ""
+  SET_VERSION: ""
+  HBASE_VERSION: ""
+  PKG_RELEASE: ""
+  FULL_BUILD_VERSION: ""
+  MAVEN_BUILD_ARGS: ""
+  REPO_NAME: ""
+
+before:
+  - description: "Prepare build environment"
+    commands:
+      - $WORKSPACE/build-scripts/prepare_environment.sh
+
+depends:
+  - hbase
+provides:
+  - hbase-server-it-bundle
+

pom.xml

@@ -1536,15 +1536,6 @@
         <groupId>org.apache.hbase.thirdparty</groupId>
         <artifactId>hbase-shaded-miscellaneous</artifactId>
         <version>${hbase-thirdparty.version}</version>
-        <!-- HubSpot: This conflicts with other jspecify uses in the company.
-             This exclusion is already backed into newer versions of hbase-thirdparty,
-             so we can remove it here when hbase-thirdparty is upgraded. -->
-        <exclusions>
-          <exclusion>
-            <groupId>org.jspecify</groupId>
-            <artifactId>jspecify</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.apache.hbase.thirdparty</groupId>