Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 10 additions & 17 deletions .devops/code-review-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,38 +43,31 @@ steps:
# retryCount: '2'

# options: '-B -s $(settingsxml.secureFilePath) -Dmaven.test.failure.ignore=true'
- task: Maven@3
- task: Gradle@3
inputs:
mavenPomFile: 'pom.xml'
goals: 'clean org.jacoco:jacoco-maven-plugin:0.8.8:prepare-agent verify org.jacoco:jacoco-maven-plugin:0.8.8:report org.jacoco:jacoco-maven-plugin:0.8.8:report-aggregate '
options: '-B'
gradleWrapperFile: 'gradlew'
tasks: 'clean build jacocoTestReport'
publishJUnitResults: true
testResultsFiles: '**/surefire-reports/TEST-*.xml'
testResultsFiles: '**/TEST-*.xml'
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.17'
mavenVersionOption: 'Default'
mavenAuthenticateFeed: false
effectivePomSkip: false
sonarQubeRunAnalysis: false
- bash: xmlReportPaths=$(find "$(pwd)" -path '*jacoco.xml' | sed 's/.*/&/' | tr '\n' ','); echo "##vso[task.setvariable variable=xmlReportPaths]$xmlReportPaths"
displayName: finding jacoco.xml

# options: '-B -s $(settingsxml.secureFilePath) -Dsonar.coverage.jacoco.xmlReportPaths=$(xmlReportPaths)'

- task: Maven@3
- task: Gradle@3
inputs:
mavenPomFile: 'pom.xml'
goals: 'sonar:sonar'
options: '-B -Dsonar.coverage.jacoco.xmlReportPaths=$(xmlReportPaths)'
gradleWrapperFile: 'gradlew'
tasks: "sonar"
options: '-Dsonar.coverage.jacoco.xmlReportPaths=$(xmlReportPaths) -Dorg.gradle.jvmargs=-Xmx4096M'
publishJUnitResults: false
javaHomeOption: 'JDKVersion'
jdkVersionOption: '1.17'
mavenVersionOption: 'Default'
mavenAuthenticateFeed: false
effectivePomSkip: false
sonarQubeRunAnalysis: true
isJacocoCoverageReportXML: false
sqMavenPluginVersionChoice: 'latest'
sqGradlePluginVersionChoice: 'build'

- task: SonarCloudPublish@1
inputs:
pollingTimeoutSec: '300'
40 changes: 20 additions & 20 deletions .devops/deploy-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

parameters:
- name: 'executeBuild'
displayName: 'Launch maven and docker build'
displayName: 'Launch gradle and docker build'
type: boolean
default: true

