Merge pull request #39 from podaac/release/0.12.0

Release 0.12.0
podaac · Jan 27, 2025 · 7090f4f · 7090f4f
2 parents 7c59d5e + 29ff1ad
commit 7090f4f
Show file tree

Hide file tree

Showing 12 changed files with 147 additions and 290 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,8 +28,17 @@ jobs:
       # gradle
       - name: Checkout project sources
         uses: actions/checkout@v4
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
+        with:
+          gradle-version: 7.6.4
 
       #########################################################################
       # Versioning (featuring weird gradle output work-arounds)
@@ -219,75 +228,19 @@ jobs:
           VERSION: ${{ env.the_version }}
         run: |
           rm -rf dist
-          ./gradlew --scan buildArtifact
+          ./gradlew buildArtifact
           ./gradlew shadowJar
           mv build/libs/*.jar build/libs/footprint_${VERSION}.jar
-          ls -al
-          ls -al dist/
-          ls -al docker/
-          ls -al build/libs
-          ls -al terraform/
-          ls -al terraform_deploy/
-
 
       #########################################################################
       # Test
       #########################################################################
-      # - name: SonarCloud Scan
-      #   uses: sonarsource/sonarcloud-github-action@master
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      #   with:
-      #     args: >
-      #       -Dsonar.organization=${{ github.repository_owner }}
-      #       -Dsonar.projectKey=${{ github.repository_owner }}_l2ss-py
-      #       -Dsonar.python.coverage.reportPaths=build/reports/coverage.xml
-      #       -Dsonar.sources=podaac/
-      #       -Dsonar.tests=tests/
-      #       -Dsonar.projectName=l2ss-py
-      #       -Dsonar.projectVersion=${{ env.software_version }}
-      #       -Dsonar.python.version=3.8,3.9,3.10
-
-      # - name: Java Debugging
-      #   run: |
-      #     java --version
-      #     which java
-      #     ls -al /usr/bin/java
-
-
-      # # This step will fail the build if snyk fails
-      # - name: Run Snyk as a blocking step
-      #   uses: snyk/actions/gradle@master
-      #   env:
-      #       SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-      #       JAVA_HOME: /usr/lib/jvm/default-java/
-      #   with:
-      #     command: test
-      #     args: >
-      #         --org=${{ secrets.SNYK_ORG_ID }}
-      #         --project-name=${{ github.repository }}
-      #         --severity-threshold=high
-      #         --fail-on=all
-
-      # # This step will send the results of snyk to the snyk servers
-      # - name: Run Snyk on Python
-      #   uses: snyk/actions/python-3.8@master
-      #   env:
-      #     SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-      #   with:
-      #     command: monitor
-      #     args: >
-      #       --org=${{ secrets.SNYK_ORG_ID }}
-      #       --project-name=${{ github.repository }}
-
-      # Lastly run the tests bundled with the repo
-      # - name: Test and coverage
-      #   run: |
-      #     gradle wrapper --gradle-version 6.3
-      #     ./gradlew test
-      #     ./gradlew mergeJUnitReports
-      #     junit 'build/test-results/test/TESTS-TestSuites.xml'
+
+      - name: Test and coverage
+        run: |
+          gradle wrapper --gradle-version 7.6.4
+          ./gradlew test
+          ./gradlew mergeJUnitReports
 
       #########################################################################
       # Publish release to releases

diff --git a/.github/workflows/release-created.yml b/.github/workflows/release-created.yml
@@ -16,12 +16,18 @@ jobs:
       ${{ startsWith(github.ref, 'refs/heads/release/') }}
     steps:
       # Checks-out the develop branch
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: 'refs/heads/develop'
 
+      - name: Set up JDK 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Bump minor version
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,12 +16,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Security
 
 
+## [0.12.0]
+
+### Added
+### Changed
+- **Check input lon and lat data**
+  - Made function to check input lon and lat data are valid if not then it should fail quickly.
+- **Upgraded gradle to version 7.6.4**
+### Deprecated
+### Removed
+### Fixed
+### Security
+- **Upgraded dependency libraries and fixed snyk vulnerabilities**
+
+
 ## [0.11.0]
 
 ### Added
-- **Terraform Fix Upload Images **
+- **Terraform Fix Upload Images**
   - Update deployment 
-- ** Update AWS Provider
+- **Update AWS Provider**
   - Update terraform aws provider to allow for any version greater than 3.0
 ### Changed
 ### Deprecated

diff --git a/build.Dockerfile b/build.Dockerfile
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,8 @@ buildscript {
 plugins {
     id 'java'
     id 'jacoco'
-    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "com.github.johnrengelman.shadow" version "8.1.1"
+    id 'com.github.ben-manes.versions' version '0.51.0'
 }
 
 allprojects {
@@ -40,49 +41,60 @@ configurations {
     runtimeClasspath {
         extendsFrom developmentOnly
     }
+    runtimeOnlyResolvable {
+        canBeResolved = true
+        canBeConsumed = false
+        extendsFrom runtimeOnly
+    }
+}
+
+configurations.all {
+    resolutionStrategy {
+        force 'junit:junit:4.13.2' // Force the fixed version
+    }
 }
 
 dependencies {
-    compile group: 'com.vividsolutions', name: 'jts', version: '1.13'
-    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'
+    implementation group: 'com.vividsolutions', name: 'jts', version: '1.13'
+    implementation group: 'gov.nasa.earthdata', name: 'cumulus-message-adapter', version: '2.0.0'
+
+    implementation group: 'com.amazonaws', name: 'aws-java-sdk-s3', version: '1.12.780'
+    implementation group: 'com.amazonaws', name: 'aws-lambda-java-core', version: '1.2.3'
+    implementation group: 'com.amazonaws', name: 'aws-java-sdk-stepfunctions', version: '1.12.780'
 
-    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'
+    implementation group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.14'
+    implementation group: 'com.google.code.gson', name: 'gson', version: '2.11.0'
 
-    compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.13'
-    compile group: 'com.google.code.gson', name: 'gson', version: '2.9.0'
+    implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 
-    compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
-    compile group: 'org.json', name: 'json', version: '20231013'
+    implementation group: 'org.json', name: 'json', version: '20250107'
 
-    compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
-    compile group: 'commons-io', name: 'commons-io', version: '2.8.0'
-    compile group: 'edu.ucar', name: 'cdm', version: '4.6.20'
+    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.17.0'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.18.0'
+    implementation group: 'edu.ucar', name: 'cdm-core', version: '5.7.0'
 
-    compile group: 'org.geotools', name: 'gt-shapefile', version: '29.2'
-    compile group: 'commons-cli', name: 'commons-cli', version: '1.4'
+    implementation group: 'org.geotools', name: 'gt-shapefile', version: '32.1'
+    implementation group: 'commons-cli', name: 'commons-cli', version: '1.4'
 
-    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.17.2'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.17.2'
-    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.17.2'
-    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.24.3'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.24.3'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.24.3'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '3.6.0'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.4'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.11.4'
+    testImplementation group: 'org.mockito', name: 'mockito-core', version: '5.15.2'
 
-    testImplementation 'org.openjdk.jmh:jmh-core:1.26'
-    testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.26'
+    testImplementation 'org.openjdk.jmh:jmh-core:1.37'
+    testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
 
-    antJUnit 'org.apache.ant:ant-junit:1.10.11'
-    compile group: "com.github.everit-org.json-schema", name: "org.everit.json.schema", version: "1.14.1"
-    compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2'
+    antJUnit 'org.apache.ant:ant-junit:1.10.15'
+    implementation group: "com.github.everit-org.json-schema", name: "org.everit.json.schema", version: "1.14.4"
+    implementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.4.0'
 
-    compile group: 'com.beust', name: 'jcommander', version: '1.82'
-    compile group: 'org.jdom', name: 'jdom2', version: '2.0.6.1'
-
+    implementation group: 'com.beust', name: 'jcommander', version: '1.82'
+    implementation group: 'org.jdom', name: 'jdom2', version: '2.0.6.1'
 }
 
 compileJava.dependsOn(processResources)
@@ -95,9 +107,15 @@ test {
 jacocoTestReport {
     dependsOn test // tests are required to run before generating the report
     reports {
-        xml.enabled true
-        html.enabled true
-        csv.enabled true
+        xml {
+            required.set(true)
+        }
+        html {
+            required.set(true)
+        }
+        csv {
+            required.set(true)
+        }
     }
 }
 
@@ -240,9 +258,9 @@ task buildZip(type: Zip) {
     from compileJava
     from processResources
     into('lib') {
-        from configurations.runtime
+        from configurations.runtimeOnlyResolvable
     }
-    archiveName "forge-${getVersionName()}.zip"
+    archiveFileName="forge-${getVersionName()}.zip"
 }
 
 task getServiceName() {
@@ -280,9 +298,9 @@ task buildLambda(type: Zip) {
     from compileJava
     from processResources
     into('lib') {
-        from configurations.runtime
+        from configurations.runtimeClasspath
     }
-    archiveName "forge-lambda.zip"
+    archiveFileName="forge-lambda.zip"
 }
 
 task currentVersion() {