From: Dan Timoney Date: Wed, 8 Nov 2023 14:09:18 +0000 (+0000) Subject: Merge "Upgrade to Argon SR2" X-Git-Tag: 2.6.1~1 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6a8fed92d8c89692b3aae58166fa4f5475ded2c2;hp=2141b8be6683e3f925e59373b08b7d6630cd2486;p=ccsdk%2Fparent.git Merge "Upgrade to Argon SR2" --- diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml new file mode 100644 index 00000000..d8bffbea --- /dev/null +++ b/.github/workflows/gerrit-verify.yaml @@ -0,0 +1,108 @@ +--- +name: Gerrit Composed Maven Verify + +# yamllint disable-line rule:truthy +on: + workflow_dispatch: + inputs: + GERRIT_BRANCH: + description: "Branch that change is against" + required: true + type: string + GERRIT_CHANGE_ID: + description: "The ID for the change" + required: true + type: string + GERRIT_CHANGE_NUMBER: + description: "The Gerrit number" + required: true + type: string + GERRIT_CHANGE_URL: + description: "URL to the change" + required: true + type: string + GERRIT_EVENT_TYPE: + description: "Type of Gerrit event" + required: true + type: string + GERRIT_PATCHSET_NUMBER: + description: "The patch number for the change" + required: true + type: string + GERRIT_PATCHSET_REVISION: + description: "The revision sha" + required: true + type: string + GERRIT_PROJECT: + description: "Project in Gerrit" + required: true + type: string + GERRIT_REFSPEC: + description: "Gerrit refspec of change" + required: true + type: string + +concurrency: + # yamllint disable-line rule:line-length + group: compose-maven-verify-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} + cancel-in-progress: true + +jobs: + prepare: + runs-on: ubuntu-latest + steps: + - name: Clear votes + # yamllint disable-line rule:line-length + uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4 + with: + host: ${{ vars.GERRIT_SERVER }} + username: ${{ vars.GERRIT_SSH_USER }} + key: ${{ secrets.GERRIT_SSH_PRIVKEY }} + known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} + gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + vote-type: clear + comment-only: true + - name: Allow replication + run: sleep 10s + + maven-verify: + needs: prepare + # use compose-jjb-verify from the v0.4 series of releng-reusable-workflows + # yamllint disable-line rule:line-length + uses: lfit/releng-reusable-workflows/.github/workflows/compose-maven-verify.yaml@main + with: + GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }} + GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }} + GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }} + GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }} + GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }} + GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }} + GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }} + GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }} + JDK_VERSION: "17" + MVN_VERSION: "3.8.2" + MVN_PROFILES: "docker" + + vote: + if: ${{ always() }} + # yamllint enable rule:line-length + needs: [prepare, maven-verify] + runs-on: ubuntu-latest + steps: + - name: Get conclusion + # yamllint disable-line rule:line-length + uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # v3.0.3 + - name: Set vote + # yamllint disable-line rule:line-length + uses: lfit/gerrit-review-action@6ac4c2322b68c0120a9b516eb0421491ee1b3fdf # v0.4 + with: + host: ${{ vars.GERRIT_SERVER }} + username: ${{ vars.GERRIT_SSH_USER }} + key: ${{ secrets.GERRIT_SSH_PRIVKEY }} + known_hosts: ${{ vars.GERRIT_KNOWN_HOSTS }} + gerrit-change-number: ${{ inputs.GERRIT_CHANGE_NUMBER }} + gerrit-patchset-number: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + vote-type: ${{ env.WORKFLOW_CONCLUSION }} + comment-only: true diff --git a/dependencies-odl-bom/pom.xml b/dependencies-odl-bom/pom.xml index 3bd0460b..44084e79 100644 --- a/dependencies-odl-bom/pom.xml +++ b/dependencies-odl-bom/pom.xml @@ -6,7 +6,7 @@ org.opendaylight.odlparent odlparent 8.1.2 - + org.onap.ccsdk.parent @@ -85,6 +85,11 @@ dmaapClient 1.1.14 + + org.apache.kafka + kafka-clients + 3.0.0 + com.google.code.findbugs @@ -200,7 +205,7 @@ 2.8 - + true diff --git a/springboot/pom.xml b/springboot/pom.xml index eaf6add5..2404458d 100755 --- a/springboot/pom.xml +++ b/springboot/pom.xml @@ -22,6 +22,7 @@ springboot26 springboot27 springboot30 + springboot31 diff --git a/springboot/spring-boot-setup/pom.xml b/springboot/spring-boot-setup/pom.xml index 5124a7be..c4ae6b47 100644 --- a/springboot/spring-boot-setup/pom.xml +++ b/springboot/spring-boot-setup/pom.xml @@ -143,6 +143,30 @@ UTF-8 + + create-springboot31-parent-pom + + copy-resources + + validate + + ../springboot31 + + + src/main/resources + + pom-template-jdk17.xml + + true + + + \ + + ${basedir}/src/main/properties/springboot31.properties + + UTF-8 + + @@ -205,6 +229,17 @@ ../springboot30/pom.xml + + rename-springboot31-parent-pom + validate + + rename + + + ../springboot31/pom-template-jdk17.xml + ../springboot31/pom.xml + + diff --git a/springboot/spring-boot-setup/src/main/properties/springboot31.properties b/springboot/spring-boot-setup/src/main/properties/springboot31.properties new file mode 100644 index 00000000..ec6957f2 --- /dev/null +++ b/springboot/spring-boot-setup/src/main/properties/springboot31.properties @@ -0,0 +1,11 @@ +springbootparent.artifactId=spring-boot-starter-parent +springbootparent.groupId=org.springframework.boot +springbootparent.version=3.1.0 +springboot.project.artifactId=spring-boot-31-starter-parent +spring.version=6.0.9 +springboot.httpcomponents.core.version=4.5.16 +springboot.httpcomponents.client.version=4.5.14 +springboot.jackson.version=2.15.0 +springboot.logback.version=1.4.7 +springboot.slf4j.version=2.19.0 +springboot.antlr.version=4.12.0 diff --git a/springboot/springboot31/pom.xml b/springboot/springboot31/pom.xml new file mode 100644 index 00000000..fe96d8d0 --- /dev/null +++ b/springboot/springboot31/pom.xml @@ -0,0 +1,1016 @@ + + + 4.0.0 + + + + org.springframework.boot + spring-boot-starter-parent + 3.1.0 + + + + org.onap.ccsdk.parent + spring-boot-31-starter-parent + 2.6.1-SNAPSHOT + pom + + ONAP :: ${project.groupId} :: ${project.artifactId} + Root POM to be used in place of spring-boot parent for CCSDK based projects + http://wiki.onap.org + + ONAP + + + + JIRA + https://jira.onap.org/ + + + + + ecomp-releases + ${onap.nexus.release-url} + + + ecomp-snapshots + ${onap.nexus.snapshot-url} + + + + + + 3.7.0.1746 + 3.2 + jacoco + + ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml,${project.reporting.outputDirectory}/jacoco-it/jacoco.xml + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + + + 0.8.8 + + + UTF-8 + UTF-8 + + /content/sites/site/${project.groupId}/${project.artifactId}/${project.version} + + + ${basedir}/src/main/resources/swagger.properties + + ${basedir}/src/main/resources/swagger.json + + + + https://nexus.onap.org + nexus.onap.org + 443 + https + https://nexus.onap.org/content/groups/public + https://nexus.onap.org/content/groups/staging + https://nexus.onap.org/content/repositories/releases + https://nexus.onap.org/content/repositories/snapshots + ecomp-staging + 176c31dfe190a + + 17 + 3.10.0 + 1.8 + features.xml + src/main/yang-gen-config + src/main/yang-gen-sal + true + + + 1.6.9 + + + (1.5.99999,1.6.99999-SNAPSHOT] + (1.5.99999, 1.6.99999-SNAPSHOT] + (1.5.99999, 1.6.99999-SNAPSHOT] + (1.6.99999, 1.7.99999-SNAPSHOT] + ${ccsdk.sli.version} + ${ccsdk.sli.version} + ${ccsdk.sli.version} + ${ccsdk.sli.version} + + + 3.1.0 + 6.0.9 + + + 1.11 + 1.5.32 + 1.5.32 + 1.5.2 + 1.5.0 + 0.5.0 + 2.6.6 + 2.2.3 + 1.9.3 + + + 4.12.0 + 4.12.0 + + + direct-dependencies.txt + + + + + + + org.onap.ccsdk.parent + dependencies-bom + 2.6.1-SNAPSHOT + pom + import + + + com.fasterxml.jackson + jackson-bom + 2.15.0 + pom + import + + + org.onap.ccsdk.sli.core + sli-common + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.core + sli-provider + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.core + ccsdk-sli + ${ccsdk.sli.core.version} + xml + features + + + org.onap.ccsdk.sli.core + dblib-provider + ${ccsdk.sli.core.version} + + + org.onap.ccsdk.sli.adaptors + aai-service-provider + ${ccsdk.sli.adaptors.version} + + + org.onap.logging-analytics + logging-slf4j + ${logging-analytics.version} + + + org.onap.logging-analytics + logging-filter-base + ${logging-analytics.version} + + + org.liquibase + liquibase-core + 4.4.2-nordix + + + + + + + onap-public + ${onap.nexus.public-url} + + true + never + + + true + always + + + + onap-staging + ${onap.nexus.staging-url} + + true + never + + + true + always + + + + ecomp-release + onap-repository-releases + ${onap.nexus.release-url} + + true + never + + + false + + + + ecomp-snapshot + onap-repository-snapshots + ${onap.nexus.snapshot-url} + + false + + + true + + + + + + + onap-public + ${onap.nexus.public-url} + + true + + + true + + + + onap-staging + ${onap.nexus.staging-url} + + true + + + true + + + + onap-snapshot + ${onap.nexus.snapshot-url} + + false + + + true + + + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + 2.8 + + + true + + + + org.apache.maven.plugins + maven-site-plugin + 3.6 + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.10 + + + org.apache.maven.doxia + doxia-core + 1.7 + + + org.apache.maven.doxia + doxia-sink-api + 1.7 + + + org.apache.maven.doxia + doxia-logging-api + 1.7 + + + + + attach-descriptor + + attach-descriptor + + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + 2.17 + + + org.onap.oparent + checkstyle + 1.1.1 + + + + + check-license + + check + + process-sources + + onap-checkstyle/check-license.xml + onap-checkstyle/apache-license-2.regexp.txt + false + true + false + ${project.build.sourceDirectory} + + + false + true + + + + check-style + + check + + process-sources + + + onap-checkstyle/onap-java-style.xml + + ${project.build.sourceDirectory}/src/main/java + true + true + true + + + false + true + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${surefireArgLine} + + + **/IT*.java + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + integration-tests + + integration-test + verify + + + + ${failsafeArgLine} + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compile.plugin.version} + + ${java.version} + + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.7.0.1746 + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + false + + + + aggregate + + aggregate + + site + + + + + com.github.ferstl + depgraph-maven-plugin + 3.3.0 + + text + ${dependency-list.file} + ${project.basedir} + * + true + true + + + + + + + + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + pre-unit-test + + prepare-agent + + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + surefireArgLine + + + + + post-unit-test + test + + report + + + + ${project.build.directory}/code-coverage/jacoco-ut.exec + + ${project.reporting.outputDirectory}/jacoco-ut + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + + ${project.build.directory}/code-coverage/jacoco-it.exec + + failsafeArgLine + + + + + post-integration-test + post-integration-test + + report + + + + ${project.build.directory}/code-coverage/jacoco-it.exec + + ${project.reporting.outputDirectory}/jacoco-it + + + + default-prepare-agent + + prepare-agent + + + + default-report + prepare-package + + report + + + + default-check + + check + + + + + PACKAGE + + + COMPLEXITY + COVEREDRATIO + 0.0 + + + + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + org.codehaus.mojo + build-helper-maven-plugin + 1.12 + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-failsafe-plugin + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + + set-system-properties + + + + + maven.wagon.http.ssl.allowall + ${ssl.allowall} + + + maven.wagon.http.ssl.insecure + ${ssl.insecure} + + + + + + + + org.codehaus.mojo + versions-maven-plugin + 2.5 + + true + + + + maven-scm-plugin + 1.8.1 + + ${project.artifactId}-${project.version} + + + + pl.project13.maven + git-commit-id-plugin + 4.0.0 + + full + + ^git.build.(time|version)$ + ^git.commit.id.(abbrev|full)$ + + + + + + + + + + maven-javadoc-plugin + 2.10.4 + + false + org.umlgraph.doclet.UmlGraphDoc + + org.umlgraph + umlgraph + 5.6 + + -views + true + org.opendaylight.* + + + + + javadoc-no-fork + test-javadoc-no-fork + + + + aggregate + + aggregate + test-aggregate + + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.3 + + + aggregate + + aggregate + test-aggregate + + + + + + maven-surefire-plugin + 2.17 + + + org.apache.maven.plugins + maven-changelog-plugin + 2.3 + + + dual-report + + range + 30 + + + changelog + file-activity + + + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + + + + + generate-json + + + ${swagger-properties} + + + swagger-sdk.generate-json + + + + + + org.codehaus.mojo + properties-maven-plugin + 1.0.0 + + + initialize + + read-project-properties + + + + ${basedir}/src/main/resources/swagger.properties + + + + + + + com.github.kongchen + swagger-maven-plugin + 3.1.4 + + + + ${api-rest-package} + http,https + ${api-host-ip}:${api-host-port} + ${api-base-path} + + ${api-title} + ${api-version} + ${api-description} + + ${api-license} + + + ${basedir}/src/main/resources + + + + + + compile + + generate + + + + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + install-file-id + install + + install-file + + + ${basedir}/src/main/resources/swagger.json + ${project.groupId} + ${project.artifactId}-swagger-schema + ${project.version} + json + + + + + + + + + generate-sdk + + + ${swagger-json} + + + swagger-sdk.generate-java-sdk + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + initialize + ant-create-script + + true + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + + + ant-contrib + ant-contrib + 1.0b3 + + + ant + ant + + + + + + + io.swagger + swagger-codegen-maven-plugin + 2.2.1 + + + + generate + + + ${basedir}/src/main/resources/swagger.json + ${project.build.directory}/generated-sources + java + + joda + + jersey2 + ${project.groupId} + ${project.artifactId}-java-sdk + ${project.version} + ${project.groupId}.${project.artifactId}.client.model + ${project.groupId}.${project.artifactId}.client.api + ${project.groupId}.${project.artifactId}.client.invoker + + + + + + org.codehaus.mojo + exec-maven-plugin + 3.1.0 + + + swagger-generate-sources + generate-sources + + exec + + + ${project.build.directory}${file.separator}${swagger.sdk.script.file} + + + + + + org.apache.maven.plugins + maven-clean-plugin + 3.0.0 + + + clean-generated-files + generate-sources + + clean + + + + + ${project.build.directory}/generated-sources + + + + + + + + + + + org.onap.msb.swagger-sdk + swagger-sdk + 1.0.0 + + + + + + q + + true + true + true + + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + true + + + + sonar-jacoco-aggregate + + + onap.jacoco.aggregateFile + + + + + + org.jacoco + jacoco-maven-plugin + + + merge + + merge + + generate-resources + + ${onap.jacoco.aggregateFile} + + + ${project.basedir} + + **/target/code-coverage/*.exec + + + + + + + + + + + + +