Enable prometheus metrics by default

Issue-ID: DCAEGEN2-2683
Signed-off-by: Edyta Krukowska <edyta.krukowska@nokia.com>
Change-Id: Ie8259fb5ac42fe012e19950fed3973a4f6b716cf

diff --git a/Changelog.md b/Changelog.md
index 563a860..c95ba90 100644 (file)
--- 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 044fcbe..4f95c7c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   </parent>\r
   <groupId>org.onap.dcaegen2.collectors.ves</groupId>\r
   <artifactId>VESCollector</artifactId>\r
-  <version>1.9.0-SNAPSHOT</version>\r
+  <version>1.9.1-SNAPSHOT</version>\r
   <name>dcaegen2-collectors-ves</name>\r
   <description>VESCollector</description>\r
   <properties>\r
@@ -219,30 +219,6 @@
     </plugins>\r
   </build>\r
   <profiles>\r
-    <profile>\r
-      <id>buildForPerfTests</id>\r
-      <activation>\r
-        <activeByDefault>false</activeByDefault>\r
-      </activation>\r
-      <dependencies>\r
-        <!-- Libraries related with performance tests-->\r
-        <dependency>\r
-          <groupId>org.springframework.boot</groupId>\r
-          <artifactId>spring-boot-starter-actuator</artifactId>\r
-          <version>${spring.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-          <groupId>io.micrometer</groupId>\r
-          <artifactId>micrometer-registry-prometheus</artifactId>\r
-          <version>${micrometer.version}</version>\r
-        </dependency>\r
-        <dependency>\r
-          <groupId>io.micrometer</groupId>\r
-          <artifactId>micrometer-core</artifactId>\r
-          <version>${micrometer.version}</version>\r
-        </dependency>\r
-      </dependencies>\r
-    </profile>\r
     <profile>\r
       <id>with-system-proxy</id>\r
       <build>\r
@@ -302,6 +278,22 @@
     </dependencies>\r
   </dependencyManagement>\r
   <dependencies>\r
+    <!-- Libraries related with performance tests-->\r
+    <dependency>\r
+      <groupId>org.springframework.boot</groupId>\r
+      <artifactId>spring-boot-starter-actuator</artifactId>\r
+      <version>${spring.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>io.micrometer</groupId>\r
+      <artifactId>micrometer-registry-prometheus</artifactId>\r
+      <version>${micrometer.version}</version>\r
+    </dependency>\r
+    <dependency>\r
+      <groupId>io.micrometer</groupId>\r
+      <artifactId>micrometer-core</artifactId>\r
+      <version>${micrometer.version}</version>\r
+    </dependency>\r
     <!-- JSON RELATED -->\r
     <dependency>\r
       <groupId>com.googlecode.json-simple</groupId>\r

diff --git a/version.properties b/version.properties
index a1653f6..e31b2de 100644 (file)
--- 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