diff options
| -rw-r--r-- | Changelog.md | 8 | ||||
| -rw-r--r-- | pom.xml | 30 | ||||
| -rw-r--r-- | src/main/resources/application.properties | 4 | ||||
| -rw-r--r-- | version.properties | 4 |
4 files changed, 42 insertions, 4 deletions
diff --git a/Changelog.md b/Changelog.md new file mode 100644 index 00000000..c750f13a --- /dev/null +++ b/Changelog.md @@ -0,0 +1,8 @@ +# Change Log +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/) +and this project adheres to [Semantic Versioning](http://semver.org/). + +## [1.6.0] - 13/05/2020 + - [DCAEGEN2-608](https://jira.onap.org/browse/DCAEGEN2-608) - Expose Prometheus API for performance tests @@ -24,7 +24,7 @@ </parent>
<groupId>org.onap.dcaegen2.collectors.ves</groupId>
<artifactId>VESCollector</artifactId>
- <version>1.5.4-SNAPSHOT</version>
+ <version>1.6.0-SNAPSHOT</version>
<name>dcaegen2-collectors-ves</name>
<description>VESCollector</description>
<properties>
@@ -50,6 +50,8 @@ ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
</sonar.coverage.jacoco.xmlReportPaths>
<crypt-password.version>1.3.5</crypt-password.version>
+ <micrometer.version>1.4.2</micrometer.version>
+ <spring.version>2.2.2.RELEASE</spring.version>
</properties>
<build>
<pluginManagement>
@@ -234,6 +236,30 @@ </build>
<profiles>
<profile>
+ <id>buildForPerfTests</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <dependencies>
+ <!-- Libraries related with performance tests-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-registry-prometheus</artifactId>
+ <version>${micrometer.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.micrometer</groupId>
+ <artifactId>micrometer-core</artifactId>
+ <version>${micrometer.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
<id>with-system-proxy</id>
<build>
<plugins>
@@ -285,7 +311,7 @@ <!-- Import dependency management from Spring Boot -->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
- <version>2.2.2.RELEASE</version>
+ <version>${spring.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..48ba86d4 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,4 @@ +management.endpoint.metrics.enabled=true +management.endpoints.web.exposure.include=metrics, prometheus +management.endpoint.prometheus.enabled=true +management.metrics.export.prometheus.enabled=true diff --git a/version.properties b/version.properties index b53fce2d..eabef1f2 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 -minor=5 -patch=4 +minor=6 +patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |