JJB alignment across DCAE components - DCAE-SON Handler

Issue-ID: DCAEGEN2-1578

Signed-off-by: Gerard Hickey <gerard.hickey@ericsson.com>
Change-Id: I2eba62ce21b28402c91b134ad9c714d8ea827cd1

2 files changed, 40 insertions, 77 deletions

diff --git a/pom.xml b/pom.xml
index d53738c..602bece 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
+<!--
 /*******************************************************************************
  *  ============LICENSE_START=======================================================
  *  son-handler
@@ -9,16 +9,16 @@
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
  *     You may obtain a copy of the License at
- *  
+ *
  *          http://www.apache.org/licenses/LICENSE-2.0
- *  
+ *
  *     Unless required by applicable law or agreed to in writing, software
  *     distributed under the License is distributed on an "AS IS" BASIS,
  *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  *     ============LICENSE_END=========================================================
- *  
+ *
  *******************************************************************************/
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,15 +27,15 @@
 	<groupId>org.onap.dcaegen2.services.son-handler</groupId>
 	<artifactId>son-handler</artifactId>
 	<name>dcaegen2-services-son-handler</name>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.1.1-SNAPSHOT</version>
 
-	<!--parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId> 
+	<!--parent> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-parent</artifactId>
 		<version>2.0.4.RELEASE</version> </parent -->
 
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.2.1</version>
+		<version>2.0.0</version>
 		<relativePath />
 	</parent>
 
@@ -139,7 +139,7 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<version>2.0.4.RELEASE</version>
 			<scope>test</scope>
-			<!-- exclusions> <exclusion> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> 
+			<!-- exclusions> <exclusion> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId>
 				</exclusion> </exclusions -->
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
@@ -185,49 +185,12 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>onap-java-style</id>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<phase>process-sources</phase>
-						<configuration>
-							<!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
-								with minor changes -->
-							<configLocation>onap-checkstyle/onap-java-style.xml</configLocation>
-							<!-- <sourceDirectory> is needed so that checkstyle ignores the generated 
-								sources directory -->
-							<sourceDirectories>
-								<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
-							</sourceDirectories>
-							<includeResources>true</includeResources>
-							<includeTestSourceDirectory>false</includeTestSourceDirectory>
-							<includeTestResources>false</includeTestResources>
-							<excludes>
-							</excludes>
-							<consoleOutput>true</consoleOutput>
-							<failsOnViolation>false</failsOnViolation>
-							<violationSeverity>warning</violationSeverity>
-						</configuration>
-					</execution>
-				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.onap.oparent</groupId>
-						<artifactId>checkstyle</artifactId>
-						<version>1.2.3</version>
-						<scope>compile</scope>
-					</dependency>
-				</dependencies>
-			</plugin>
-			<!--plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId> 
-				<configuration> <lifecycleMappingMetadata> <pluginExecutions> <pluginExecution> 
-				<pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> 
-				<versionRange>2.17,)</versionRange> <goals> <goal>check</goal> </goals> </pluginExecutionFilter> 
-				<action> <ignore /> </action> </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata> 
+
+			<!--plugin> <groupId>org.eclipse.m2e</groupId> <artifactId>lifecycle-mapping</artifactId>
+				<configuration> <lifecycleMappingMetadata> <pluginExecutions> <pluginExecution>
+				<pluginExecutionFilter> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId>
+				<versionRange>2.17,)</versionRange> <goals> <goal>check</goal> </goals> </pluginExecutionFilter>
+				<action> <ignore /> </action> </pluginExecution> </pluginExecutions> </lifecycleMappingMetadata>
 				</configuration> </plugin -->
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
diff --git a/version.properties b/version.properties
index cbed160..15ef9d6 100644
--- a/version.properties
+++ b/version.properties
@@ -1,26 +1,26 @@
-###############################################################################

-#  ============LICENSE_START=======================================================

-#  son-handler

-#  ================================================================================

-#   Copyright (C) 2019 Wipro Limited.

-#   ==============================================================================

-#     Licensed under the Apache License, Version 2.0 (the "License");

-#     you may not use this file except in compliance with the License.

-#     You may obtain a copy of the License at

-#  

-#          http://www.apache.org/licenses/LICENSE-2.0

-#  

-#     Unless required by applicable law or agreed to in writing, software

-#     distributed under the License is distributed on an "AS IS" BASIS,

-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-#     See the License for the specific language governing permissions and

-#     limitations under the License.

-#     ============LICENSE_END=========================================================

-#  

-###############################################################################

-major=1

-minor=1

-patch=0

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

-release_version=${base_version}

-snapshot_version=${base_version}-SNAPSHOT

+###############################################################################
+#  ============LICENSE_START=======================================================
+#  son-handler
+#  ================================================================================
+#   Copyright (C) 2019 Wipro Limited.
+#   ==============================================================================
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#          http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.
+#     ============LICENSE_END=========================================================
+#
+###############################################################################
+major=1
+minor=1
+patch=1
+base_version=${major}.${minor}.${patch}
+release_version=${base_version}
+snapshot_version=${base_version}-SNAPSHOT