Skip to content

Commit

Permalink
Initial preferences release
Browse files Browse the repository at this point in the history
- add version.properties file
- use version defined there in the buildinfo
- resolve logback + slf4j conflict

Issue-ID: PORTALNG-91
Change-Id: Ie30edcbe664a6890243660b9ce5ff95bad1df7d1
Signed-off-by: Fiete Ostkamp <[email protected]>
  • Loading branch information
Fiete Ostkamp authored and Fiete Ostkamp committed May 7, 2024
1 parent 1e3cc21 commit 852ef73
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 26 deletions.
58 changes: 36 additions & 22 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
}
6 changes: 3 additions & 3 deletions openapi/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
1 change: 0 additions & 1 deletion version

This file was deleted.

13 changes: 13 additions & 0 deletions version.properties
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 852ef73

Please sign in to comment.