Skip to content

Commit

Permalink
Merge branch 'main' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	gradle.properties
  • Loading branch information
James Wood authored and James Wood committed Jun 11, 2024
2 parents 8f7df71 + 7c59d5e commit 64f33ab
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 6 deletions.
16 changes: 13 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added
### Changed
### Deprecated
### Removed
### Fixed
### Security


## [0.11.0]

### Added
- **Terraform Fix Upload Images **
- update way we are deploying
- ** Update Aws Provider
- update terraform aws provider to allow for any version greater than 3.0
- Update deployment
- ** Update AWS Provider
- Update terraform aws provider to allow for any version greater than 3.0
### Changed
### Deprecated
### Removed
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ dependencies {
compile group: 'gov.nasa.earthdata', name: 'cumulus-message-adapter', version: '2.0.0'
//implementation group: 'gov.nasa.earthdata', name: 'cumulus-message-adapter', version: '1.3.9'

compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.574'
compile group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.740'
compile group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.1'
compile group: 'com.amazonaws', name: 'aws-java-sdk-stepfunctions', version: '1.12.363'

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#Wed May 15 18:04:14 UTC 2024
version=
#Tue Jun 11 21:52:04 UTC 2024
version=0.12.0-alpha.0
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public static void footprintCYGNSS() throws Exception {
String configFileName = "PODAAC-CYGNS-L2X21.cfg";
runFootprint(fileDirectory, inputFileName, configFileName);
}

public static void main(String[] args) throws Exception {
Options opt = new OptionsBuilder()
.include(".*" + FootprintBenchmark.class.getSimpleName() + ".*")
Expand Down

0 comments on commit 64f33ab

Please sign in to comment.