From: Ram Krishna Verma <ram_krishna.verma@bell.ca>
Date: Thu, 28 May 2020 20:13:44 +0000 (+0000)
Subject: Merge "Point to parent SNAPSHOT"
X-Git-Tag: 2.3.0~27
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8dd5c8fc0dc7a097f1a129d57920a73366b75790;hp=-c;p=policy%2Fmodels.git

Merge "Point to parent SNAPSHOT"
---

8dd5c8fc0dc7a097f1a129d57920a73366b75790
diff --combined pom.xml
index 1b2df2f88,a0381e7b9..767dc2d58
--- a/pom.xml
+++ b/pom.xml
@@@ -27,13 -27,13 +27,13 @@@
      <parent>
          <groupId>org.onap.policy.parent</groupId>
          <artifactId>integration</artifactId>
-         <version>3.1.3</version>
+         <version>3.2.0-SNAPSHOT</version>
          <relativePath />
      </parent>
  
      <groupId>org.onap.policy.models</groupId>
      <artifactId>policy-models</artifactId>
 -    <version>2.2.7-SNAPSHOT</version>
 +    <version>2.3.0-SNAPSHOT</version>
  
      <packaging>pom</packaging>
      <name>policy-models</name>
@@@ -42,7 -42,7 +42,7 @@@
      <properties>
          <derby.version>10.13.1.1</derby.version>
          <javax.ws.rs-api.version>2.1.1</javax.ws.rs-api.version>
 -        <policy.common.version>1.6.5</policy.common.version>
 +        <policy.common.version>1.7.0-SNAPSHOT</policy.common.version>
      </properties>
  
      <modules>
@@@ -221,7 -221,7 +221,7 @@@
                          </goals>
                          <phase>process-sources</phase>
                          <configuration>
 -                            <!-- Use Google Java Style Guide: https://github.com/checkstyle/checkstyle/blob/master/src/main/resources/google_checks.xml 
 +                            <!-- 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 -->