JJB alignment across DCAE components - DCAE mapper

Issue-ID: DCAEGEN2-1578
Signed-off-by: Gerard Hickey <gerard.hickey@ericsson.com>
Change-Id: I8bb85efd52f6207db4cd262a1f94bf1aeb0324a9

diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index 8ef49c7..335bc13 100644 (file)
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!-- \r
+<!--\r
 * ============LICENSE_START=======================================================\r
 * ONAP : DCAEGEN2\r
 * ================================================================================\r
@@ -25,13 +25,13 @@
 \r
        <groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>\r
        <artifactId>UniversalVesAdapter</artifactId>\r
-       <version>1.0.0-SNAPSHOT</version>\r
+       <version>1.0.1-SNAPSHOT</version>\r
 \r
 \r
        <parent>\r
                <groupId>org.onap.dcaegen2.services.mapper</groupId>\r
                <artifactId>mapper</artifactId>\r
-               <version>1.0.0-SNAPSHOT</version>\r
+               <version>1.0.1-SNAPSHOT</version>\r
        </parent>\r
 \r
        <properties>\r
@@ -248,7 +248,7 @@
                        <version>${httpclient.version}</version>\r
                        <scope>compile</scope>\r
                </dependency>\r
-               <!-- <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-dmaap</artifactId> \r
+               <!-- <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-dmaap</artifactId>\r
                        <version>1.2.0</version> </dependency> -->\r
                <dependency>\r
                        <groupId>org.springframework.boot</groupId>\r
@@ -281,9 +281,9 @@
                                        <forkCount>1</forkCount>\r
                                </configuration>\r
                        </plugin> -->\r
-                       \r
-                       \r
-                       \r
+\r
+\r
+\r
                        <plugin>\r
                                <artifactId>maven-assembly-plugin</artifactId>\r
                                <configuration>\r
@@ -422,9 +422,9 @@
                                                        </sources>\r
                                                </configuration>\r
                                        </execution>\r
-                                       <!-- <execution> <id>regex-property</id> <goals> <goal>regex-property</goal> \r
-                                               </goals> <configuration> <name>docker.version</name> <value>${project.version}</value> \r
-                                               <regex>(^[0-9]+.[0-9]+.[0-9]+$)</regex> <replacement>$1-STAGING</replacement> \r
+                                       <!-- <execution> <id>regex-property</id> <goals> <goal>regex-property</goal>\r
+                                               </goals> <configuration> <name>docker.version</name> <value>${project.version}</value>\r
+                                               <regex>(^[0-9]+.[0-9]+.[0-9]+$)</regex> <replacement>$1-STAGING</replacement>\r
                                                <failIfNoMatch>false</failIfNoMatch> </configuration> </execution> -->\r
                                </executions>\r
                        </plugin>\r

diff --git a/pom.xml b/pom.xml
index e3fbdbd..3a856bd 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!-- \r
+<!--\r
 * ============LICENSE_START=======================================================\r
 * ONAP : DCAEGEN2/services/mapper\r
 * ================================================================================\r
@@ -24,13 +24,13 @@
     <parent>\r
       <groupId>org.onap.oparent</groupId>\r
       <artifactId>oparent</artifactId>\r
-      <version>1.2.0</version>\r
+      <version>2.0.0</version>\r
       <relativePath/>\r
     </parent>\r
 \r
     <groupId>org.onap.dcaegen2.services.mapper</groupId>\r
     <artifactId>mapper</artifactId>\r
-    <version>1.0.0-SNAPSHOT</version>\r
+    <version>1.0.1-SNAPSHOT</version>\r
     <packaging>pom</packaging>\r
 \r
     <name>dcaegen2-services-mapper</name>\r
@@ -105,7 +105,7 @@
         <!-- <compiler.source.version>1.7</compiler.source.version>\r
         <compiler.target.version>1.7</compiler.target.version> -->\r
          <compiler.source.version>1.8</compiler.source.version>\r
-        <compiler.target.version>1.8</compiler.target.version> \r
+        <compiler.target.version>1.8</compiler.target.version>\r
         <unit.test.pattern>**/*Test.java</unit.test.pattern>\r
         <skip.unit.tests>false</skip.unit.tests>\r
         <integration.test.pattern>**/*IT.java</integration.test.pattern>\r
@@ -114,7 +114,7 @@
         <findbugs.failOnError>true</findbugs.failOnError>\r
         <checkstyle.failOnViolation>true</checkstyle.failOnViolation>\r
         <checkstyle.file.name>checkstyle.xml</checkstyle.file.name>\r
-        <checkstyle.suppression.file.name>suppressions.xml</checkstyle.suppression.file.name>       \r
+        <checkstyle.suppression.file.name>suppressions.xml</checkstyle.suppression.file.name>\r
         <dependency.locations.enabled>false</dependency.locations.enabled>\r
         <nexusproxy>https://nexus.onap.org</nexusproxy>\r
         <snapshots.path>content/repositories/snapshots/</snapshots.path>\r
@@ -683,7 +683,7 @@
                 </plugins>\r
             </build>\r
         </profile>\r
-    </profiles>  \r
+    </profiles>\r
 \r
     <modules>\r
       <!--  <module>snmpmapper</module> -->\r

diff --git a/version.properties b/version.properties
index 1b04310..3903250 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1\r
 minor=0\r
-patch=0\r
+patch=1\r
 base_version=${major}.${minor}.${patch}\r
 release_version=${base_version}\r
 snapshot_version=${base_version}-SNAPSHOT\r