summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsu622b <su622b@att.com>2019-06-28 00:19:14 -0400
committersunil unnava <su622b@att.com>2019-06-28 05:37:51 +0000
commit4cb4eedab7d2e7f0433ab87a76e6206e585bbcd7 (patch)
tree801828c3308a286834d05aab94cdd737b34b3c02
parenteed25c28743b4aabdf06670f3fb1235c6c180531 (diff)
update oparent
Issue-ID: DMAAP-1225 Change-Id: I67a8a34d61d9a8ece2714b9fd6ed50c12551714b Signed-off-by: su622b <su622b@att.com>
-rw-r--r--pom.xml57
-rw-r--r--version.properties2
2 files changed, 56 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index 2ef8c0c..85b4fe6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
<artifactId>msgrtr</artifactId>
- <version>1.1.17-SNAPSHOT</version>
+ <version>1.1.18-SNAPSHOT</version>
<packaging>jar</packaging>
<name>dmaap-messagerouter-msgrtr</name>
<description>Message Router - Restful interface built for kafka</description>
@@ -22,7 +22,7 @@
<parent>
<groupId>org.onap.oparent</groupId>
<artifactId>oparent</artifactId>
- <version>1.2.1</version>
+ <version>2.0.0</version>
</parent>
<properties>
@@ -484,6 +484,59 @@
<!-- <phase>package</phase> bind to the packaging phase <goals> <goal>single</goal>
</goals> </execution> </executions> </plugin> -->
<!-- -->
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.17</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.onap.oparent</groupId>
+ <artifactId>checkstyle</artifactId>
+ <version>2.0.0</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>onap-license</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>process-sources</phase>
+ <configuration>
+ <configLocation>onap-checkstyle/check-license.xml</configLocation>
+ <includeResources>false</includeResources>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <includeTestResources>false</includeTestResources>
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <excludes>
+ </excludes>
+ <consoleOutput>true</consoleOutput>
+ <failsOnViolation>false</failsOnViolation>
+ </configuration>
+ </execution>
+ <execution>
+ <id>onap-java-style</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ <phase>none</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 -->
+ <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
+ <includeResources>true</includeResources>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <includeTestResources>true</includeTestResources>
+ <excludes>
+ </excludes>
+ <consoleOutput>true</consoleOutput>
+ <failsOnViolation>false</failsOnViolation>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
diff --git a/version.properties b/version.properties
index 8d21b0b..dba8f85 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=1
-patch=17
+patch=18
base_version=${major}.${minor}.${patch}