Merge "JJB alignment across DCAE components - DCAE mapper"

3 files changed, 17 insertions, 17 deletions

diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index 8ef49c7..335bc13 100644
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- 

+<!--

 * ============LICENSE_START=======================================================

 * ONAP : DCAEGEN2

 * ================================================================================

@@ -25,13 +25,13 @@
 

 	<groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>

 	<artifactId>UniversalVesAdapter</artifactId>

-	<version>1.0.0-SNAPSHOT</version>

+	<version>1.0.1-SNAPSHOT</version>

 

 

 	<parent>

 		<groupId>org.onap.dcaegen2.services.mapper</groupId>

 		<artifactId>mapper</artifactId>

-		<version>1.0.0-SNAPSHOT</version>

+		<version>1.0.1-SNAPSHOT</version>

 	</parent>

 

 	<properties>

@@ -248,7 +248,7 @@
 			<version>${httpclient.version}</version>

 			<scope>compile</scope>

 		</dependency>

-		<!-- <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-dmaap</artifactId> 

+		<!-- <dependency> <groupId>org.onap.aai.event-client</groupId> <artifactId>event-client-dmaap</artifactId>

 			<version>1.2.0</version> </dependency> -->

 		<dependency>

 			<groupId>org.springframework.boot</groupId>

@@ -281,9 +281,9 @@
 					<forkCount>1</forkCount>

 				</configuration>

 			</plugin> -->

-			

-			

-			

+

+

+

 			<plugin>

 				<artifactId>maven-assembly-plugin</artifactId>

 				<configuration>

@@ -422,9 +422,9 @@
 							</sources>

 						</configuration>

 					</execution>

-					<!-- <execution> <id>regex-property</id> <goals> <goal>regex-property</goal> 

-						</goals> <configuration> <name>docker.version</name> <value>${project.version}</value> 

-						<regex>(^[0-9]+.[0-9]+.[0-9]+$)</regex> <replacement>$1-STAGING</replacement> 

+					<!-- <execution> <id>regex-property</id> <goals> <goal>regex-property</goal>

+						</goals> <configuration> <name>docker.version</name> <value>${project.version}</value>

+						<regex>(^[0-9]+.[0-9]+.[0-9]+$)</regex> <replacement>$1-STAGING</replacement>

 						<failIfNoMatch>false</failIfNoMatch> </configuration> </execution> -->

 				</executions>

 			</plugin>

diff --git a/pom.xml b/pom.xml
index e3fbdbd..3a856bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- 

+<!--

 * ============LICENSE_START=======================================================

 * ONAP : DCAEGEN2/services/mapper

 * ================================================================================

@@ -24,13 +24,13 @@
     <parent>

       <groupId>org.onap.oparent</groupId>

       <artifactId>oparent</artifactId>

-      <version>1.2.0</version>

+      <version>2.0.0</version>

       <relativePath/>

     </parent>

 

     <groupId>org.onap.dcaegen2.services.mapper</groupId>

     <artifactId>mapper</artifactId>

-    <version>1.0.0-SNAPSHOT</version>

+    <version>1.0.1-SNAPSHOT</version>

     <packaging>pom</packaging>

 

     <name>dcaegen2-services-mapper</name>

@@ -105,7 +105,7 @@
         <!-- <compiler.source.version>1.7</compiler.source.version>

         <compiler.target.version>1.7</compiler.target.version> -->

          <compiler.source.version>1.8</compiler.source.version>

-        <compiler.target.version>1.8</compiler.target.version> 

+        <compiler.target.version>1.8</compiler.target.version>

         <unit.test.pattern>**/*Test.java</unit.test.pattern>

         <skip.unit.tests>false</skip.unit.tests>

         <integration.test.pattern>**/*IT.java</integration.test.pattern>

@@ -114,7 +114,7 @@
         <findbugs.failOnError>true</findbugs.failOnError>

         <checkstyle.failOnViolation>true</checkstyle.failOnViolation>

         <checkstyle.file.name>checkstyle.xml</checkstyle.file.name>

-        <checkstyle.suppression.file.name>suppressions.xml</checkstyle.suppression.file.name>       

+        <checkstyle.suppression.file.name>suppressions.xml</checkstyle.suppression.file.name>

         <dependency.locations.enabled>false</dependency.locations.enabled>

         <nexusproxy>https://nexus.onap.org</nexusproxy>

         <snapshots.path>content/repositories/snapshots/</snapshots.path>

@@ -683,7 +683,7 @@
                 </plugins>

             </build>

         </profile>

-    </profiles>  

+    </profiles>

 

     <modules>

       <!--  <module>snmpmapper</module> -->

diff --git a/version.properties b/version.properties
index 1b04310..3903250 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=1

 minor=0

-patch=0

+patch=1

 base_version=${major}.${minor}.${patch}

 release_version=${base_version}

 snapshot_version=${base_version}-SNAPSHOT