Skip to content

Commit dbf059f

Browse files
brianwykabrianwyka
authored
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
1 parent 90e024d commit dbf059f

File tree

28 files changed

+112
-76
lines changed

28 files changed

+112
-76
lines changed

‎.github/workflows/maven-ci.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,10 @@ jobs:
159159
- name: Create Homebrew Tap Formula Archive
160160
if: success()
161161
working-directory: build
162-
run: gzip sourcehawk*.1 && tar -czvf sourcehawk-homebrew-tap-formula.tar.gz sourcehawk sourcehawk-completion.sh sourcehawk*.1.gz
162+
run: |
163+
cp sourcehawk-completion.sh sourcehawk-bash-completion.sh
164+
cp sourcehawk-completion.sh sourcehawk-zsh-completion.sh
165+
gzip sourcehawk*.1 && tar -czvf sourcehawk-homebrew-tap-formula.tar.gz sourcehawk sourcehawk-bash-completion.sh sourcehawk-zsh-completion.sh sourcehawk*.1.gz
163166
- name: Archive Mac Native Image
164167
if: success()
165168
continue-on-error: true

‎.github/workflows/release.yml

+30-26
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@ on:
1515
required: false
1616
default: 'false'
1717
jobs:
18-
build:
18+
build-java-8:
1919
runs-on: ubuntu-latest
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22-
outputs:
23-
RELEASE_VERSION: ${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}
24-
RELEASE_ASSET_UPLOAD_URL: ${{ steps.create_release.outputs.upload_url }}
2522
steps:
2623
- name: Checkout Source Code
2724
uses: actions/checkout@v2
@@ -57,10 +54,13 @@ jobs:
5754
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
5855
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
5956
SONATYPE_GPG_PASSPHRASE: ${{ secrets.SONATYPE_GPG_PASSPHRASE }}
60-
build-java11:
57+
build-java-11:
6158
runs-on: ubuntu-latest
6259
env:
6360
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
outputs:
62+
RELEASE_VERSION: ${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}
63+
RELEASE_ASSET_UPLOAD_URL: ${{ steps.create_release.outputs.upload_url }}
6464
steps:
6565
- name: Checkout Source Code
6666
uses: actions/checkout@v2
@@ -71,6 +71,7 @@ jobs:
7171
with:
7272
java-version: 11
7373
- name: Set Maven Project Version
74+
id: set_maven_project_version
7475
shell: bash
7576
run: |
7677
RELEASE_VERSION=$(./mvnw help:evaluate -Dexpression=project.version -q -DforceStdout | tail -1 | tr -d '\r\n')
@@ -130,7 +131,7 @@ jobs:
130131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
131132
with:
132133
tag_name: ${{ format('v{0}', steps.set_maven_project_version.outputs.RELEASE_VERSION) }}
133-
release_name: ${{ format('{0} {1}', github.event.repository.name, needs.build.outputs.RELEASE_VERSION) }}
134+
release_name: ${{ format('{0} {1}', github.event.repository.name, steps.set_maven_project_version.outputs.RELEASE_VERSION) }}
134135
body_path: CHANGELOG.md
135136
draft: ${{ github.event.inputs.draft }}
136137
prerelease: ${{ github.event.inputs.prerelease }}
@@ -139,7 +140,7 @@ jobs:
139140
continue-on-error: true
140141
uses: jamesives/github-pages-deploy-action@3.7.1
141142
with:
142-
COMMIT_MESSAGE: ${{ format('Publishing github pages for release version {0}', needs.build.outputs.RELEASE_VERSION) }}
143+
COMMIT_MESSAGE: ${{ format('Publishing github pages for release version {0}', steps.set_maven_project_version.outputs.RELEASE_VERSION) }}
143144
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
144145
BRANCH: gh-pages
145146
FOLDER: gh-pages
@@ -152,7 +153,7 @@ jobs:
152153
with:
153154
upload_url: ${{ steps.create_release.outputs.upload_url }}
154155
asset_path: ./distributions/linux/target/sourcehawk
155-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-linux-x86_64
156+
asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-linux-x86_64
156157
asset_content_type: application/octet-stream
157158
- name: Upload Sourcehawk Debian Buster Package
158159
if: success()
@@ -163,7 +164,7 @@ jobs:
163164
with:
164165
upload_url: ${{ steps.create_release.outputs.upload_url }}
165166
asset_path: ./distributions/debian/target/sourcehawk-debian-buster.deb
166-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-debian-buster-amd64.deb
167+
asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-debian-buster-amd64.deb
167168
asset_content_type: application/octet-stream
168169
- name: Upload Sourcehawk Ubuntu Focal Package
169170
if: success()
@@ -174,7 +175,7 @@ jobs:
174175
with:
175176
upload_url: ${{ steps.create_release.outputs.upload_url }}
176177
asset_path: ./distributions/debian/target/sourcehawk-ubuntu-focal.deb
177-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-ubuntu-focal-amd64.deb
178+
asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-ubuntu-focal-amd64.deb
178179
asset_content_type: application/octet-stream
179180
- name: Upload Sourcehawk Centos 7 RPM Package
180181
if: success()
@@ -185,7 +186,7 @@ jobs:
185186
with:
186187
upload_url: ${{ steps.create_release.outputs.upload_url }}
187188
asset_path: ./distributions/rpm/target/sourcehawk-centos-7.rpm
188-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.el7.x86_64.rpm
189+
asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-1.el7.x86_64.rpm
189190
asset_content_type: application/octet-stream
190191
- name: Upload Sourcehawk Centos 8 RPM Package
191192
if: success()
@@ -196,7 +197,7 @@ jobs:
196197
with:
197198
upload_url: ${{ steps.create_release.outputs.upload_url }}
198199
asset_path: ./distributions/rpm/target/sourcehawk-centos-8.rpm
199-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.el8.x86_64.rpm
200+
asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-1.el8.x86_64.rpm
200201
asset_content_type: application/octet-stream
201202
- name: Upload Sourcehawk Fedora 33 RPM Package
202203
if: success()
@@ -207,7 +208,7 @@ jobs:
207208
with:
208209
upload_url: ${{ steps.create_release.outputs.upload_url }}
209210
asset_path: ./distributions/rpm/target/sourcehawk-fedora-33.rpm
210-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.fc33.x86_64.rpm
211+
asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-1.fc33.x86_64.rpm
211212
asset_content_type: application/octet-stream
212213
- name: Upload Sourcehawk Fedora 34 RPM Package
213214
if: success()
@@ -218,7 +219,7 @@ jobs:
218219
with:
219220
upload_url: ${{ steps.create_release.outputs.upload_url }}
220221
asset_path: ./distributions/rpm/target/sourcehawk-fedora-34.rpm
221-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.fc34.x86_64.rpm
222+
asset_name: sourcehawk-${{ steps.set_maven_project_version.outputs.RELEASE_VERSION }}-1.fc34.x86_64.rpm
222223
asset_content_type: application/octet-stream
223224
- name: Upload Sourcehawk Fedora 35 RPM Package
224225
if: success()
@@ -229,11 +230,11 @@ jobs:
229230
with:
230231
upload_url: ${{ steps.create_release.outputs.upload_url }}
231232
asset_path: ./distributions/rpm/target/sourcehawk-fedora-35.rpm
232-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-1.fc35.x86_64.rpm
233+
asset_name: sourcehawk-${{ needs.build-java-11.outputs.RELEASE_VERSION }}-1.fc35.x86_64.rpm
233234
asset_content_type: application/octet-stream
234235
build-mac-native-image:
235236
runs-on: macos-latest
236-
needs: build-java11
237+
needs: build-java-11
237238
steps:
238239
- name: Download Native Image JAR
239240
uses: actions/download-artifact@v2
@@ -275,17 +276,20 @@ jobs:
275276
- name: Create Homebrew Tap Formula Archive
276277
if: success()
277278
working-directory: build
278-
run: gzip sourcehawk*.1 && tar -czvf sourcehawk-homebrew-tap-formula.tar.gz sourcehawk sourcehawk-completion.sh sourcehawk*.1.gz
279+
run: |
280+
cp sourcehawk-completion.sh sourcehawk-bash-completion.sh
281+
cp sourcehawk-completion.sh sourcehawk-zsh-completion.sh
282+
gzip sourcehawk*.1 && tar -czvf sourcehawk-homebrew-tap-formula.tar.gz sourcehawk sourcehawk-bash-completion.sh sourcehawk-zsh-completion.sh sourcehawk*.1.gz
279283
- name: Upload Sourcehawk Mac Executable
280284
if: success()
281285
continue-on-error: true
282286
uses: actions/upload-release-asset@v1
283287
env:
284288
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
285289
with:
286-
upload_url: ${{ needs.build.outputs.RELEASE_ASSET_UPLOAD_URL }}
290+
upload_url: ${{ needs.build-java-11.outputs.RELEASE_ASSET_UPLOAD_URL }}
287291
asset_path: build/sourcehawk
288-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-darwin-x86_64
292+
asset_name: sourcehawk-${{ needs.build-java-11.outputs.RELEASE_VERSION }}-darwin-x86_64
289293
asset_content_type: application/octet-stream
290294
- name: Upload Sourcehawk Mac Homebrew Tap Formula Archive
291295
id: upload_homebrew_tap_formula_archive
@@ -295,28 +299,28 @@ jobs:
295299
env:
296300
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
297301
with:
298-
upload_url: ${{ needs.build.outputs.RELEASE_ASSET_UPLOAD_URL }}
302+
upload_url: ${{ needs.build-java-11.outputs.RELEASE_ASSET_UPLOAD_URL }}
299303
asset_path: build/sourcehawk-homebrew-tap-formula.tar.gz
300-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-darwin-x86_64.tar.gz
304+
asset_name: sourcehawk-${{ needs.build-java-11.outputs.RELEASE_VERSION }}-darwin-x86_64.tar.gz
301305
asset_content_type: application/octet-stream
302306
- name: Update Optum Homebrew Tap Formula
303307
uses: mislav/bump-homebrew-formula-action@v1.10
304308
continue-on-error: true
305309
with:
306310
formula-name: sourcehawk
307-
tag-name: ${{ needs.build.outputs.RELEASE_VERSION }}
311+
tag-name: ${{ needs.build-java-11.outputs.RELEASE_VERSION }}
308312
homebrew-tap: optum/homebrew-tap
309313
base-branch: main
310314
download-url: ${{ steps.upload_homebrew_tap_formula_archive.outputs.browser_download_url }}
311315
commit-message: |
312-
Sourcehawk ${{ needs.build.outputs.RELEASE_VERSION }}
316+
Sourcehawk ${{ needs.build-java-11.outputs.RELEASE_VERSION }}
313317
314318
Updating sourcehawk formula to latest release version
315319
env:
316320
COMMITTER_TOKEN: ${{ secrets.GIT_COMMITTER_TOKEN }}
317321
build-windows-native-image:
318322
runs-on: windows-latest
319-
needs: build-java11
323+
needs: build-java-11
320324
steps:
321325
- name: Download Native Image JAR
322326
uses: actions/download-artifact@v2
@@ -347,7 +351,7 @@ jobs:
347351
env:
348352
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
349353
with:
350-
upload_url: ${{ needs.build.outputs.RELEASE_ASSET_UPLOAD_URL }}
354+
upload_url: ${{ needs.build-java-11.outputs.RELEASE_ASSET_UPLOAD_URL }}
351355
asset_path: sourcehawk.exe
352-
asset_name: sourcehawk-${{ needs.build.outputs.RELEASE_VERSION }}-windows-x86_64.exe
356+
asset_name: sourcehawk-${{ needs.build-java-11.outputs.RELEASE_VERSION }}-windows-x86_64.exe
353357
asset_content_type: application/octet-stream

‎attribution.txt

+22-2
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
748748

749749
-------------------------------------------------------------------------------------------------------------------------------
750750

751-
Package: org.slf4j:slf4j-simple:1.7.30
751+
Package: org.slf4j:slf4j-nop:1.7.32
752752

753753
License: MIT
754754

@@ -768,7 +768,27 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
768768

769769
-------------------------------------------------------------------------------------------------------------------------------
770770

771-
Package: org.slf4j:slf4j-api:1.7.30
771+
Package: org.slf4j:slf4j-simple:1.7.32
772+
773+
License: MIT
774+
775+
Copyrights:
776+
777+
778+
License Text:
779+
MIT License
780+
781+
Copyright (c) <year> <copyright holders>
782+
783+
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:
784+
785+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
786+
787+
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.
788+
789+
-------------------------------------------------------------------------------------------------------------------------------
790+
791+
Package: org.slf4j:slf4j-api:1.7.32
772792

773793
License: MIT
774794

‎bom/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.optum.sourcehawk</groupId>
1010
<artifactId>sourcehawk</artifactId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>sourcehawk-bom</artifactId>

‎cli/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>sourcehawk</artifactId>
1010
<groupId>com.optum.sourcehawk</groupId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>sourcehawk-cli</artifactId>

‎core/pom.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.optum.sourcehawk</groupId>
1010
<artifactId>sourcehawk</artifactId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

