Jackson 2.12.5 Upgrade (#46)

* Upgrade jackson to 2.12.1 and use new BlackbirdModule * jackson-upgrade: Update enforcer rules * jackson-upgrade: Update native image config to initialize file enforcers at build time * jackson-upgrade: Initialize file enforcers at build time for native image * jackson-upgrade: Remove blackbird * jackson-upgrade: fix-release: Fix manpages? * jackson-upgrade: fix-release: gzip update for homebrew * jackson-upgrade: fix-release: Update parent to 1.3.0 and version to 0.7.1 * jackson-upgrade: fix-release: Fix Release workflow * jackson-upgrade: Fix relesae stuff
Optum · Jan 26, 2022 · dbf059f · dbf059f
1 parent 90e024d
commit dbf059f
Show file tree

Hide file tree

Showing 28 changed files with 112 additions and 76 deletions.
diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
@@ -159,7 +159,10 @@ jobs:
       - name: Create Homebrew Tap Formula Archive
         if: success()
         working-directory: build
-        run: gzip sourcehawk*.1 && tar -czvf sourcehawk-homebrew-tap-formula.tar.gz sourcehawk sourcehawk-completion.sh sourcehawk*.1.gz
+        run: |
+          cp sourcehawk-completion.sh sourcehawk-bash-completion.sh
+          cp sourcehawk-completion.sh sourcehawk-zsh-completion.sh
+          gzip sourcehawk*.1 && tar -czvf sourcehawk-homebrew-tap-formula.tar.gz sourcehawk sourcehawk-bash-completion.sh sourcehawk-zsh-completion.sh sourcehawk*.1.gz
       - name: Archive Mac Native Image
         if: success()
         continue-on-error: true

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,13 +15,10 @@ on:
         required: false
         default: 'false'
 jobs:
-  build:
+  build-java-8:
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    outputs:
-      RELEASE_VERSION: ${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}
-      RELEASE_ASSET_UPLOAD_URL: ${{ steps.create_release.outputs.upload_url }}
     steps:
       - name: Checkout Source Code
         uses: actions/checkout@v2
@@ -57,10 +54,13 @@ jobs:
           SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
           SONATYPE_GPG_PASSPHRASE: ${{ secrets.SONATYPE_GPG_PASSPHRASE }}
-  build-java11:
+  build-java-11:
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    outputs:
+      RELEASE_VERSION: ${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}
+      RELEASE_ASSET_UPLOAD_URL: ${{ steps.create_release.outputs.upload_url }}
     steps:
       - name: Checkout Source Code
         uses: actions/checkout@v2
@@ -71,6 +71,7 @@ jobs:
         with:
           java-version: 11
       - name: Set Maven Project Version
+        id: set_maven_project_version
         shell: bash
         run: |
           RELEASE_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout | tail -1 | tr -d '\r\n')
@@ -130,7 +131,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ format('v{0}', steps.set_maven_project_version.outputs.RELEASE_VERSION) }}
-          release_name: ${{ format('{0} {1}', github.event.repository.name, needs.build.outputs.RELEASE_VERSION) }}
+          release_name: ${{ format('{0} {1}', github.event.repository.name, steps.set_maven_project_version.outputs.RELEASE_VERSION) }}
           body_path: CHANGELOG.md
           draft: ${{ github.event.inputs.draft }}
           prerelease: ${{ github.event.inputs.prerelease }}
@@ -139,7 +140,7 @@ jobs:
         continue-on-error: true
         uses: jamesives/[email protected]
         with:
