diff options
46 files changed, 69 insertions, 212 deletions
diff --git a/models-base/pom.xml b/models-base/pom.xml index 0dd8aece5..35df1202f 100644 --- 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 1c26afbb6..4b62aa80a 100644 --- 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 ef86c177b..bdbc04e22 100644 --- 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 dacf32cc4..f5c84c7f2 100644 --- 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 0db10876d..13f013a5c 100644 --- 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 99e41332f..71b245a2c 100644 --- 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 0dbb3b200..2bdb0eb5f 100644 --- 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 3d527a16d..8d416dcfe 100644 --- 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 277f6821a..251dea955 100644 --- 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 63d7dcd68..9c9c0703c 100644 --- 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 ac902ef27..d84876746 100644 --- 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 8f2f47428..00272003a 100644 --- 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 663662b5d..9eb7757c9 100644 --- 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 8f4366219..7513801b3 100644 --- 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 9fc6ff9be..6a9367b2e 100644 --- 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 b36e4cf75..f3de57942 100644 --- 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 fb787e808..1b4e50c09 100644 --- 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 2e814406b..09bc5bad2 100644 --- 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 ba0044673..6533ae0c3 100644 --- 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 0fbc00a65..6f13ca771 100644 --- 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 70c3a688f..dc716a5e0 100644 --- 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 6d4cd0184..50c994c9f 100644 --- 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 a52fff666..b2db26272 100644 --- 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 02dc9bad6..62544a9e6 100644 --- 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 d2c302409..47843ba0e 100644 --- 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 0753d2d0e..a7519080a 100644 --- 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 9b22c801c..f00f0c8a8 100644 --- 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 a90f4ecc4..613db5908 100644 --- 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 a66a697a6..160b79ee5 100644 --- 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 3bab27630..5675104f3 100644 --- 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 52e3742e5..8f7d35aaf 100644 --- 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 06b12f5ad..a8d0683f0 100644 --- 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 a642a8aae..f2ac085a7 100644 --- 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 7e5fad6b2..2114ef4c1 100644 --- 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 0905d60ef..76e21c578 100644 --- 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 970625cde..bcbca3b26 100644 --- 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 288174b1c..08614e277 100644 --- 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 5071df2d6..f76b10af3 100644 --- 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 631247f54..359657135 100644 --- 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 7f31eaf11..e65c64e2f 100644 --- 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 54dbd4ca8..798d7faaf 100644 --- 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 d9f312942..2d65a6508 100644 --- 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 9fc423e92..67a848cd3 100644 --- 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> @@ -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 index 000000000..98585c41f --- /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 858e03bd3..756f8a39c 100644 --- 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} |