@@ -19,9 +19,10 @@
1919

2020
<properties>
2121
<!-- SONAR PROPERTIES -->
22-
<sonar.exclusions>**/utils/ModifiableProperties.java</sonar.exclusions>
23-
<sonar.coverage.exclusions>**/utils/ModifiableProperties.java</sonar.coverage.exclusions>
24-
<sonar.cpd.exclusions>**/utils/ModifiableProperties.java</sonar.cpd.exclusions>
22+
<sca.exclusions>**/utils/ModifiableProperties.java</sca.exclusions>
23+
<sonar.exclusions>${sca.exclusions}</sonar.exclusions>
24+
<sonar.coverage.exclusions>${sca.exclusions}</sonar.coverage.exclusions>
25+
<sonar.cpd.exclusions>${sca.exclusions}</sonar.cpd.exclusions>
2526
</properties>
2627

2728
<dependencies>

‎distributions/debian/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.optum.sourcehawk</groupId>
1010
<artifactId>sourcehawk-dist</artifactId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

@@ -19,7 +19,7 @@
1919

2020
<properties>
2121
<debian.build.directory>${project.build.directory}/debian</debian.build.directory>
22-
<debian.package>${bintray.package}</debian.package>
22+
<debian.package>${global.project.name}</debian.package>
2323
<debian.package.version>${project.version}</debian.package.version>
2424
<debian.package.version.suffix/> <!-- Set dynamically by plugin -->
2525
<debian.architecture>amd64</debian.architecture>
@@ -85,7 +85,7 @@
8585
<configuration>
8686
<resources>
8787
<resource>
88-
<directory>${project.parent.parent.basedir}/gh-pages/manpages</directory>
88+
<directory>${maven.multiModuleProjectDirectory}/gh-pages/manpages</directory>
8989
<includes>
9090
<include>${debian.package}*</include>
9191
</includes>