Expand All @@ -15,9 +15,10 @@ trigger:
paths:
include:
- src/*
- build.gradle
- helm/*
- pom.xml
- Dockerfile
- settings.gradle

pr: none

Expand Down Expand Up @@ -71,31 +72,37 @@ variables:
postmanEnvFile: idpay_dev.postman_environment.json

stages:
- stage: 'pom_version'
- stage: 'project_version'
displayName: Release
condition: eq(variables.canDeploy, true)
jobs:
- job: POM
displayName: POM
- job: ProjectVersion
displayName: Gradle project version
pool:
vmImage: $(vmImageNameDefault)
steps:
- task: JavaToolInstaller@0
displayName: Install Java
inputs:
versionSpec: '17'
jdkArchitectureOption: 'x64'
jdkSourceOption: 'PreInstalled'
- task: Bash@3
displayName: Get POM version
name: getpomversion
displayName: Get Project version
name: getprojectversion
condition: and(succeeded(), eq(variables.canDeploy, true))
inputs:
targetType: 'inline'
script: |
version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
echo "##vso[task.setvariable variable=outputpomversion;isOutput=true]$version"
version=$(./gradlew properties -q | grep "version:" | awk '{print $2}')
echo "##vso[task.setvariable variable=outputProjectVersion;isOutput=true]$version"
failOnStderr: true

- stage: 'build'
displayName: 'Build_and_Publish_to_${{ variables.environment }}'
dependsOn: 'pom_version'
dependsOn: 'project_version'
variables:
pomversion: $[ stageDependencies.Release.POM.outputs['getpomversion.outputpomversion'] ]
projectVersion: $[ stageDependencies.project_version.ProjectVersion.outputs['getprojectversion.outputProjectVersion'] ]
jobs:
- job: Build
displayName: Build
Expand All @@ -112,14 +119,7 @@ stages:
tags: |
$(Build.BuildId)
latest
$(pomversion)
# - task: PublishPipelineArtifact@1
# displayName: 'Publish Artifact manifests'
# condition: and(succeeded(), eq(variables.canDeploy, true))
# inputs:
# targetPath: '$(Build.Repository.LocalPath)/manifests'
# artifact: 'manifests'
# publishLocation: 'pipeline'
$(projectVersion)

- stage: 'publish_artifact_helm'
displayName: 'Publish_artifact_Helm'
Expand All @@ -143,7 +143,7 @@ stages:
dependsOn: ['publish_artifact_helm']
condition: and(succeeded(), eq(variables.canDeploy, true))
variables:
pomversion: $[ stageDependencies.Release.POM.outputs['getpomversion.outputpomversion'] ]
projectVersion: $[ stageDependencies.project_version.ProjectVersion.outputs['getprojectversion.outputProjectVersion'] ]
jobs:
- deployment: 'Deploy_to_${{ variables.environment }}'
displayName: 'Deploy to ${{ variables.environment }} K8S'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
.gradle

### STS ###
.apt_generated
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
#
# Build
#
FROM maven:3.9.1-eclipse-temurin as buildtime
FROM eclipse-temurin:17-jdk-alpine as buildtime

WORKDIR /build
COPY . .

RUN mvn clean package -DskipTests
RUN ./gradlew bootJar

#
# Docker RUNTIME
#
FROM eclipse-temurin:17-jre-alpine as runtime

VOLUME /tmp
WORKDIR /app

COPY --from=buildtime /build/target/*.jar /app/app.jar
COPY --from=buildtime /build/build/libs/*.jar /app/app.jar
# The agent is enabled at runtime via JAVA_TOOL_OPTIONS.
ADD https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.4.11/applicationinsights-agent-3.4.11.jar /app/applicationinsights-agent.jar

Expand Down
101 changes: 101 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.0.5'
id 'io.spring.dependency-management' version '1.1.0'
id 'jacoco'
id 'org.sonarqube' version "3.5.0.2730"
id "com.gorylenko.gradle-git-properties" version "2.4.1"
}

group = 'it.gov.pagopa.payment'
version = '1.0.0-SNAPSHOT'
description = 'idpay-payment'
java.sourceCompatibility = '17'

repositories {
mavenCentral()
}

configurations {
compileOnly {
extendsFrom annotationProcessor
}
}

gitProperties {
keys = [
'git.branch',
'git.build.version',
'git.closest.tag.commit.count',
'git.closest.tag.name',
'git.commit.id',
'git.commit.id.abbrev',
'git.commit.id.describe',
'git.commit.message.full',
'git.commit.message.short',
'git.commit.time',
'git.dirty',
'git.remote.origin.url',
'git.tags',
'git.total.commit.count'
]
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
implementation 'org.springframework.boot:spring-boot-starter-actuator'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.cloud:spring-cloud-starter-stream-kafka'
implementation 'org.springframework.cloud:spring-cloud-starter-openfeign'

implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0'
implementation 'io.github.openfeign:feign-okhttp'
implementation 'org.codehaus.janino:janino'
implementation 'org.apache.commons:commons-lang3'
implementation 'commons-fileupload:commons-fileupload:1.5'
implementation 'org.yaml:snakeyaml:2.0'

testImplementation 'org.springframework.cloud:spring-cloud-stream-test-support'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.junit.jupiter:junit-jupiter-api'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
testImplementation 'org.mockito:mockito-core'
testImplementation 'junit:junit'
testImplementation('com.github.javafaker:javafaker:1.0.2') { exclude group: 'org.yaml', module: 'snakeyaml' }
testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo.spring30x:4.6.2'
testImplementation 'org.awaitility:awaitility'
testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'

compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok'

testCompileOnly 'org.projectlombok:lombok'
testAnnotationProcessor 'org.projectlombok:lombok'
}

jacocoTestReport {
dependsOn test
reports {
xml.enabled true
xml.destination file("${buildDir}/reports/jacoco.xml")
}
}

test {
useJUnitPlatform {
excludeTags 'testIntegrated'
}
finalizedBy jacocoTestReport
}

ext {
set('springCloudVersion', "2022.0.2")
}

dependencyManagement {
imports {
mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
}
}
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading