From 248f7071137dbb16e9362a06a86f744d19486052 Mon Sep 17 00:00:00 2001
From: Edyta Krukowska <edyta.krukowska@nokia.com>
Date: Mon, 22 Mar 2021 13:01:38 +0100
Subject: Enable prometheus metrics by default

Issue-ID: DCAEGEN2-2683
Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
Change-Id: Ie8259fb5ac42fe012e19950fed3973a4f6b716cf
---
 Changelog.md       |  8 +++++---
 pom.xml            | 42 +++++++++++++++++-------------------------
 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
diff --git a/pom.xml b/pom.xml
index 044fcbe1..4f95c7ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -219,30 +219,6 @@
     </plugins>
   </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>
@@ -302,6 +278,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.googlecode.json-simple</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
-- 
cgit 1.2.3-korg