diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml index 88372cc..0887168 100755 --- a/.github/workflows/build-pipeline.yml +++ b/.github/workflows/build-pipeline.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '8.0.232' + java-version: '11.0.6' - uses: gradle/gradle-build-action@v1 with: gradle-version: 8.0.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index caa32aa..94ffe22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added ### Changed +- **PODAAC-5877** + - Support java 11 + - SonarQube and Jacoco report ### Deprecated ### Removed ### Fixed diff --git a/README.md b/README.md index 769340d..76f7825 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,17 @@ ## Installation -To build the Lambda code: - +To build the Lambda code, Refer to following Confluence page: +https://wiki.jpl.nasa.gov/pages/viewpage.action?spaceKey=PD&title=SonarQube%2C+Jacoco+and+Java+17+upgrade ```shell +* Build with sonarQube and Jacoco report +mvn clean verify sonar:sonar \ + -Dsonar.projectKey=cnm2cma-opensource \ + -Dsonar.projectName='cnm2cma-opensource' \ + -Dsonar.host.url=http://localhost:9000 \ + -Dsonar.token=sqp_6dc05b1aa1f622b45112927d2a0510f209776860 + +* Makde sure using java 11 and gradle 8.3 mvn clean dependency:copy-dependencies gradle build ``` diff --git a/build.gradle b/build.gradle index 6e41fc5..6aafd3d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'java' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 1.11 +targetCompatibility = 1.11 dependencies { implementation fileTree(dir: 'target/dependency/', include: '*.jar') diff --git a/pom.xml b/pom.xml index 955a2ba..05f1f1d 100755 --- a/pom.xml +++ b/pom.xml @@ -18,11 +18,21 @@ clojars.org https://repo.clojars.org + + central + Maven Central + https://repo1.maven.org/maven2 + + true + + + false + + - com.google.code.gson @@ -32,12 +42,12 @@ gov.nasa.earthdata cumulus-message-adapter - 1.3.9 + 2.0.0 com.amazonaws aws-java-sdk-s3 - 1.12.215 + 1.12.565 com.fasterxml.jackson.core @@ -53,7 +63,7 @@ com.amazonaws aws-lambda-java-core - 1.2.1 + 1.2.3 junit @@ -67,5 +77,76 @@ jackson-databind 2.13.4.2 + + commons-logging + commons-logging + 1.2 + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 11 + 11 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.1 + + + package + + shade + + + + + org.wordinator.xml2docx.MakeDocx + + true + + + + + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.7 + + + prepare-agent + + prepare-agent + + + + report + + report + + + + XML + + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.10.0.2594 + + +