Fixing the code and test to work with hive-3.x (#278)

* Fixing the code and test to work with hive-3.x
ExpediaGroup · Aug 6, 2023 · a345e74 · a345e74
1 parent 9f3839a
commit a345e74
Show file tree

Hide file tree

Showing 92 changed files with 3,901 additions and 1,123 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -9,31 +9,53 @@ on:
 jobs:
   CodeQL-Build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
+
+    permissions:
+      security-events: write
+
+    strategy:
+      matrix:
+        maven-version: ['3.9.2']
+        java-version: ['8']
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
         fetch-depth: 2
 
-    - name: Set up JDK
-      uses: actions/setup-java@v1
+   # WD requires Java 8 to build
+    - name: Set up JDK ${{ matrix.java-version }}
+      uses: actions/setup-java@v2
       with:
-        java-version: 8
-
+        distribution: 'zulu'
+        java-version: ${{ matrix.java-version }}
+        java-package: jdk
+        server-id: sonatype-nexus-snapshots # Value of the distributionManagement/repository/id field of the pom.xml
+        server-username: SONATYPE_USERNAME # env variable for username in deploy
+        server-password: SONATYPE_PASSWORD # env variable for token in deploy
+        # only signed artifacts will be released to maven central. this sets up things for the maven-gpg-plugin
+        gpg-private-key: ${{ secrets.HCOM_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+        gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase
+        # this creates a settings.xml on build server
+        settings-path: ${{ github.workspace }}
+        cache: maven
+    - name: Maven Verify
+      run: mvn -B clean verify --file pom.xml
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: java
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -47,4 +69,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,15 +1,15 @@
 name: Java CI
 
-on: 
+on:
   pull_request:
   push:
-    branches: 
+    branches:
       - main
 
 jobs:
   test:
     name: Package and run all tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
       with:
@@ -26,10 +26,26 @@ jobs:
              echo "Coveralls token available"
              COVERALLS_SKIP=false
           fi
-          echo "COVERALLS_SKIP=${COVERALLS_SKIP}" >> $GITHUB_ENV        
+          echo "COVERALLS_SKIP=${COVERALLS_SKIP}" >> $GITHUB_ENV
+
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 8
+        distribution: 'adopt'
+        java-version: '8'
+        java-package: jdk
+        server-id: sonatype-nexus-snapshots # Value of the distributionManagement/repository/id field of the pom.xml
+        server-username: SONATYPE_USERNAME # env variable for username in deploy
+        server-password: SONATYPE_PASSWORD # env variable for token in deploy
+        # only signed artifacts will be released to maven central. this sets up things for the maven-gpg-plugin
+        gpg-private-key: ${{ secrets.HCOM_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+        gpg-passphrase: GPG_PASSPHRASE # env variable for GPG private key passphrase
+        # this creates a settings.xml on build server
+        settings-path: ${{ github.workspace }}
+
     - name: Run Maven Targets
-       run: mvn package jacoco:report coveralls:report --batch-mode --show-version --activate-profiles coveralls -Dcoveralls.skip=$COVERALLS_SKIP -DrepoToken=${{ secrets.COVERALLS_REPO_TOKEN }}
+      run: mvn deploy jacoco:report coveralls:report --settings $GITHUB_WORKSPACE/settings.xml --batch-mode --show-version --activate-profiles coveralls,sonatype-oss-release-github-actions -Dcoveralls.skip=$COVERALLS_SKIP -DrepoToken=${{ secrets.COVERALLS_REPO_TOKEN }}
+      env:
+        SONATYPE_PASSWORD: ${{ secrets.HCOM_SONATYPE_PASSWORD }}
+        SONATYPE_USERNAME: ${{ secrets.HCOM_SONATYPE_USERNAME }}
+        GPG_PASSPHRASE: ${{secrets.HCOM_GPG_PRIVATE_KEY_PASSPHRASE}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## [4.0.0] - TBD
+### Updated Dependency
+* `hive` updated to `3.1.3` (was `3.1.2`).
+* `hadoop` updated to `3.3.6` (was `3.1.0`).
+* `spring` updated to `2.7.13` (was `2.0.4-RELEASE`).
+* `guava` updated to `31.1-jre` (was `23.0`).
+* `guice` updated to `4.13.2` (was `4.13.1`).
+* `junit` updated to `5.1.0` (was `4.0`).
+* `aspectj` updated to `1.9.7` (was `1.8.9`).
+* `hcommon-hive-metastore` updated to `1.4.2` (was `1.2.3`).
+
+### Newly Added Dependency
+* `lombok` - `1.18.24`.
+* `jakarta` - `6.0.0`.
+* `apache-commons` - `3.12.0`.
+
+### Fixed
+* Added lombok
+* Fixed test cases
+
 ## [3.9.5] - TBD
 ### Changed
 * `commons-io` updated to `2.7.` (was `2.6`).

diff --git a/lombok.config b/lombok.config
@@ -0,0 +1,2 @@
+config.stopbubbling = true
+lombok.addLombokGeneratedAnnotation = true