zontreck/ACLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: the log4j patch upgrade upgrading to 2.16 from 2.0-beta9 when it shouldn't

Browse source
This commit is contained in:
Ryan Dowling 2021-12-19 14:03:01 +11:00
parent 972d42bdc5
commit 7f5ad41926
No known key found for this signature in database
GPG key ID: 5539FCDB88950EFD
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.github/workflows/application.yml vendored
View file

@ -117,17 +117,17 @@ jobs:
pattern: '([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\.?\w*'
replace-with: '$1'
# - name: Create ATLauncher Version
# uses: ATLauncher/release-atlauncher-action@master
# if: ${{ !endsWith(steps.version.outputs.text, '.Beta') }}
# with:
# api-key: ${{ secrets.ATLAUNCHER_API_KEY }}
# version: ${{ steps.clean-version.outputs.replaced }}
# changelog: ${{ env.cleaned-changelog }}
# files: |
# ./ATLauncher/ATLauncher-${{ steps.clean-version.outputs.replaced }}.exe
# ./ATLauncher/ATLauncher-${{ steps.clean-version.outputs.replaced }}.zip
# ./ATLauncher/ATLauncher-${{ steps.clean-version.outputs.replaced }}.jar
- name: Create ATLauncher Version
uses: ATLauncher/release-atlauncher-action@master
if: ${{ !endsWith(steps.version.outputs.text, '.Beta') }}
with:
api-key: ${{ secrets.ATLAUNCHER_API_KEY }}
version: ${{ steps.clean-version.outputs.replaced }}
changelog: ${{ env.cleaned-changelog }}
files: |
./ATLauncher/ATLauncher-${{ steps.clean-version.outputs.replaced }}.exe
./ATLauncher/ATLauncher-${{ steps.clean-version.outputs.replaced }}.zip
./ATLauncher/ATLauncher-${{ steps.clean-version.outputs.replaced }}.jar
- name: Create GitHub Release
uses: meeDamian/github-release@2.0

1
CHANGELOG.md
View file

@ -8,5 +8,6 @@ This changelog only contains the changes that are unreleased. For changes for in
### New Features
### Fixes
- The log4j patch upgrade upgrading to 2.16 from 2.0-beta9 when it shouldn't
### Misc

4
src/main/java/com/atlauncher/data/minecraft/Library.java
View file

@ -92,7 +92,7 @@ public class Library {
final String[] libraryParts = name.split(":");
if (libraryParts[1].equals("log4j-api")) {
if (libraryParts[2].equals("2.0-beta9")) {
if (libraryParts[2].startsWith("2.0-beta9")) {
name = "org.apache.logging.log4j:log4j-api:2.0-beta9-fixed";
downloads.artifact.path = "org/apache/logging/log4j/log4j-api/2.0-beta9-fixed/log4j-api-2.0-beta9-fixed.jar";
downloads.artifact.sha1 = "b61eaf2e64d8b0277e188262a8b771bbfa1502b3";
@ -104,7 +104,7 @@ public class Library {
downloads.artifact.size = 301892;
}
} else if (libraryParts[1].equals("log4j-core")) {
if (libraryParts[2].equals("2.0-beta9")) {
if (libraryParts[2].startsWith("2.0-beta9")) {
name = "org.apache.logging.log4j:log4j-core:2.0-beta9-fixed";
downloads.artifact.path = "org/apache/logging/log4j/log4j-core/2.0-beta9-fixed/log4j-core-2.0-beta9-fixed.jar";
downloads.artifact.sha1 = "677991ea2d7426f76309a73739cecf609679492c";