-          COMMIT_MESSAGE: ${{ format('Publishing github pages for release version {0}', needs.build.outputs.RELEASE_VERSION) }}
+          COMMIT_MESSAGE: ${{ format('Publishing github pages for release version {0}', steps.set_maven_project_version.outputs.RELEASE_VERSION) }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH: gh-pages
           FOLDER: gh-pages
@@ -152,7 +153,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./distributions/linux/target/sourcehawk
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-linux-x86_64
+          asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-linux-x86_64
           asset_content_type: application/octet-stream
       - name: Upload Sourcehawk Debian Buster Package
         if: success()
@@ -163,7 +164,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./distributions/debian/target/sourcehawk-debian-buster.deb
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-debian-buster-amd64.deb
+          asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-debian-buster-amd64.deb
           asset_content_type: application/octet-stream
       - name: Upload Sourcehawk Ubuntu Focal Package
         if: success()
@@ -174,7 +175,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./distributions/debian/target/sourcehawk-ubuntu-focal.deb
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-ubuntu-focal-amd64.deb
+          asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-ubuntu-focal-amd64.deb
           asset_content_type: application/octet-stream
       - name: Upload Sourcehawk Centos 7 RPM Package
         if: success()
@@ -185,7 +186,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./distributions/rpm/target/sourcehawk-centos-7.rpm
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.el7.x86_64.rpm
+          asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-1.el7.x86_64.rpm
           asset_content_type: application/octet-stream
       - name: Upload Sourcehawk Centos 8 RPM Package
         if: success()
@@ -196,7 +197,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./distributions/rpm/target/sourcehawk-centos-8.rpm
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.el8.x86_64.rpm
+          asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-1.el8.x86_64.rpm
           asset_content_type: application/octet-stream
       - name: Upload Sourcehawk Fedora 33 RPM Package
         if: success()
@@ -207,7 +208,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./distributions/rpm/target/sourcehawk-fedora-33.rpm
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.fc33.x86_64.rpm
+          asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-1.fc33.x86_64.rpm
           asset_content_type: application/octet-stream
       - name: Upload Sourcehawk Fedora 34 RPM Package
         if: success()
@@ -218,7 +219,7 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./distributions/rpm/target/sourcehawk-fedora-34.rpm
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.fc34.x86_64.rpm
+          asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-1.fc34.x86_64.rpm
           asset_content_type: application/octet-stream
       - name: Upload Sourcehawk Fedora 35 RPM Package
         if: success()
@@ -229,11 +230,11 @@ jobs:
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
           asset_path: ./distributions/rpm/target/sourcehawk-fedora-35.rpm
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.fc35.x86_64.rpm
+          asset_name: sourcehawk-${{ needs.build-java-11.outputs.RELEASE_VERSION }}-1.fc35.x86_64.rpm
           asset_content_type: application/octet-stream
   build-mac-native-image:
     runs-on: macos-latest
-    needs: build-java11
+    needs: build-java-11
     steps:
       - name: Download Native Image JAR
         uses: actions/download-artifact@v2
@@ -275,17 +276,20 @@ jobs:
       - name: Create Homebrew Tap Formula Archive
         if: success()
         working-directory: build
-        run: gzip sourcehawk*.1 && tar -czvf sourcehawk-homebrew-tap-formula.tar.gz sourcehawk sourcehawk-completion.sh sourcehawk*.1.gz
+        run: |
+          cp sourcehawk-completion.sh sourcehawk-bash-completion.sh
+          cp sourcehawk-completion.sh sourcehawk-zsh-completion.sh
+          gzip sourcehawk*.1 && tar -czvf sourcehawk-homebrew-tap-formula.tar.gz sourcehawk sourcehawk-bash-completion.sh sourcehawk-zsh-completion.sh sourcehawk*.1.gz
       - name: Upload Sourcehawk Mac Executable
         if: success()
         continue-on-error: true
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ needs.build.outputs.RELEASE_ASSET_UPLOAD_URL }}
+          upload_url: ${{ needs.build-java-11.outputs.RELEASE_ASSET_UPLOAD_URL }}
           asset_path: build/sourcehawk
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-darwin-x86_64
+          asset_name: sourcehawk-${{ needs.build-java-11.outputs.RELEASE_VERSION }}-darwin-x86_64
           asset_content_type: application/octet-stream
       - name: Upload Sourcehawk Mac Homebrew Tap Formula Archive
         id: upload_homebrew_tap_formula_archive
@@ -295,28 +299,28 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ needs.build.outputs.RELEASE_ASSET_UPLOAD_URL }}
+          upload_url: ${{ needs.build-java-11.outputs.RELEASE_ASSET_UPLOAD_URL }}
           asset_path: build/sourcehawk-homebrew-tap-formula.tar.gz
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-darwin-x86_64.tar.gz
+          asset_name: sourcehawk-${{ needs.build-java-11.outputs.RELEASE_VERSION }}-darwin-x86_64.tar.gz
           asset_content_type: application/octet-stream
       - name: Update Optum Homebrew Tap Formula
         uses: mislav/[email protected]
         continue-on-error: true
         with:
           formula-name: sourcehawk
-          tag-name: ${{ needs.build.outputs.RELEASE_VERSION }}
+          tag-name: ${{ needs.build-java-11.outputs.RELEASE_VERSION }}
           homebrew-tap: optum/homebrew-tap
           base-branch: main
           download-url: ${{ steps.upload_homebrew_tap_formula_archive.outputs.browser_download_url }}
           commit-message: |
-            Sourcehawk ${{ needs.build.outputs.RELEASE_VERSION }}
+            Sourcehawk ${{ needs.build-java-11.outputs.RELEASE_VERSION }}
             
             Updating sourcehawk formula to latest release version
         env:
           COMMITTER_TOKEN: ${{ secrets.GIT_COMMITTER_TOKEN }}
   build-windows-native-image:
     runs-on: windows-latest
-    needs: build-java11
+    needs: build-java-11
     steps:
       - name: Download Native Image JAR
         uses: actions/download-artifact@v2
