Merge "Fix Sonar Issues on policy-models-tosca"

diff --git a/models-base/pom.xml b/models-base/pom.xml
index 0dd8aec..35df120 100644 (file)
--- a/models-base/pom.xml
+++ b/models-base/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-base</artifactId>

diff --git a/models-dao/pom.xml b/models-dao/pom.xml
index 1c26afb..4b62aa8 100644 (file)
--- a/models-dao/pom.xml
+++ b/models-dao/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-dao</artifactId>

diff --git a/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java b/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java
index ef86c17..bdbc04e 100644 (file)
--- a/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java
+++ b/models-dao/src/main/java/org/onap/policy/models/dao/impl/DefaultPfDao.java
@@ -367,7 +367,7 @@ public class DefaultPfDao implements PfDao {
 
         try {
             if (filterMap != null) {
-                filterQueryString = buildFilter(filterMap, filterQueryString);
+                filterQueryString = buildFilter(filterMap, filterQueryString, isRefTimestampKey(someClass));
             }
             filterQueryString = addKeyFilterString(filterQueryString, name, startTime, endTime,
                 isRefTimestampKey(someClass));
@@ -425,10 +425,15 @@ public class DefaultPfDao implements PfDao {
         }
     }
 
-    private String buildFilter(final Map<String, Object> filterMap, String filterQueryString) {
+    private String buildFilter(final Map<String, Object> filterMap, String filterQueryString,
+                               boolean isRefTimestampKey) {
         StringBuilder bld = new StringBuilder(filterQueryString);
         for (String key : filterMap.keySet()) {
-            bld.append("c." + key + "= :" + key + AND);
+            if (isRefTimestampKey) {
+                bld.append("c.key.referenceKey." + key + "= :" + key + AND);
+            } else {
+                bld.append("c." + key + "= :" + key + AND);
+            }
         }
         return bld.toString();
     }

diff --git a/models-decisions/pom.xml b/models-decisions/pom.xml
index dacf32c..f5c84c7 100644 (file)
--- a/models-decisions/pom.xml
+++ b/models-decisions/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-decisions</artifactId>

diff --git a/models-errors/pom.xml b/models-errors/pom.xml
index 0db1087..13f013a 100644 (file)
--- a/models-errors/pom.xml
+++ b/models-errors/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-errors</artifactId>

diff --git a/models-examples/pom.xml b/models-examples/pom.xml
index 99e4133..71b245a 100644 (file)
--- a/models-examples/pom.xml
+++ b/models-examples/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-examples</artifactId>

diff --git a/models-interactions/model-actors/actor.aai/pom.xml b/models-interactions/model-actors/actor.aai/pom.xml
index 0dbb3b2..2bdb0eb 100644 (file)
--- a/models-interactions/model-actors/actor.aai/pom.xml
+++ b/models-interactions/model-actors/actor.aai/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actor.aai</artifactId>

diff --git a/models-interactions/model-actors/actor.appc/pom.xml b/models-interactions/model-actors/actor.appc/pom.xml
index 3d527a1..8d416dc 100644 (file)
--- a/models-interactions/model-actors/actor.appc/pom.xml
+++ b/models-interactions/model-actors/actor.appc/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actor.appc</artifactId>

diff --git a/models-interactions/model-actors/actor.appclcm/pom.xml b/models-interactions/model-actors/actor.appclcm/pom.xml
index 277f682..251dea9 100644 (file)
--- a/models-interactions/model-actors/actor.appclcm/pom.xml
+++ b/models-interactions/model-actors/actor.appclcm/pom.xml
@@ -24,7 +24,7 @@
   <parent>
    <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
     <artifactId>model-actors</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>actor.appclcm</artifactId>

diff --git a/models-interactions/model-actors/actor.cds/pom.xml b/models-interactions/model-actors/actor.cds/pom.xml
index 63d7dcd..9c9c070 100644 (file)
--- a/models-interactions/model-actors/actor.cds/pom.xml
+++ b/models-interactions/model-actors/actor.cds/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
     <artifactId>actor.cds</artifactId>
     <dependencies>

diff --git a/models-interactions/model-actors/actor.guard/pom.xml b/models-interactions/model-actors/actor.guard/pom.xml
index ac902ef..d848767 100644 (file)
--- a/models-interactions/model-actors/actor.guard/pom.xml
+++ b/models-interactions/model-actors/actor.guard/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actor.guard</artifactId>

diff --git a/models-interactions/model-actors/actor.sdnc/pom.xml b/models-interactions/model-actors/actor.sdnc/pom.xml
index 8f2f474..0027200 100644 (file)
--- a/models-interactions/model-actors/actor.sdnc/pom.xml
+++ b/models-interactions/model-actors/actor.sdnc/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actor.sdnc</artifactId>

diff --git a/models-interactions/model-actors/actor.sdnr/pom.xml b/models-interactions/model-actors/actor.sdnr/pom.xml
index 663662b..9eb7757 100644 (file)
--- a/models-interactions/model-actors/actor.sdnr/pom.xml
+++ b/models-interactions/model-actors/actor.sdnr/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actor.sdnr</artifactId>

diff --git a/models-interactions/model-actors/actor.so/pom.xml b/models-interactions/model-actors/actor.so/pom.xml
index 8f43662..7513801 100644 (file)
--- a/models-interactions/model-actors/actor.so/pom.xml
+++ b/models-interactions/model-actors/actor.so/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actor.so</artifactId>

diff --git a/models-interactions/model-actors/actor.test/pom.xml b/models-interactions/model-actors/actor.test/pom.xml
index 9fc6ff9..6a9367b 100644 (file)
--- a/models-interactions/model-actors/actor.test/pom.xml
+++ b/models-interactions/model-actors/actor.test/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actor.test</artifactId>

diff --git a/models-interactions/model-actors/actor.vfc/pom.xml b/models-interactions/model-actors/actor.vfc/pom.xml
index b36e4cf..f3de579 100644 (file)
--- a/models-interactions/model-actors/actor.vfc/pom.xml
+++ b/models-interactions/model-actors/actor.vfc/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actor.vfc</artifactId>

diff --git a/models-interactions/model-actors/actorServiceProvider/pom.xml b/models-interactions/model-actors/actorServiceProvider/pom.xml
index fb787e8..1b4e50c 100644 (file)
--- a/models-interactions/model-actors/actorServiceProvider/pom.xml
+++ b/models-interactions/model-actors/actorServiceProvider/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>
         <artifactId>model-actors</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>actorServiceProvider</artifactId>

diff --git a/models-interactions/model-actors/pom.xml b/models-interactions/model-actors/pom.xml
index 2e81440..09bc5ba 100644 (file)
--- a/models-interactions/model-actors/pom.xml
+++ b/models-interactions/model-actors/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.onap.policy.models</groupId>
     <artifactId>policy-models-interactions</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.policy.models.policy-models-interactions.model-actors</groupId>

diff --git a/models-interactions/model-impl/aai/pom.xml b/models-interactions/model-impl/aai/pom.xml
index ba00446..6533ae0 100644 (file)
--- a/models-interactions/model-impl/aai/pom.xml
+++ b/models-interactions/model-impl/aai/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
         <artifactId>model-impl</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>aai</artifactId>

diff --git a/models-interactions/model-impl/appc/pom.xml b/models-interactions/model-impl/appc/pom.xml
index 0fbc00a..6f13ca7 100644 (file)
--- a/models-interactions/model-impl/appc/pom.xml
+++ b/models-interactions/model-impl/appc/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
     <artifactId>model-impl</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>appc</artifactId>

diff --git a/models-interactions/model-impl/appclcm/pom.xml b/models-interactions/model-impl/appclcm/pom.xml
index 70c3a68..dc716a5 100644 (file)
--- a/models-interactions/model-impl/appclcm/pom.xml
+++ b/models-interactions/model-impl/appclcm/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
     <artifactId>model-impl</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>appclcm</artifactId>

diff --git a/models-interactions/model-impl/cds/pom.xml b/models-interactions/model-impl/cds/pom.xml
index 6d4cd01..50c994c 100644 (file)
--- a/models-interactions/model-impl/cds/pom.xml
+++ b/models-interactions/model-impl/cds/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>model-impl</artifactId>
     <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>cds</artifactId>

diff --git a/models-interactions/model-impl/events/pom.xml b/models-interactions/model-impl/events/pom.xml
index a52fff6..b2db262 100644 (file)
--- a/models-interactions/model-impl/events/pom.xml
+++ b/models-interactions/model-impl/events/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
     <artifactId>model-impl</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>events</artifactId>

diff --git a/models-interactions/model-impl/guard/pom.xml b/models-interactions/model-impl/guard/pom.xml
index 02dc9ba..62544a9 100644 (file)
--- a/models-interactions/model-impl/guard/pom.xml
+++ b/models-interactions/model-impl/guard/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
     <artifactId>model-impl</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>guard</artifactId>

diff --git a/models-interactions/model-impl/pom.xml b/models-interactions/model-impl/pom.xml
index d2c3024..47843ba 100644 (file)
--- a/models-interactions/model-impl/pom.xml
+++ b/models-interactions/model-impl/pom.xml
@@ -27,7 +27,7 @@
   <parent>
       <groupId>org.onap.policy.models</groupId>
       <artifactId>policy-models-interactions</artifactId>
-      <version>2.4.1-SNAPSHOT</version>
+      <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>

diff --git a/models-interactions/model-impl/rest/pom.xml b/models-interactions/model-impl/rest/pom.xml
index 0753d2d..a751908 100644 (file)
--- a/models-interactions/model-impl/rest/pom.xml
+++ b/models-interactions/model-impl/rest/pom.xml
@@ -2,15 +2,15 @@
   ============LICENSE_START=======================================================
   rest
   ================================================================================
-  Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019 Nordix Foundation.
   ================================================================================
   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.
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
     <artifactId>model-impl</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>rest</artifactId>
@@ -59,45 +59,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-
-    <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>${project.build.sourceDirectory}</sourceDirectories>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failsOnViolation>true</failsOnViolation>
-                            <violationSeverity>warning</violationSeverity>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>${oparent.version}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/models-interactions/model-impl/sdnc/pom.xml b/models-interactions/model-impl/sdnc/pom.xml
index 9b22c80..f00f0c8 100644 (file)
--- a/models-interactions/model-impl/sdnc/pom.xml
+++ b/models-interactions/model-impl/sdnc/pom.xml
@@ -24,7 +24,7 @@
   <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
         <artifactId>model-impl</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>sdnc</artifactId>

diff --git a/models-interactions/model-impl/sdnr/pom.xml b/models-interactions/model-impl/sdnr/pom.xml
index a90f4ec..613db59 100644 (file)
--- a/models-interactions/model-impl/sdnr/pom.xml
+++ b/models-interactions/model-impl/sdnr/pom.xml
@@ -27,7 +27,7 @@
   <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
         <artifactId>model-impl</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
    </parent>
 
   <artifactId>sdnr</artifactId>

diff --git a/models-interactions/model-impl/so/pom.xml b/models-interactions/model-impl/so/pom.xml
index a66a697..160b79e 100644 (file)
--- a/models-interactions/model-impl/so/pom.xml
+++ b/models-interactions/model-impl/so/pom.xml
@@ -2,15 +2,15 @@
   ============LICENSE_START=======================================================
   so
   ================================================================================
-  Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+  Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019 Nordix Foundation.
   ================================================================================
   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.
@@ -26,7 +26,7 @@
   <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
         <artifactId>model-impl</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>so</artifactId>
@@ -59,44 +59,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-    <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>${project.build.sourceDirectory}</sourceDirectories>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failsOnViolation>true</failsOnViolation>
-                            <violationSeverity>warning</violationSeverity>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>${oparent.version}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/models-interactions/model-impl/vfc/pom.xml b/models-interactions/model-impl/vfc/pom.xml
index 3bab276..5675104 100644 (file)
--- a/models-interactions/model-impl/vfc/pom.xml
+++ b/models-interactions/model-impl/vfc/pom.xml
@@ -1,15 +1,15 @@
 <!--
   ============LICENSE_START=======================================================
   Copyright (C) 2017 Intel Corp. All rights reserved.
-  Modifications Copyright (C) 2018-2020 AT&T Intellectual Property. All rights reserved.
+  Modifications Copyright (C) 2018-2021 AT&T Intellectual Property. All rights reserved.
   Modifications Copyright (C) 2019 Nordix Foundation.
   ================================================================================
   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.
@@ -24,7 +24,7 @@
   <parent>
         <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId>
         <artifactId>model-impl</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
   <artifactId>vfc</artifactId>
@@ -57,44 +57,4 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-    <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>${project.build.sourceDirectory}</sourceDirectories>
-                            <includeResources>true</includeResources>
-                            <includeTestSourceDirectory>true</includeTestSourceDirectory>
-                            <includeTestResources>true</includeTestResources>
-                            <excludes>
-                            </excludes>
-                            <consoleOutput>true</consoleOutput>
-                            <failsOnViolation>true</failsOnViolation>
-                            <violationSeverity>warning</violationSeverity>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.onap.oparent</groupId>
-                        <artifactId>checkstyle</artifactId>
-                        <version>${oparent.version}</version>
-                        <scope>compile</scope>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
 </project>

diff --git a/models-interactions/model-simulators/pom.xml b/models-interactions/model-simulators/pom.xml
index 52e3742..8f7d35a 100644 (file)
--- a/models-interactions/model-simulators/pom.xml
+++ b/models-interactions/model-simulators/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models-interactions</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.policy.models.policy-models-interactions</groupId>

diff --git a/models-interactions/pom.xml b/models-interactions/pom.xml
index 06b12f5..a8d0683 100644 (file)
--- a/models-interactions/pom.xml
+++ b/models-interactions/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.onap.policy.models</groupId>
     <artifactId>policy-models</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>policy-models-interactions</artifactId>
   <packaging>pom</packaging>

diff --git a/models-pap/pom.xml b/models-pap/pom.xml
index a642a8a..f2ac085 100644 (file)
--- a/models-pap/pom.xml
+++ b/models-pap/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-pap</artifactId>

diff --git a/models-pdp/pom.xml b/models-pdp/pom.xml
index 7e5fad6..2114ef4 100644 (file)
--- a/models-pdp/pom.xml
+++ b/models-pdp/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-pdp</artifactId>

diff --git a/models-provider/pom.xml b/models-provider/pom.xml
index 0905d60..76e21c5 100644 (file)
--- a/models-provider/pom.xml
+++ b/models-provider/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-provider</artifactId>

diff --git a/models-sim/models-sim-dmaap/pom.xml b/models-sim/models-sim-dmaap/pom.xml
index 970625c..bcbca3b 100644 (file)
--- a/models-sim/models-sim-dmaap/pom.xml
+++ b/models-sim/models-sim-dmaap/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models.sim</groupId>
         <artifactId>policy-models-sim</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-sim-dmaap</artifactId>

diff --git a/models-sim/packages/models-simulator-docker/pom.xml b/models-sim/packages/models-simulator-docker/pom.xml
index 288174b..08614e2 100644 (file)
--- a/models-sim/packages/models-simulator-docker/pom.xml
+++ b/models-sim/packages/models-simulator-docker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models.sim</groupId>
         <artifactId>models-sim-packages</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>models-simulator-docker</artifactId>

diff --git a/models-sim/packages/models-simulator-tarball/pom.xml b/models-sim/packages/models-simulator-tarball/pom.xml
index 5071df2..f76b10a 100644 (file)
--- a/models-sim/packages/models-simulator-tarball/pom.xml
+++ b/models-sim/packages/models-simulator-tarball/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.policy.models.sim</groupId>
     <artifactId>models-sim-packages</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>models-simulator-tarball</artifactId>

diff --git a/models-sim/packages/pom.xml b/models-sim/packages/pom.xml
index 631247f..3596571 100644 (file)
--- a/models-sim/packages/pom.xml
+++ b/models-sim/packages/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.policy.models.sim</groupId>
         <artifactId>policy-models-sim</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>models-sim-packages</artifactId>

diff --git a/models-sim/policy-models-sim-pdp/pom.xml b/models-sim/policy-models-sim-pdp/pom.xml
index 7f31eaf..e65c64e 100644 (file)
--- a/models-sim/policy-models-sim-pdp/pom.xml
+++ b/models-sim/policy-models-sim-pdp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.onap.policy.models.sim</groupId>
     <artifactId>policy-models-sim</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
   <artifactId>policy-models-sim-pdp</artifactId>
   <name>policy-models-sim-pdp</name>

diff --git a/models-sim/policy-models-simulators/pom.xml b/models-sim/policy-models-simulators/pom.xml
index 54dbd4c..798d7fa 100644 (file)
--- a/models-sim/policy-models-simulators/pom.xml
+++ b/models-sim/policy-models-simulators/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.policy.models.sim</groupId>
         <artifactId>policy-models-sim</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-simulators</artifactId>

diff --git a/models-sim/pom.xml b/models-sim/pom.xml
index d9f3129..2d65a65 100644 (file)
--- a/models-sim/pom.xml
+++ b/models-sim/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.onap.policy.models</groupId>
     <artifactId>policy-models</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.onap.policy.models.sim</groupId>

diff --git a/models-tosca/pom.xml b/models-tosca/pom.xml
index 9fc423e..67a848c 100644 (file)
--- a/models-tosca/pom.xml
+++ b/models-tosca/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.policy.models</groupId>
         <artifactId>policy-models</artifactId>
-        <version>2.4.1-SNAPSHOT</version>
+        <version>2.5.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>policy-models-tosca</artifactId>

diff --git a/pom.xml b/pom.xml
index 39b9ede..f9f12c9 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   ============LICENSE_START=======================================================
    Copyright (C) 2018 Ericsson. All rights reserved.
    Copyright (C) 2019-2020 Nordix Foundation.
-   Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
+   Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
    Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,13 +27,13 @@
     <parent>
         <groupId>org.onap.policy.parent</groupId>
         <artifactId>integration</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.0-SNAPSHOT</version>
         <relativePath />
     </parent>
 
     <groupId>org.onap.policy.models</groupId>
     <artifactId>policy-models</artifactId>
-    <version>2.4.1-SNAPSHOT</version>
+    <version>2.5.0-SNAPSHOT</version>
 
     <packaging>pom</packaging>
     <name>policy-models</name>
@@ -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.8.0</policy.common.version>
+        <policy.common.version>1.9.0-SNAPSHOT</policy.common.version>
     </properties>
 
     <modules>
@@ -197,35 +197,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <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>
-            </plugins>
-        </pluginManagement>
-    </build>
 </project>

diff --git a/releases/2.4.1.yaml b/releases/2.4.1.yaml
new file mode 100644 (file)
index 0000000..98585c4
--- /dev/null
+++ b/releases/2.4.1.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '2.4.1'
+project: 'policy-models'
+log_dir: 'policy-models-maven-stage-master/649/'

diff --git a/version.properties b/version.properties
index 858e03b..756f8a3 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -3,8 +3,8 @@
 # because they are used in Jenkins, whose plug-in doesn't support
 
 major=2
-minor=4
-patch=1
+minor=5
+patch=0
 
 base_version=${major}.${minor}.${patch}