diff options
| -rw-r--r-- | .github/workflows/gerrit-verify.yaml | 101 | ||||
| -rw-r--r-- | app/build.gradle | 58 | ||||
| -rw-r--r-- | openapi/build.gradle | 6 | ||||
| -rw-r--r-- | releases/0.1.0-container-release.yaml | 7 | ||||
| -rw-r--r-- | version | 1 | ||||
| -rw-r--r-- | version.properties | 13 |
6 files changed, 160 insertions, 26 deletions
diff --git a/.github/workflows/gerrit-verify.yaml b/.github/workflows/gerrit-verify.yaml new file mode 100644 index 0000000..6819434 --- /dev/null +++ b/.github/workflows/gerrit-verify.yaml @@ -0,0 +1,101 @@ +--- +name: Gerrit Composed Gradle Verify CLM +# 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: composed-gradle-verify-clm${{ 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@7c30179c3c9389545fccb0d458df59879372ae6a # v0.6 + 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 + gradle-verify-clm: + needs: prepare + # yamllint disable-line rule:line-length + uses: lfit/releng-reusable-workflows/.github/workflows/composed-gradle-nexus-iq.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 }} + secrets: + NEXUS_IQ_PASSWORD: ${{ secrets.NEXUS_IQ_PASSWORD }} + vote: + if: ${{ always() }} + # yamllint enable rule:line-length + needs: [prepare, gradle-verify-clm] + 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@7c30179c3c9389545fccb0d458df59879372ae6a # v0.6 + 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
\ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index d8aff4d..6b88c6a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,38 +8,47 @@ plugins { id 'com.gorylenko.gradle-git-properties' } +def appVersion = getAppVersion() group = 'org.onap' -version = '0.1.1' +version = appVersion sourceCompatibility = '17' targetCompatibility = '17' +springBoot { + buildInfo { + properties { + artifact = "onap-portal-ng-preferences" + version = appVersion + group = "org.onap.portalng" + name = "Portal-ng user preferences service" + } + } +} + application { - mainClass = 'org.onap.portalng.preferences.PreferencesApplication' + mainClass = 'org.onap.portalng.preferences.PreferencesApplication' } configurations { compileOnly { extendsFrom annotationProcessor } - - // avoid "LoggerFactory is not a Logback LoggerContext but Logback is on the classpath" error - all*.exclude module : 'logback-classic' } repositories { mavenCentral() maven { - url "https://plugins.gradle.org/m2/" + url "https://plugins.gradle.org/m2/" } } ext { - problemVersion = '0.27.1' - logstashLogbackVersion = '7.2' - embedMongoVersion = '4.7.0' - embedMongoIntegrationVersion = '4.7.0' - springCloudWiremockVersion = '4.0.3' - micrometerVersion = '1.0.0' + problemVersion = '0.27.1' + logstashLogbackVersion = '7.2' + embedMongoVersion = '4.7.0' + embedMongoIntegrationVersion = '4.7.0' + springCloudWiremockVersion = '4.0.3' + micrometerVersion = '1.0.0' } dependencies { @@ -90,16 +99,21 @@ configurations.implementation.setCanBeResolved(true) // avoid generating X.X.X-plain.jar jar { - enabled = false + enabled = false } -springBoot { - buildInfo { - properties { - artifact = "onap-portal-ng-preferences" - version = rootProject.file('version').text.trim() - group = "org.onap.portalng" - name = "Portal-ng user preferences service" - } - } +def String getAppVersion() { + Properties versionProperties = getVersionProperties() + String major = versionProperties.getProperty('major') + String minor = versionProperties.getProperty('minor') + String patch = versionProperties.getProperty('patch') + return major + '.' + minor + '.' + patch } + +def Properties getVersionProperties() { + def versionProperties = new Properties() + rootProject.file('version.properties').withInputStream { + versionProperties.load(it) + } + return versionProperties +}
\ No newline at end of file diff --git a/openapi/build.gradle b/openapi/build.gradle index fc5e1dc..61358ee 100644 --- a/openapi/build.gradle +++ b/openapi/build.gradle @@ -9,9 +9,9 @@ repositories { } dependencies { - implementation 'org.openapitools:openapi-generator:7.0.0-beta' - implementation 'org.springframework.boot:spring-boot-starter-webflux:3.1.2' - implementation 'jakarta.validation:jakarta.validation-api:3.0.2' + compileOnly 'org.openapitools:openapi-generator:7.0.0-beta' + compileOnly 'org.springframework.boot:spring-boot-starter-webflux:3.1.2' + compileOnly 'jakarta.validation:jakarta.validation-api:3.0.2' constraints { implementation('io.swagger.core.v3:swagger-annotations:2.2.5') { diff --git a/releases/0.1.0-container-release.yaml b/releases/0.1.0-container-release.yaml new file mode 100644 index 0000000..51f3d22 --- /dev/null +++ b/releases/0.1.0-container-release.yaml @@ -0,0 +1,7 @@ +distribution_type: container +container_release_tag: 0.1.0 +project: portal-ng/preferences +ref: 852ef73cc49321605c7fbd7f31a7dc2bf416da4a +containers: + - name: portal-ng/preferences + version: latest diff --git a/version b/version deleted file mode 100644 index 17e51c3..0000000 --- a/version +++ /dev/null @@ -1 +0,0 @@ -0.1.1 diff --git a/version.properties b/version.properties new file mode 100644 index 0000000..47d1d40 --- /dev/null +++ b/version.properties @@ -0,0 +1,13 @@ +# Versioning variables +# Note that these variables cannot be structured (e.g. : version.release or version.snapshot etc... ) +# because they are used in Jenkins, whose plug-in doesn't support + +major=0 +minor=1 +patch=0 + +base_version=${major}.${minor}.${patch} + +# Release must be completed with git revision # in Jenkins +release_version=${base_version} +snapshot_version=${base_version}-SNAPSHOT
\ No newline at end of file |