@@ -347,7 +351,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          upload_url: ${{ needs.build.outputs.RELEASE_ASSET_UPLOAD_URL }}
+          upload_url: ${{ needs.build-java-11.outputs.RELEASE_ASSET_UPLOAD_URL }}
           asset_path: sourcehawk.exe
-          asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-windows-x86_64.exe
+          asset_name: sourcehawk-${{ needs.build-java-11.outputs.RELEASE_VERSION }}-windows-x86_64.exe
           asset_content_type: application/octet-stream
diff --git a/attribution.txt b/attribution.txt
@@ -748,7 +748,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 -------------------------------------------------------------------------------------------------------------------------------
 
-Package: org.slf4j:slf4j-simple:1.7.30
+Package: org.slf4j:slf4j-nop:1.7.32
 
 License: MIT
 
@@ -768,7 +768,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 -------------------------------------------------------------------------------------------------------------------------------
 
-Package: org.slf4j:slf4j-api:1.7.30
+Package: org.slf4j:slf4j-simple:1.7.32
+
+License: MIT
+
+Copyrights:
+
+
+License Text:
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+-------------------------------------------------------------------------------------------------------------------------------
+
+Package: org.slf4j:slf4j-api:1.7.32
 
 License: MIT
 

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>sourcehawk-bom</artifactId>

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sourcehawk</artifactId>
         <groupId>com.optum.sourcehawk</groupId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>sourcehawk-cli</artifactId>

diff --git a/core/pom.xml b/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -19,9 +19,10 @@
 
     <properties>
         <!-- SONAR PROPERTIES -->
-        <sonar.exclusions>**/utils/ModifiableProperties.java</sonar.exclusions>
-        <sonar.coverage.exclusions>**/utils/ModifiableProperties.java</sonar.coverage.exclusions>
-        <sonar.cpd.exclusions>**/utils/ModifiableProperties.java</sonar.cpd.exclusions>
+        <sca.exclusions>**/utils/ModifiableProperties.java</sca.exclusions>
+        <sonar.exclusions>${sca.exclusions}</sonar.exclusions>
+        <sonar.coverage.exclusions>${sca.exclusions}</sonar.coverage.exclusions>
+        <sonar.cpd.exclusions>${sca.exclusions}</sonar.cpd.exclusions>
     </properties>
 
     <dependencies>

diff --git a/distributions/debian/pom.xml b/distributions/debian/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-dist</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -19,7 +19,7 @@
 
     <properties>
         <debian.build.directory>${project.build.directory}/debian</debian.build.directory>
-        <debian.package>${bintray.package}</debian.package>
+        <debian.package>${global.project.name}</debian.package>
         <debian.package.version>${project.version}</debian.package.version>
         <debian.package.version.suffix/> <!-- Set dynamically by plugin -->
         <debian.architecture>amd64</debian.architecture>
@@ -85,7 +85,7 @@
                         <configuration>
                             <resources>
                                 <resource>
-                                    <directory>${project.parent.parent.basedir}/gh-pages/manpages</directory>
+                                    <directory>${maven.multiModuleProjectDirectory}/gh-pages/manpages</directory>
                                     <includes>
                                         <include>${debian.package}*</include>
                                     </includes>

diff --git a/distributions/docker/pom.xml b/distributions/docker/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-dist</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/distributions/linux/pom.xml b/distributions/linux/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-dist</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/distributions/pom.xml b/distributions/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/distributions/rpm/pom.xml b/distributions/rpm/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>sourcehawk-dist</artifactId>
         <groupId>com.optum.sourcehawk</groupId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>sourcehawk-dist-rpm</artifactId>
@@ -18,12 +18,11 @@
     <description>Sourcehawk RPM Packages</description>
 
     <properties>
-        <rpm.package>${bintray.package}</rpm.package>
+        <rpm.package>${global.project.name}</rpm.package>
         <rpm.package.version>${project.version}</rpm.package.version>
         <rpm.package.release/> <!-- Set by plugin dynamically - default for SNAPSHOT builds -->
         <rpm.package.architecture>x86_64</rpm.package.architecture>
         <rpm.build.directory>${project.build.directory}/rpmbuild</rpm.build.directory>
-        <git.commit.id/>
     </properties>
 
     <dependencies>
@@ -106,7 +105,7 @@
                         <configuration>
                             <resources>
                                 <resource>
-                                    <directory>${project.parent.parent.basedir}/gh-pages/manpages</directory>
+                                    <directory>${maven.multiModuleProjectDirectory}/gh-pages/manpages</directory>
                                     <includes>
                                         <include>${rpm.package}*</include>
                                     </includes>

diff --git a/enforcer/core/pom.xml b/enforcer/core/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/enforcer/file/aot/pom.xml b/enforcer/file/aot/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.optum.sourcehawk</groupId>
         <artifactId>sourcehawk-enforcer-file</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.7.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>