Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LDEV-4283 update commons-codec to 1.15.0 for s3 v0.9.4 #14

Open
wants to merge 1 commit into
base: v0.9.4
Choose a base branch
from
Open

LDEV-4283 update commons-codec to 1.15.0 for s3 v0.9.4 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,25 @@ jobs:

runs-on: ubuntu-latest
env:
luceeVersion: light-6.0.0.149-SNAPSHOT
luceeVersion: light-6.0.0.300-SNAPSHOT

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
- name: Cache Maven packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.m2
key: lucee-s3
restore-keys: |
${{ runner.os }}-m2
maven-cache
- name: Cache Lucee files
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: _actions/lucee/script-runner/main/lucee-download-cache
key: lucee-downloads-${{ env.luceeVersion }}
Expand All @@ -37,12 +37,12 @@ jobs:
- name: Build extension-s3 with Ant
run: ant -noinput -verbose -buildfile build.xml
- name: Upload Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: s3-lex
path: dist/*.lex
- name: Checkout Lucee
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: lucee/lucee
path: lucee
Expand All @@ -52,8 +52,7 @@ jobs:
webroot: ${{ github.workspace }}/lucee/test
execute: /bootstrap-tests.cfm
luceeVersion: ${{ env.luceeVersion }}
extensionDir: ${{ github.workspace }}/dist
extensions: 8D7FB0DF-08BB-1589-FE3975678F07DB17,37C61C0A-5D7E-4256-8572639BE0CF5838 # the compress and esapi extensiona are required to run tests lucee with lucee-light
extensionDir: ${{ github.workspace }}/distwith lucee-light
env:
testLabels: s3
S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_ID_TEST }}
Expand Down
Binary file removed source/java/libs/org.apache.commons.codec-1.9.0.jar
View file
Open in desktop
Binary file not shown.
Binary file added source/java/libs/org.apache.commons.commons-codec-1.15.0.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion source/java/src/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Export-Package: org.lucee.extension.resource.s3,
org.lucee.extension.resource.s3.function
Bundle-ManifestVersion: 2
Require-Bundle: org.lucee.bouncycastle.bcprov;bundle-version=1.52.0,
org.apache.commons.codec;bundle-version=1.9.0,
org.apache.commons.commons-codec;bundle-version=1.15.0,
org.lucee.commons.logging;bundle-version=1.2.0.0000L,
org.lucee.httpcomponents.httpcore;bundle-version=4.4.12,
org.lucee.httpcomponents.httpclient;bundle-version=4.5.10.0002L,
Expand Down