diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2021-03-25 19:17:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-03-25 19:17:51 +0000 |
| commit | ca44b9fe5569ff40a21fdc66cf841d5cdf2d224d (patch) | |
| tree | d864f9d28a23f35a5ec883f66fba68b303857ec2 | |
| parent | a301ed348b44b1b4ca91d2123c4480952a4777c7 (diff) | |
| parent | 248f7071137dbb16e9362a06a86f744d19486052 (diff) | |
Merge "Enable prometheus metrics by default"1.9.1
| -rw-r--r-- | Changelog.md | 8 | ||||
| -rw-r--r-- | pom.xml | 42 | ||||
| -rw-r--r-- | version.properties | 2 |
3 files changed, 23 insertions, 29 deletions
diff --git a/Changelog.md b/Changelog.md index 563a860d..c95ba903 100644 --- a/Changelog.md +++ b/Changelog.md @@ -46,7 +46,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - [DCAEGEN2-2593](https://jira.onap.org/browse/DCAEGEN2-2593) - Vulnerability removal for ves collector Fix sonar reporting problem ## [1.8.0] - 24/02/2021 - - [DCAEGEN2-2477](https://jira.onap.org/browse/DCAEGEN2-2477) - Update VESCollector CommonEventSchema to ONAP/Honolulu version - Use updated CommonEventSchema to validate IP in VES Collector + - [DCAEGEN2-2477](https://jira.onap.org/browse/DCAEGEN2-2477) - Update VESCollector CommonEventSchema to ONAP/Honolulu version ## [1.9.0] - 18/03/2021 - - [DCAEGEN2-2682](https://jira.onap.org/browse/DCAEGEN2-2682) - Update libraries + - [DCAEGEN2-2682](https://jira.onap.org/browse/DCAEGEN2-2682) - Update libraries +## [1.9.1] - 22/03/2021 + - [DCAEGEN2-2683](https://jira.onap.org/browse/DCAEGEN2-2683) - Enable Spring Prometheus metrics end-point in VES + Remove mvn profile for enable/disable Prometheus metrics @@ -24,7 +24,7 @@ </parent>
<groupId>org.onap.dcaegen2.collectors.ves</groupId>
<artifactId>VESCollector</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>1.9.1-SNAPSHOT</version>
<name>dcaegen2-collectors-ves</name>
<description>VESCollector</description>
<properties>
@@ -208,30 +208,6 @@ </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>
@@ -290,6 +266,22 @@ </dependencies>
</dependencyManagement>
<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>
<!-- JSON RELATED -->
<dependency>
<groupId>com.networknt</groupId>
diff --git a/version.properties b/version.properties index a1653f6b..e31b2def 100644 --- a/version.properties +++ b/version.properties @@ -1,6 +1,6 @@ major=1 minor=9 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} release_version=${base_version} snapshot_version=${base_version}-SNAPSHOT |