Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/add-to-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Add to project
uses: actions/add-to-project@v0.5.0
uses: actions/add-to-project@v1
with:
project-url: https://github.com/orgs/podaac/projects/75
github-token: ${{ secrets.PROJECTS_PAT }}

- name: Set status to needs:triage
uses: actions/github-script@v7
uses: actions/github-script@v8
with:
github-token: ${{ secrets.PROJECTS_PAT }}
script: |
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ jobs:
# Checks out this repository and sets up the build/test environment with
# gradle
- name: Checkout project sources
uses: actions/checkout@v4
uses: actions/checkout@v7

- name: Set up JDK 11
uses: actions/setup-java@v4
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- name: Setup Gradle
uses: gradle/gradle-build-action@v3
uses: gradle/actions/setup-gradle@v5
with:
gradle-version: 7.6.4
gradle-version: 8.8

#########################################################################
# Versioning (featuring weird gradle output work-arounds)
Expand Down Expand Up @@ -238,7 +238,7 @@ jobs:

- name: Test and coverage
run: |
gradle wrapper --gradle-version 7.6.4
#gradle wrapper --gradle-version 8.8
./gradlew test
./gradlew mergeJUnitReports

Expand All @@ -253,7 +253,7 @@ jobs:
github.event.head_commit.message == '/deploy sit' ||
github.event.head_commit.message == '/deploy uat' ||
github.event.head_commit.message == '/deploy sandbox'
uses: ncipollo/release-action@v1.12.0
uses: ncipollo/release-action@v1.20.0
with:
tag: ${{ env.the_version }}
artifacts: "dist/*.zip, build/libs/*.jar"
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:
github.event.head_commit.message == '/deploy sit' ||
github.event.head_commit.message == '/deploy uat' ||
github.event.head_commit.message == '/deploy sandbox'
uses: docker/build-push-action@v3
uses: docker/build-push-action@v6
with:
context: .
file: ./docker/Dockerfile
Expand All @@ -330,7 +330,7 @@ jobs:
#########################################################################
# Deploy to AWS via Terraform
#########################################################################
- uses: hashicorp/setup-terraform@v2
- uses: hashicorp/setup-terraform@v3
with:
terraform_version: 0.13.6

Expand Down Expand Up @@ -365,4 +365,4 @@ jobs:
terraform --version
source bin/config.sh ${{ env.TARGET_ENV_LOWERCASE }}
terraform plan -var-file=tfvars/"${{ env.TARGET_ENV_LOWERCASE }}".tfvars -var="app_version=${{ env.the_version }}" -out="tfplan"
terraform apply -auto-approve tfplan
terraform apply -auto-approve tfplan
12 changes: 6 additions & 6 deletions .github/workflows/release-created.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@ jobs:
${{ startsWith(github.ref, 'refs/heads/release/') }}
steps:
# Checks-out the develop branch
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
ref: 'refs/heads/develop'

- name: Set up JDK 11
uses: actions/setup-java@v4
- name: Set up JDK 21
uses: actions/setup-java@v5
with:
distribution: 'temurin'
java-version: '11'
java-version: '21'

- name: Setup Gradle
uses: gradle/gradle-build-action@v3
uses: gradle/actions/setup-gradle@v5

- name: Bump minor version
env:
Expand Down Expand Up @@ -63,4 +63,4 @@ jobs:

fi

fi
fi
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
### Changed
- **Java 21 Update**
- Updated forge to use java 21
- Update java libraries
- Update terraform for cumulus consolidation
### Deprecated
### Removed
### Fixed
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Build local jar to run footprint
./gradlew shadowJar
```

You need java 11 to run the jar locally
You need java 21 to run the jar locally
```
java -cp build/libs/footprint.jar FootprintCLI <granule> <collection config>
```
Expand Down
Loading
Loading