‎distributions/docker/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.optum.sourcehawk</groupId>
1010
<artifactId>sourcehawk-dist</artifactId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎distributions/linux/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.optum.sourcehawk</groupId>
1010
<artifactId>sourcehawk-dist</artifactId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎distributions/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.optum.sourcehawk</groupId>
1010
<artifactId>sourcehawk</artifactId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎distributions/rpm/pom.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<artifactId>sourcehawk-dist</artifactId>
1010
<groupId>com.optum.sourcehawk</groupId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>sourcehawk-dist-rpm</artifactId>
@@ -18,12 +18,11 @@
1818
<description>Sourcehawk RPM Packages</description>
1919

2020
<properties>
21-
<rpm.package>${bintray.package}</rpm.package>
21+
<rpm.package>${global.project.name}</rpm.package>
2222
<rpm.package.version>${project.version}</rpm.package.version>
2323
<rpm.package.release/> <!-- Set by plugin dynamically - default for SNAPSHOT builds -->
2424
<rpm.package.architecture>x86_64</rpm.package.architecture>
2525
<rpm.build.directory>${project.build.directory}/rpmbuild</rpm.build.directory>
26-
<git.commit.id/>
2726
</properties>
2827

2928
<dependencies>
@@ -106,7 +105,7 @@
106105
<configuration>
107106
<resources>
108107
<resource>
109-
<directory>${project.parent.parent.basedir}/gh-pages/manpages</directory>
108+
<directory>${maven.multiModuleProjectDirectory}/gh-pages/manpages</directory>
110109
<includes>
111110
<include>${rpm.package}*</include>
112111
</includes>

‎enforcer/core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.optum.sourcehawk</groupId>
1010
<artifactId>sourcehawk-enforcer</artifactId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎enforcer/file/aot/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>com.optum.sourcehawk</groupId>
1010
<artifactId>sourcehawk-enforcer-file</artifactId>
11-
<version>0.7.0-SNAPSHOT</version>
11+
<version>0.7.1-SNAPSHOT</version>
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

0 commit comments

Comments
 (0)